Add property and configuration option to disable the scene tag on a master node (closing #247)

This commit is contained in:
Alexander Bock
2017-04-17 10:55:37 -04:00
parent e350033dbd
commit c53bbf14be
9 changed files with 46 additions and 14 deletions
@@ -104,6 +104,8 @@ public:
/// The key that stores whether the master node should perform rendering just function
/// as a pure manager
static const std::string KeyDisableMasterRendering;
/// The key that stores whether the master node should apply the scene transformation
static const std::string KeyDisableSceneOnMaster;
/// The key that sets the request URL that is used to request additional data to be
/// downloaded
static const std::string KeyDownloadRequestURL;
+2 -1
View File
@@ -88,7 +88,8 @@ public:
void deinitialize();
void preSynchronization();
void postSynchronizationPreDraw();
void render(const glm::mat4& viewMatrix, const glm::mat4& projectionMatrix);
void render(const glm::mat4& sceneMatrix, const glm::mat4& viewMatrix,
const glm::mat4& projectionMatrix);
void postDraw();
void keyboardCallback(Key key, KeyModifier mod, KeyAction action);
void charCallback(unsigned int codepoint, KeyModifier mod);
+3 -1
View File
@@ -98,7 +98,8 @@ public:
void updateFade();
void updateRenderer();
void updateScreenSpaceRenderables();
void render(const glm::mat4& viewMatrix, const glm::mat4& projectionMatrix);
void render(const glm::mat4& sceneMatrix, const glm::mat4& viewMatrix,
const glm::mat4& projectionMatrix);
void renderScreenLog();
void renderShutdownInformation(float timer, float fullTime);
@@ -211,6 +212,7 @@ private:
properties::BoolProperty _applyWarping;
properties::BoolProperty _showFrameNumber;
properties::BoolProperty _disableMasterRendering;
properties::BoolProperty _disableSceneOnMaster;
float _globalBlackOutFactor;
float _fadeDuration;