Merge branch 'renderer-work-dan'

Author: dcwhite

src/Interface/Modules/Render/CMakeLists.txt

@@ -29,11 +29,13 @@
 
 SET(Interface_Modules_Render_FORMS
   ViewScene.ui
+  ViewSceneControls.ui
 )
 
 SET(Interface_Modules_Render_HEADERS
   share.h
   ViewScene.h
+  ViewSceneControlsDock.h
   GLWidget.h
   GLContext.h
   GLContextPlatformCompatibility.h
@@ -51,10 +53,12 @@ SET(Interface_Modules_Render_HEADERS
   ES/systems/RenderBasicSys.h
   ES/systems/RenderBasicSysTrans.h
   ES/systems/RenderColorMapSys.h
+  ES/systems/RenderColorMapSysTrans.h
 )
 
 SET(Interface_Modules_Render_SOURCES 
   ViewScene.cc
+  ViewSceneControlsDock.cc
   GLWidget.cc
   GLContext.cc
   QtGLContext.cc
@@ -69,6 +73,7 @@ SET(Interface_Modules_Render_SOURCES
   ES/systems/RenderBasicSys.cc
   ES/systems/RenderBasicSysTrans.cc
   ES/systems/RenderColorMapSys.cc
+  ES/systems/RenderColorMapSysTrans.cc
 )
 
 QT4_WRAP_UI(Interface_Modules_Render_FORMS_HEADERS ${Interface_Modules_Render_FORMS})

src/Interface/Modules/Render/ES/CoreBootstrap.cc

@@ -29,6 +29,7 @@
 #include "systems/RenderBasicSys.h"
 #include "systems/RenderBasicSysTrans.h"
 #include "systems/RenderColorMapSys.h"
+#include "systems/RenderColorMapSysTrans.h"
 #include "CoreBootstrap.h"
 #include "AssetBootstrap.h"
 #include "Core.h"
@@ -114,6 +115,7 @@ class CoreBootstrap : public es::EmptySystem
     core.addUserSystem(getSystemName_RenderBasicGeom());
 		core.addUserSystem(getSystemName_RenderBasicTransGeom());
     core.addUserSystem(getSystemName_RenderColorMap());
+    core.addUserSystem(getSystemName_RenderColorMapTrans());
 
     // --== General ==--
 

src/Interface/Modules/Render/ES/Registration.cc

@@ -40,6 +40,7 @@
 #include "systems/RenderBasicSys.h"
 #include "systems/RenderBasicSysTrans.h"
 #include "systems/RenderColorMapSys.h"
+#include "systems/RenderColorMapSysTrans.h"
 
 namespace SCIRun {
 namespace Render {
@@ -52,6 +53,7 @@ void rendererRegisterAll(CPM_ES_ACORN_NS::Acorn& core)
   registerSystem_RenderBasicGeom(core);
 	registerSystem_RenderBasicTransGeom(core);
   registerSystem_RenderColorMap(core);
+  registerSystem_RenderColorMapTrans(core);
 
   // Register components
   core.registerComponent<StaticSRInterface>();

src/Interface/Modules/Render/ES/systems/RenderBasicSysTrans.cc

@@ -96,7 +96,6 @@ class RenderBasicSysTrans :
     {
       return this->mDepth < di.mDepth;
     }
-
   };
 
   void groupExecute(
@@ -287,15 +286,6 @@ class RenderBasicSysTrans :
     GL(glBindBuffer(GL_ARRAY_BUFFER, vbo.front().glid));
     GL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, iboID));
 
-    bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
-    bool cullFace = glIsEnabled(GL_CULL_FACE);
-    bool blend = glIsEnabled(GL_BLEND);
-
-    GL(glDepthMask(GL_FALSE));
-    GL(glDisable(GL_CULL_FACE));
-    GL(glEnable(GL_BLEND));
-    GL(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
-
     // Bind any common uniforms.
     if (commonUniforms.size() > 0)
     {
@@ -314,10 +304,14 @@ class RenderBasicSysTrans :
 
     // Disable zwrite if we are rendering a transparent object.
     //if (srstate.front().state.get(RenderState::USE_TRANSPARENCY))
-    {
-      GL(glDepthMask(GL_FALSE));
-      GL(glDisable(GL_CULL_FACE));
-    }
+    bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
+    bool cullFace = glIsEnabled(GL_CULL_FACE);
+    bool blend = glIsEnabled(GL_BLEND);
+
+    GL(glDepthMask(GL_FALSE));
+    GL(glDisable(GL_CULL_FACE));
+    GL(glEnable(GL_BLEND));
+    GL(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
     if (rlist.size() > 0)
     {

src/Interface/Modules/Render/ES/systems/RenderColorMapSys.cc

@@ -98,6 +98,11 @@ class RenderColorMapSys :
       return;
     }
 
+    if (srstate.front().state.get(RenderState::USE_TRANSPARENCY))
+    {
+      return;
+    }
+
     // Setup *everything*. We don't want to enter multiple conditional
     // statements if we can avoid it. So we assume everything has not been
     // setup (including uniforms) if the simple geom hasn't been setup.
@@ -186,11 +191,13 @@ class RenderColorMapSys :
 
     geom.front().attribs.bind();
 
-    if (srstate.front().state.get(RenderState::USE_TRANSPARENCY))
-    {
-      GL(glDepthMask(GL_FALSE));
-      GL(glDisable(GL_CULL_FACE));
-    }
+    bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
+    bool cullFace = glIsEnabled(GL_CULL_FACE);
+    bool blend = glIsEnabled(GL_BLEND);
+
+    GL(glDepthMask(GL_TRUE));
+    GL(glDisable(GL_CULL_FACE));
+    GL(glDisable(GL_BLEND));
 
     if (rlist.size() > 0)
     {
@@ -304,11 +311,18 @@ class RenderColorMapSys :
       }
     }
 
-    if (srstate.front().state.get(RenderState::USE_TRANSPARENCY))
+    if (!depthMask)
+    {
+      GL(glDepthMask(GL_FALSE));
+    }
+    if (cullFace)
     {
-      GL(glDepthMask(GL_TRUE));
       GL(glEnable(GL_CULL_FACE));
     }
+    if (blend)
+    {
+      GL(glEnable(GL_BLEND));
+    }
 
     geom.front().attribs.unbind();