The objects now render in right order Closes #779

Author: cbrightsci

src/Interface/Modules/Render/CMakeLists.txt

@@ -51,9 +51,9 @@ SET(Interface_Modules_Render_HEADERS
   ES/comp/StaticWorldLight.h
   ES/comp/LightingUniforms.h
   ES/systems/RenderBasicSys.h
-  ES/systems/RenderBasicSysTrans.h
   ES/systems/RenderColorMapSys.h
-  ES/systems/RenderColorMapSysTrans.h
+  ES/systems/RenderTransBasicSys.h
+  ES/systems/RenderTransColorMapSys.h
 )
 
 SET(Interface_Modules_Render_SOURCES 
@@ -71,9 +71,9 @@ SET(Interface_Modules_Render_SOURCES
   ES/AssetBootstrap.cc
   ES/comp/LightingUniforms.cc
   ES/systems/RenderBasicSys.cc
-  ES/systems/RenderBasicSysTrans.cc
   ES/systems/RenderColorMapSys.cc
-  ES/systems/RenderColorMapSysTrans.cc
+  ES/systems/RenderTransBasicSys.cc
+  ES/systems/RenderTransColorMapSys.cc
 )
 
 QT4_WRAP_UI(Interface_Modules_Render_FORMS_HEADERS ${Interface_Modules_Render_FORMS})

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

@@ -27,9 +27,9 @@
 #include "comp/RenderBasicGeom.h"
 #include "comp/StaticWorldLight.h"
 #include "systems/RenderBasicSys.h"
-#include "systems/RenderBasicSysTrans.h"
 #include "systems/RenderColorMapSys.h"
-#include "systems/RenderColorMapSysTrans.h"
+#include "systems/RenderTransBasicSys.h"
+#include "systems/RenderTransColorMapSys.h"
 #include "CoreBootstrap.h"
 #include "AssetBootstrap.h"
 #include "Core.h"

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

@@ -38,9 +38,10 @@
 #include "comp/StaticWorldLight.h"
 #include "comp/LightingUniforms.h"
 #include "systems/RenderBasicSys.h"
-#include "systems/RenderBasicSysTrans.h"
 #include "systems/RenderColorMapSys.h"
-#include "systems/RenderColorMapSysTrans.h"
+#include "systems/RenderTransBasicSys.h"
+#include "systems/RenderTransColorMapSys.h"
+#include "Core/Datatypes/Geometry.h"
 
 namespace SCIRun {
 namespace Render {
@@ -51,8 +52,8 @@ void rendererRegisterAll(CPM_ES_ACORN_NS::Acorn& core)
   registerSystem_CoreBootstrap(core);
   registerSystem_AssetBootstrap(core);
   registerSystem_RenderBasicGeom(core);
-	registerSystem_RenderBasicTransGeom(core);
   registerSystem_RenderColorMap(core);
+  registerSystem_RenderBasicTransGeom(core);
   registerSystem_RenderColorMapTrans(core);
 
   // Register components
@@ -63,6 +64,7 @@ void rendererRegisterAll(CPM_ES_ACORN_NS::Acorn& core)
   core.registerComponent<RenderColorMapGeom>();
   core.registerComponent<SRRenderState>();
   core.registerComponent<RenderList>();
+  //core.registerComponent<SpireSubPass>();
 }
 
 } // namespace Render

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

@@ -68,8 +68,9 @@ DEALINGS IN THE SOFTWARE.
 #include "comp/StaticWorldLight.h"
 #include "comp/LightingUniforms.h"
 #include "systems/RenderBasicSys.h"
-#include "systems/RenderBasicSysTrans.h"
 #include "systems/RenderColorMapSys.h"
+#include "systems/RenderTransBasicSys.h"
+#include "systems/RenderTransColorMapSys.h"
 
 using namespace std::placeholders;