Merge branch 'master' into releaseCandidate_O

Author: dcwhite

src/Core/Datatypes/Geometry.h

@@ -161,7 +161,8 @@ namespace Datatypes {
           renderType(renType),
 					vbo(vbo),
 					ibo(ibo),
-          mColorScheme(scheme)
+          mColorScheme(scheme),
+          scalar(1.0)
       {}
 
 			static const char* getName() { return "SpireSubPass"; }
@@ -180,6 +181,7 @@ namespace Datatypes {
       RenderType    renderType;
 			SpireVBO			vbo;
 			SpireIBO			ibo;
+      double        scalar;
 
       struct Uniform
       {

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

@@ -44,7 +44,7 @@ namespace fs      = CPM_ES_FS_NS;
 namespace SCIRun {
 namespace Render {
 
-ESCore::ESCore()
+  ESCore::ESCore() : r_(0.0f), g_(0.0f), b_(0.0f), a_(0.0f)
 {
   // Register common systems.
   gen::registerAll(*this);
@@ -118,7 +118,8 @@ void ESCore::execute(double currentTime, double constantFrameTime)
     // Reset the GL state (we shouldn't really need to do this, but we will anyways).
     mDefaultGLState.apply();
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    //lClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(r_, g_, b_, a_);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   }
 
@@ -129,6 +130,14 @@ void ESCore::execute(double currentTime, double constantFrameTime)
   mCurrentTime += constantFrameTime;
 }
 
+void ESCore::setBackgroundColor(float r, float g, float b, float a)
+{
+  r_ = r;
+  g_ = g;
+  b_ = b;
+  a_ = a;
+}
+
 } // namespace Render
 } // namespace SCIRun
 

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

@@ -43,6 +43,7 @@ class ESCore : public CPM_ES_ACORN_NS::Acorn
   virtual ~ESCore();
 
   void execute(double currentTime, double constantFrameTime);
+  void setBackgroundColor(float r, float g, float b, float a);
 
 private:
 
@@ -52,6 +53,8 @@ class ESCore : public CPM_ES_ACORN_NS::Acorn
 
   float                     mFPS;             ///< Actual FPS of system.
   float                     mLastRealTime;    ///< Last realtime passed into the core.
+
+  float r_, g_, b_, a_;
 };
 
 } // namespace Render

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

@@ -234,6 +234,12 @@ namespace SCIRun {
 			showOrientation_ = value;
 		}
 
+    //------------------------------------------------------------------------------
+    void SRInterface::setBackgroundColor(QColor color)
+    {
+      mCore.setBackgroundColor(color.redF(), color.greenF(), color.blueF(), color.alphaF());
+    }
+
 		//------------------------------------------------------------------------------
 		void SRInterface::inputMouseUp(const glm::ivec2& /*pos*/, MouseButton /*btn*/)
 		{
@@ -426,6 +432,14 @@ namespace SCIRun {
 
         // Add transformation
         gen::Transform trafo;
+
+        if (pass.renderType == Core::Datatypes::GeometryObject::RENDER_RLIST_SPHERE)
+        {
+          double scale = pass.scalar;
+          trafo.transform[0].x = scale;
+          trafo.transform[1].y = scale;
+          trafo.transform[2].z = scale;
+        }
         mCore.addComponent(entityID, trafo);
 
         // Add lighting uniform checks

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

@@ -134,6 +134,9 @@ namespace SCIRun {
 			/// Toggle Orientation Axes
 			void showOrientation(bool value);
 
+      /// Set the Background Color
+      void setBackgroundColor(QColor color);
+
 		private:
 
 			class SRObject
@@ -170,14 +173,14 @@ namespace SCIRun {
 					Core::Datatypes::GeometryObject::RenderType renderType;
 				};
 
-				std::string           mName;
-				glm::mat4             mObjectToWorld;
-				std::list<SRPass>     mPasses;
-				Core::Geometry::BBox  mBBox;          ///< Objects bounding box (calculated from VBO).
+				std::string                     mName;
+				glm::mat4                       mObjectToWorld;
+				std::list<SRPass>               mPasses;
+				Core::Geometry::BBox            mBBox;          ///< Objects bounding box (calculated from VBO).
 
 				boost::optional<std::string>    mColorMap;
 
-				int										mPort;
+				int										          mPort;
 			};
 
 			// Sets up ESCore.

src/Interface/Modules/Render/ViewScene.cc

@@ -125,12 +125,12 @@ void ViewSceneDialog::newGeometryValue()
 	LOG_DEBUG("ViewSceneDialog::asyncExecute after locking");
 
 	itemManager_->removeAll();
-
+  /*
   std::shared_ptr<Render::SRInterface> spire = mSpire.lock();
   if (spire == nullptr)
     return;
   spire->removeAllGeomObjects();
-
+  */
 	// Grab the geomData transient value.
 	auto geomDataTransient = state_->getTransientValue(Parameters::GeomData);
 	if (geomDataTransient && !geomDataTransient->empty())
@@ -149,23 +149,23 @@ void ViewSceneDialog::newGeometryValue()
 		}
 
 		int port = 0;
-		//std::vector<std::string> validObjects;
+		std::vector<std::string> validObjects;
 		for (auto it = geomData->begin(); it != geomData->end(); ++it, ++port)
 		{
 			boost::shared_ptr<Core::Datatypes::GeometryObject> obj = *it;
 			spire->handleGeomObject(obj, port);
-			//validObjects.push_back(obj->objectName);
+			validObjects.push_back(obj->objectName);
 			itemManager_->addItem(QString::fromStdString(obj->objectName));
 		}
-		//spire->gcInvalidObjects(validObjects);
-  }/*
+		spire->gcInvalidObjects(validObjects);
+  }
 	else
 	{
 		std::shared_ptr<Render::SRInterface> spire = mSpire.lock();
 		if (spire == nullptr)
 			return;
 		spire->removeAllGeomObjects();
-	}*/
+	}
 	//TODO IMPORTANT: we need some call somewhere to clear the transient geometry list once spire/ES has received the list of objects. They take up lots of memory...
 	//state_->setTransientValue(Parameters::GeomData, boost::shared_ptr<std::list<boost::shared_ptr<Core::Datatypes::GeometryObject>>>(), false);
 }
@@ -376,6 +376,23 @@ void ViewSceneDialog::configurationButtonClicked()
   mConfigurationDock->setVisible(showConfiguration_);
 }
 
+//------------------------------------------------------------------------------
+void ViewSceneDialog::assignBackgroundColor()
+{
+  QColor bgColor = Qt::black;
+  auto newColor = QColorDialog::getColor(bgColor, this, "Choose background color");
+  if (newColor.isValid())
+  {
+    bgColor = newColor;
+    mConfigurationDock->setSampleColor(bgColor);
+    //TODO: set color of button to this color
+    //defaultMeshColorButton_->set
+    //state_->setValue(ShowFieldModule::DefaultMeshColor, ColorRGB(defaultMeshColor_.red(), defaultMeshColor_.green(), defaultMeshColor_.blue()).toString());
+    std::shared_ptr<Render::SRInterface> spire = mSpire.lock();
+    spire->setBackgroundColor(bgColor);
+  }
+}
+
 //------------------------------------------------------------------------------
 void ViewSceneDialog::addToolBar()
 {

src/Interface/Modules/Render/ViewScene.h

@@ -83,6 +83,7 @@ namespace SCIRun {
       void viewAxisSelected(int index);
       void viewVectorSelected(int index);
       void configurationButtonClicked();
+      void assignBackgroundColor();
 
     protected:
       virtual void closeEvent(QCloseEvent* evt) override;