From ee088e12f3821fdd8b529fb12e9e0b5d6836b537 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 1 Apr 2015 17:06:06 -0700 Subject: [PATCH] leverage scene scripting values to toggle rendering --- interface/src/Application.cpp | 14 ++++++-------- interface/src/Menu.cpp | 2 -- interface/src/Menu.h | 2 -- interface/src/avatar/Avatar.cpp | 4 +--- interface/src/octree/OctreePacketProcessor.cpp | 5 +++-- .../script-engine/src/SceneScriptingInterface.h | 5 ----- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5275b8c529..5ed8f484b6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2260,7 +2260,7 @@ void Application::update(float deltaTime) { if (queryIsDue || viewIsDifferentEnough) { _lastQueriedTime = now; - if (Menu::getInstance()->isOptionChecked(MenuOption::Entities)) { + if (DependencyManager::get()->shouldRenderEntities()) { queryOctree(NodeType::EntityServer, PacketTypeEntityQuery, _entityServerJurisdictions); } _lastQueriedViewFrustum = _viewFrustum; @@ -2973,7 +2973,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs DependencyManager::get()->renderSphere(originSphereRadius, 15, 15, glm::vec4(1.0f, 0.0f, 0.0f, 1.0f)); // render models... - if (Menu::getInstance()->isOptionChecked(MenuOption::Entities)) { + if (DependencyManager::get()->shouldRenderEntities()) { PerformanceTimer perfTimer("entities"); PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide() ... entities..."); @@ -2994,17 +2994,15 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs DependencyManager::get()->render(); } } - - - + bool mirrorMode = (theCamera.getMode() == CAMERA_MODE_MIRROR); - { + + if (DependencyManager::get()->shouldRenderAvatars()) { PerformanceTimer perfTimer("avatars"); DependencyManager::get()->renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, - false, selfAvatarOnly); + false, selfAvatarOnly); } - { DependencyManager::get()->setAmbientLightMode(getRenderAmbientLight()); auto skyStage = DependencyManager::get()->getSkyStage(); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 5867dd29e2..920f18a73b 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -268,8 +268,6 @@ Menu::Menu() { QMenu* renderOptionsMenu = developerMenu->addMenu("Render"); addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Atmosphere, Qt::SHIFT | Qt::Key_A, true); - addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Avatars, 0, true); - addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Entities, 0, true); addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AmbientOcclusion); addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DontFadeOnOctreeServerChanges); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 63dab63711..54d3af8880 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -119,7 +119,6 @@ namespace MenuOption { const QString AudioSourceInject = "Generated Audio"; const QString AudioSourcePinkNoise = "Pink Noise"; const QString AudioSourceSine440 = "Sine 440hz"; - const QString Avatars = "Avatars"; const QString BandwidthDetails = "Bandwidth Details"; const QString BlueSpeechSphere = "Blue Sphere While Speaking"; const QString BookmarkLocation = "Bookmark Location"; @@ -156,7 +155,6 @@ namespace MenuOption { const QString EnableCharacterController = "Enable avatar collisions"; const QString EnableGlowEffect = "Enable Glow Effect (Warning: Poor Oculus Performance)"; const QString EnableVRMode = "Enable VR Mode"; - const QString Entities = "Entities"; const QString ExpandMyAvatarSimulateTiming = "Expand /myAvatar/simulation"; const QString ExpandMyAvatarTiming = "Expand /myAvatar"; const QString ExpandOtherAvatarTiming = "Expand /otherAvatar"; diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 431b6e0d37..3ea4723801 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -364,9 +364,7 @@ void Avatar::render(const glm::vec3& cameraPosition, RenderMode renderMode, bool : GLOW_FROM_AVERAGE_LOUDNESS; // render body - if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) { - renderBody(frustum, renderMode, postLighting, glowLevel); - } + renderBody(frustum, renderMode, postLighting, glowLevel); if (!postLighting && renderMode != SHADOW_RENDER_MODE) { // add local lights diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp index 34aae97446..4eac1e6803 100644 --- a/interface/src/octree/OctreePacketProcessor.cpp +++ b/interface/src/octree/OctreePacketProcessor.cpp @@ -14,6 +14,7 @@ #include "Application.h" #include "Menu.h" #include "OctreePacketProcessor.h" +#include "SceneScriptingInterface.h" void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode, const QByteArray& packet) { PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), @@ -81,13 +82,13 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode, switch(voxelPacketType) { case PacketTypeEntityErase: { - if (Menu::getInstance()->isOptionChecked(MenuOption::Entities)) { + if (DependencyManager::get()->shouldRenderEntities()) { app->_entities.processEraseMessage(mutablePacket, sendingNode); } } break; case PacketTypeEntityData: { - if (Menu::getInstance()->isOptionChecked(MenuOption::Entities)) { + if (DependencyManager::get()->shouldRenderEntities()) { app->_entities.processDatagram(mutablePacket, sendingNode); } } break; diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h index 124e2287f7..c57a343e9d 100644 --- a/libraries/script-engine/src/SceneScriptingInterface.h +++ b/libraries/script-engine/src/SceneScriptingInterface.h @@ -24,7 +24,6 @@ class SceneScriptingInterface : public QObject, public Dependency { Q_PROPERTY(bool shouldRenderAvatars READ shouldRenderAvatars WRITE setShouldRenderAvatars) Q_PROPERTY(bool shouldRenderEntities READ shouldRenderEntities WRITE setShouldRenderEntities) - Q_PROPERTY(bool shouldRenderOverlays READ shouldRenderOverlays WRITE setShouldRenderOverlays) public: Q_INVOKABLE void setStageOrientation(const glm::quat& orientation); @@ -51,9 +50,6 @@ public: Q_INVOKABLE void setShouldRenderEntities(bool shouldRenderEntities) { _shouldRenderEntities = shouldRenderEntities; } Q_INVOKABLE bool shouldRenderEntities() const { return _shouldRenderEntities; } - - Q_INVOKABLE void setShouldRenderOverlays(bool shouldRenderOverlays) { _shouldRenderOverlays = shouldRenderOverlays; } - Q_INVOKABLE bool shouldRenderOverlays() const { return _shouldRenderOverlays; } protected: SceneScriptingInterface() {}; @@ -63,7 +59,6 @@ protected: bool _shouldRenderAvatars = true; bool _shouldRenderEntities = true; - bool _shouldRenderOverlays = true; }; #endif // hifi_SceneScriptingInterface_h