gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[framework] support for gui-less initialization

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-07-25 16:49:57 +03:00 • committed by Alex Zolotarev
parent 7cc4726b38
commit 84408e5381
6 changed files with 53 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -149,6 +149,7 @@ namespace android
try
{
m_work.SetRenderPolicy(CreateRenderPolicy(rpParams));
m_work.InitGuiSubsystem();
if (m_doLoadState)
LoadState();
else

1
iphone/Maps/Classes/EAGLView.mm
View file

@ -124,6 +124,7 @@
Framework & f = GetFramework();
f.OnSize(frameRect.size.width * vs, frameRect.size.height * vs);
f.SetRenderPolicy(renderPolicy);
f.InitGuiSubsystem();
NSLog(@"EAGLView initRenderPolicy Ended");
}

36
map/framework.cpp
View file

@ -841,7 +841,9 @@ void Framework::DoPaint(shared_ptr<PaintEvent> const & e)
{
m_renderPolicy->DrawFrame(e, m_navigator.Screen());
DrawAdditionalInfo(e);
// don't render additional elements if guiController wasn't initialized
if (m_guiController->GetCacheScreen() != NULL)
DrawAdditionalInfo(e);
}
}
@ -1304,22 +1306,31 @@ void Framework::SetRenderPolicy(RenderPolicy * renderPolicy)
if (m_renderPolicy)
{
gui::Controller::RenderParams rp(m_renderPolicy->Density(),
bind(&WindowHandle::invalidate,
renderPolicy->GetWindowHandle().get()),
m_renderPolicy->GetGlyphCache(),
m_renderPolicy->GetCacheScreen().get());
m_guiController->SetRenderParams(rp);
m_renderPolicy->SetCountryIndexFn(bind(&Framework::GetCountryIndex, this, _1));
m_renderPolicy->SetAnimController(m_animController.get());
m_navigator.SetSupportRotation(m_renderPolicy->DoSupportRotation());
m_informationDisplay.setVisualScale(m_renderPolicy->VisualScale());
m_renderPolicy->SetRenderFn(DrawModelFn());
if (m_benchmarkEngine)
m_benchmarkEngine->Start();
}
}
void Framework::InitGuiSubsystem()
{
if (m_renderPolicy)
{
gui::Controller::RenderParams rp(m_renderPolicy->Density(),
bind(&WindowHandle::invalidate,
m_renderPolicy->GetWindowHandle().get()),
m_renderPolicy->GetGlyphCache(),
m_renderPolicy->GetCacheScreen().get());
m_guiController->SetRenderParams(rp);
m_informationDisplay.setVisualScale(m_renderPolicy->VisualScale());
m_balloonManager.RenderPolicyCreated(m_renderPolicy->Density());
if (m_width != 0 && m_height != 0)
@ -1327,11 +1338,6 @@ void Framework::SetRenderPolicy(RenderPolicy * renderPolicy)
// Do full invalidate instead of any "pending" stuff.
Invalidate();
m_renderPolicy->SetRenderFn(DrawModelFn());
if (m_benchmarkEngine)
m_benchmarkEngine->Start();
}
}

1
map/framework.hpp
View file

@ -234,6 +234,7 @@ public:
//@}
void SetRenderPolicy(RenderPolicy * renderPolicy);
void InitGuiSubsystem();
RenderPolicy * GetRenderPolicy() const;
InformationDisplay & GetInformationDisplay();

49
map_server/main.cpp
View file

