Closes #795

Author: cbrightsci

src/Core/Datatypes/Geometry.h

@@ -98,7 +98,6 @@ namespace Datatypes {
         bool        normalize;
       };
 
-			SpireVBO(){}
       SpireVBO(const std::string& vboName, const std::vector<AttributeData> attribs,
                std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> vboData,
                int64_t numVBOElements, const Core::Geometry::BBox& bbox, bool placeOnGPU) :
@@ -127,7 +126,6 @@ namespace Datatypes {
         TRIANGLES,
       };
 
-			SpireIBO() {}
       SpireIBO(const std::string& iboName, PRIMITIVE primIn, size_t iboIndexSize,
                std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> iboData) :
           name(iboName),
@@ -148,7 +146,6 @@ namespace Datatypes {
     /// Defines a Spire object 'pass'.
     struct SpireSubPass
     {
-			SpireSubPass() {}
       SpireSubPass(const std::string& name, const std::string& vboName, 
                    const std::string& iboName, const std::string& program,
                    ColorScheme scheme, const RenderState& state,
@@ -165,14 +162,6 @@ namespace Datatypes {
           scalar(1.0)
       {}
 
-			static const char* getName() { return "SpireSubPass"; }
-
-			bool serialize(CPM_ES_CEREAL_NS::ComponentSerialize& /* s */, uint64_t /* entityID */)
-			{
-				// No need to serialize.
-				return true;
-			}
-
       std::string   passName;
       std::string   vboName;
       std::string   iboName;
@@ -191,7 +180,7 @@ namespace Datatypes {
           UNIFORM_VEC4
         };
 
-				Uniform(){}
+				//Uniform(){}
         Uniform(const std::string& nameIn, float d) :
             name(nameIn),
             type(UNIFORM_SCALAR),

src/Interface/Modules/Render/ES/SRCamera.h

@@ -83,7 +83,7 @@ class SRCamera
   /// Default camera settings
   /// @{
   static float getDefaultFOVY()   {return 32.0f * (glm::pi<float>() / 180.0f);}
-  static float getDefaultZNear()  {return 0.1f;}
+  static float getDefaultZNear()  {return 0.001f;}
   static float getDefaultZFar()   {return 100000.0f;}
   /// @}
 

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

@@ -180,8 +180,8 @@ namespace SCIRun {
 			float aspect = static_cast<float>(width) / static_cast<float>(height);
 
 			float perspFOVY = 0.59f;
-			float perspZNear = 1.0f;
-			float perspZFar = 2000.0f;
+			float perspZNear = 0.01f;
+			float perspZFar = 20000.0f;
 			glm::mat4 proj = glm::perspective(perspFOVY, aspect, perspZNear, perspZFar);
 			cam->data.setProjection(proj, perspFOVY, aspect, perspZNear, perspZFar);
 
@@ -469,7 +469,6 @@ namespace SCIRun {
 
 				if (pass.renderType == Core::Datatypes::GeometryObject::RENDER_VBO_IBO)
 				{   
-          //reorderIBO(pass);
 					addVBOToEntity(entityID, pass.vboName);
           for (int i = 0; i <= 6; ++i)
           {
@@ -523,7 +522,6 @@ namespace SCIRun {
             assetName = "Assests/arrow.geom";
           }
 
-          //reorderIBO(pass);
           addVBOToEntity(entityID, assetName);
           addIBOToEntity(entityID, assetName);
         }

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

@@ -20,7 +20,6 @@
 #include <es-render/comp/MatUniform.hpp>
 #include <es-render/comp/StaticGLState.hpp>
 #include <es-render/comp/StaticVBOMan.hpp>
-#include <es-render/comp/StaticIBOMan.hpp>
 
 #include <bserialize/BSerialize.hpp>
 
@@ -57,8 +56,7 @@ class RenderBasicSysTrans :
                              StaticWorldLight,
                              gen::StaticCamera,
                              ren::StaticGLState,
-                             ren::StaticVBOMan,
-                             ren::StaticIBOMan>
+                             ren::StaticVBOMan>
 {
 public:
 
@@ -92,8 +90,7 @@ class RenderBasicSysTrans :
       const es::ComponentGroup<StaticWorldLight>& worldLight,
       const es::ComponentGroup<gen::StaticCamera>& camera,
       const es::ComponentGroup<ren::StaticGLState>& defaultGLState,
-      const es::ComponentGroup<ren::StaticVBOMan>& vboMan,
-      const es::ComponentGroup<ren::StaticIBOMan>& iboMan) override
+      const es::ComponentGroup<ren::StaticVBOMan>& vboMan) override
   {
     /// \todo This needs to be moved to pre-execute.
     if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
@@ -352,8 +349,6 @@ class RenderBasicSysTrans :
       }
     }
 
-    //iboMan.front().instance->removeInMemoryIBO(iboID);
-
     if (depthMask)
     {
       GL(glDepthMask(GL_TRUE));

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

@@ -20,7 +20,6 @@
 #include <es-render/comp/MatUniform.hpp>
 #include <es-render/comp/StaticGLState.hpp>
 #include <es-render/comp/StaticVBOMan.hpp>
-#include <es-render/comp/StaticIBOMan.hpp>
 
 #include "../comp/RenderColorMapGeom.h"
 #include "../comp/SRRenderState.h"
@@ -56,8 +55,7 @@ class RenderColorMapSysTrans :
                              StaticWorldLight,
                              gen::StaticCamera,
                              ren::StaticGLState,
-                             ren::StaticVBOMan,
-                             ren::StaticIBOMan>
+                             ren::StaticVBOMan>
 {
 public:
 
@@ -92,8 +90,7 @@ class RenderColorMapSysTrans :
       const es::ComponentGroup<StaticWorldLight>& worldLight,
       const es::ComponentGroup<gen::StaticCamera>& camera,
       const es::ComponentGroup<ren::StaticGLState>& defaultGLState,
-      const es::ComponentGroup<ren::StaticVBOMan>& vboMan,
-      const es::ComponentGroup<ren::StaticIBOMan>& iboMan) override
+      const es::ComponentGroup<ren::StaticVBOMan>& vboMan) override
   {
     /// \todo This needs to be moved to pre-execute.
     if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
@@ -364,8 +361,6 @@ class RenderColorMapSysTrans :
       }
     }
 
-    //iboMan.front().instance->removeInMemoryIBO(iboID);
-
     if (depthMask)
     {
       GL(glDepthMask(GL_TRUE));