Merge branch 'master' into issues_O

Author: dcwhite

src/Interface/Modules/Render/ViewScene.cc

@@ -125,6 +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())
@@ -143,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);
 }

src/Modules/Visualization/ShowField.cc

@@ -415,20 +415,41 @@ void ShowFieldModule::renderFacesLinear(
     //TODO fix so the withNormals tp be woth lighting is called correctly, and the meshes are fixed.
     if (withNormals) 
     {
-      Core::Geometry::Vector edge1 = points[1] - points[0];
-      Core::Geometry::Vector edge2 = points[2] - points[1];
-      Core::Geometry::Vector norm = Cross(edge1, edge2);
-
-      for (size_t i = 0; i < nodes.size(); i++)
+      if (points.size() == 4)
       {
-        normals[i] = norm;
+        Core::Geometry::Vector edge1 = points[1] - points[0];
+        Core::Geometry::Vector edge2 = points[2] - points[1];
+        Core::Geometry::Vector edge3 = points[3] - points[2];
+        Core::Geometry::Vector edge4 = points[0] - points[3];
+
+        Core::Geometry::Vector norm = Cross(edge1, edge2) + Cross(edge2, edge3) + Cross(edge3, edge4) + Cross(edge4, edge1);
+        
+        norm.normalize();
+
+        for (size_t i = 0; i < nodes.size(); i++)
+        {
+          normals[i] = norm;
+        }
       }
-      /*
-      for (size_t i = 0; i < nodes.size(); i++)
+      else
       {
+        Core::Geometry::Vector edge1 = points[1] - points[0];
+        Core::Geometry::Vector edge2 = points[2] - points[1];
+        Core::Geometry::Vector norm = Cross(edge1, edge2);
+
+        norm.normalize();
+
+        for (size_t i = 0; i < nodes.size(); i++)
+        {
+          normals[i] = norm;
+        }
+        /*
+        for (size_t i = 0; i < nodes.size(); i++)
+        {
         mesh->get_normal(normals[i], nodes[i]);
+        }
+        */
       }
-      */
     }
 
     // Default color single face no matter the element data.