Move the disabling of the rendering on the master into the RenderEngine

instead of specifying it in the OpenSpaceEngine
This commit is contained in:
Alexander Bock
2017-03-01 10:39:29 -05:00
parent 3e2c56c940
commit 55f002ad6f
4 changed files with 7 additions and 13 deletions

View File

@@ -111,8 +111,6 @@ public:
float globalBlackOutFactor();
void setGlobalBlackOutFactor(float factor);
void setDisableRenderingOnMaster(bool enabled);
void registerScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
void unregisterScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
void unregisterScreenSpaceRenderable(std::string name);

View File

@@ -85,6 +85,7 @@ return {
ShutdownCountdown = 3,
-- OnScreenTextScaling = "framebuffer",
-- PerSceneCache = true,
-- DisableRenderingOnMaster = true,
DownloadRequestURL = "http://data.openspaceproject.com/request.cgi",
RenderingMethod = "Framebuffer"
--RenderingMethod = "ABuffer" -- alternative: "Framebuffer"

View File

@@ -475,13 +475,6 @@ void OpenSpaceEngine::initialize() {
writeDocumentation();
if (configurationManager().hasKey(ConfigurationManager::KeyDisableMasterRendering)) {
const bool disableMasterRendering = configurationManager().value<bool>(
ConfigurationManager::KeyDisableMasterRendering
);
_renderEngine->setDisableRenderingOnMaster(disableMasterRendering);
}
if (configurationManager().hasKey(ConfigurationManager::KeyShutdownCountdown)) {
_shutdown.waitTime = configurationManager().value<double>(
ConfigurationManager::KeyShutdownCountdown

View File

@@ -194,6 +194,12 @@ void RenderEngine::initialize() {
renderingMethod = "Framebuffer";
}
}
if (confManager.hasKey(ConfigurationManager::KeyDisableMasterRendering)) {
_disableMasterRendering = confManager.value<bool>(
ConfigurationManager::KeyDisableMasterRendering
);
}
_raycasterManager = new RaycasterManager();
_nAaSamples = OsEng.windowWrapper().currentNumberOfAaSamples();
@@ -784,10 +790,6 @@ performance::PerformanceManager* RenderEngine::performanceManager() {
return _performanceManager.get();
}
void RenderEngine::setDisableRenderingOnMaster(bool enabled) {
_disableMasterRendering = enabled;
}
void RenderEngine::registerScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s)
{
s->initialize();