@ -27,11 +27,12 @@
#include <QFile>
#include <QDir>
#define TEXTURE_SIZE 2560
MwmRpcService::MwmRpcService(QObject *parent)
MwmRpcService::MwmRpcService(QObject * parent) : m_pixelBuffer(new QGLPixelBuffer(TEXTURE_SIZE, TEXTURE_SIZE))
{
LOG(LINFO, ("MwmRpcService started"));
m_pixelBuffer = shared_ptr<QGLPixelBuffer>(new QGLPixelBuffer(2048, 2048));
m_pixelBuffer->makeCurrent();
shared_ptr<srv::RenderContext> primaryRC(new srv::RenderContext());
@ -41,27 +42,24 @@ MwmRpcService::MwmRpcService(QObject *parent)
rmParams.m_texRtFormat = graphics::Data4Bpp;
rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit();
RenderPolicy::Params rpParams;
m_videoTimer = new EmptyVideoTimer();
shared_ptr<VideoTimer> timer(new EmptyVideoTimer());
rpParams.m_videoTimer = timer.get();
rpParams.m_useDefaultFB = true;
rpParams.m_rmParams = rmParams;
rpParams.m_primaryRC = primaryRC;
rpParams.m_density = graphics::EDensityXHDPI;
rpParams.m_skinName = "basic.skn";
rpParams.m_screenWidth = 2048;
rpParams.m_screenHeight = 2048;
m_rpParams.m_videoTimer = m_videoTimer;
m_rpParams.m_useDefaultFB = true;
m_rpParams.m_rmParams = rmParams;
m_rpParams.m_primaryRC = primaryRC;
m_rpParams.m_density = graphics::EDensityXHDPI;
m_rpParams.m_skinName = "basic.skn";
m_rpParams.m_screenWidth = TEXTURE_SIZE;
m_rpParams.m_screenHeight = TEXTURE_SIZE;
try
{
m_framework.SetRenderPolicy(new SimpleRenderPolicy(rpParams));
m_framework.GetGuiController()->ResetRenderParams();
m_framework.SetRenderPolicy(new SimpleRenderPolicy(m_rpParams));
}
catch (graphics::gl::platform_unsupported const & e)
{
LOG(LERROR, ("OpenGL platform is unsupported, reason: ", e.what()));
LOG(LCRITICAL, ("OpenGL platform is unsupported, reason: ", e.what()));
}
}
@ -70,18 +68,25 @@ QString MwmRpcService::RenderBox(
const QVariant bbox,
int width,
int height,
const QString &density,
const QString &language,
QString const & density,
QString const & language,
bool maxScaleMode
)
{
LOG(LINFO, ("Render box started", width, height, maxScaleMode));
// @todo: set density and language from parameter
// @todo: set language from parameter
// Settings::SetCurrentLanguage(string(language.toAscii()));
// graphics::convert(density.toAscii(), rpParams.m_density);
m_pixelBuffer->makeCurrent();
graphics::EDensity requestDensity;
graphics::convert(density.toAscii(), requestDensity);
if (m_framework.GetRenderPolicy()->Density() != requestDensity)
{
m_rpParams.m_density = requestDensity;
m_framework.SetRenderPolicy(0);
m_framework.SetRenderPolicy(new SimpleRenderPolicy(m_rpParams));
};
m_framework.OnSize(width, height);
m_framework.SetQueryMaxScaleMode(maxScaleMode);
@ -104,7 +109,7 @@ QString MwmRpcService::RenderBox(
QBuffer b(&ba);
b.open(QIODevice::WriteOnly);
m_pixelBuffer->toImage().copy(0, m_pixelBuffer->height()-height, width, height).save(&b, "PNG");
m_pixelBuffer->toImage().copy(0, TEXTURE_SIZE-height, width, height).save(&b, "PNG");
LOG(LINFO, ("Render box finished"));
return QString(ba.toBase64());

2
qt/draw_widget.cpp
View file

@ -274,12 +274,14 @@ namespace qt
try
{
m_framework->SetRenderPolicy(CreateRenderPolicy(rpParams));
m_framework->InitGuiSubsystem();
}
catch (graphics::gl::platform_unsupported const & e)
{
LOG(LERROR, ("OpenGL platform is unsupported, reason: ", e.what()));
/// @todo Show "Please Update Drivers" dialog and close the program.
}
catch (RootException const & e)
{
LOG(LERROR, (e.what()));