minor fixes

CGoGN/include/Geometry/bounding_box.h

@@ -37,7 +37,7 @@ namespace Geom
 template <typename VEC>
 class BoundingBox
 {
-	public:
+public:
 	/**********************************************/
 	/*                CONSTRUCTORS                */
 	/**********************************************/
@@ -123,7 +123,7 @@ class BoundingBox
 		return in ;
 	}
 
-	private:
+private:
 	bool m_initialized ;
 	VEC m_pMin, m_pMax ;
 } ;

SCHNApps/Plugins/surface_radiance/src/surface_radiance.cpp

@@ -259,7 +259,9 @@ MapHandlerGen* Surface_Radiance_Plugin::importFromFile(const QString& fileName)
 
 			mapParams.radianceTexture->update();
 
-			map->removeAttribute(mapParams.radiance);
+			// uncomment this line to be able to load multiple objects with different SH basis
+			// (decimation will be unavailable)
+//			map->removeAttribute(mapParams.radiance);
 
 			mapParams.paramVBO = new Utils::VBO();
 			mapParams.paramVBO->updateData(mapParams.param);
@@ -333,39 +335,53 @@ void Surface_Radiance_Plugin::decimate(const QString& mapName, const QString& po
 			mapParams.positionApproximator = new Algo::Surface::Decimation::Approximator_QEM<PFP2>(*map, position);
 		}
 
-		if (mapParams.normalApproximator == NULL)
-		{
-			mapParams.normalApproximator =
-				new Algo::Surface::Decimation::Approximator_InterpolateAlongEdge<PFP2, PFP2::VEC3>(
-					*map,
-					normal,
-					position,
-					((Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator))->getApproximationResultAttribute()
-				);
-		}
-
-		if (mapParams.radianceApproximator == NULL)
-		{
-			mapParams.radianceApproximator =
-				new Algo::Surface::Decimation::Approximator_InterpolateAlongEdge<PFP2, Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3> >(
-					*map,
-					mapParams.radiance,
-					position,
-					((Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator))->getApproximationResultAttribute()
-				);
-		}
+//		if (mapParams.normalApproximator == NULL)
+//		{
+//			mapParams.normalApproximator =
+//				new Algo::Surface::Decimation::Approximator_InterpolateAlongEdge<PFP2, PFP2::VEC3>(
+//					*map,
+//					normal,
+//					position,
+//					((Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator))->getApproximationResultAttribute()
+//				);
+//		}
+
+//		if (mapParams.radianceApproximator == NULL)
+//		{
+//			mapParams.radianceApproximator =
+//				new Algo::Surface::Decimation::Approximator_InterpolateAlongEdge<PFP2, Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3> >(
+//					*map,
+//					mapParams.radiance,
+//					position,
+//					((Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator))->getApproximationResultAttribute()
+//				);
+//		}
 
 		if (mapParams.selector == NULL)
 		{
+//			mapParams.selector =
+//				new EdgeSelector_Radiance<PFP2>(
+//					*map,
+//					position,
+//					normal,
+//					mapParams.radiance,
+//					*(Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator),
+//					*(Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.normalApproximator),
+//					*(Algo::Surface::Decimation::Approximator<PFP2, Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3>, EDGE>*)(mapParams.radianceApproximator)
+//				);
+
+//			mapParams.selector =
+//				new Algo::Surface::Decimation::EdgeSelector_QEM<PFP2>(
+//					*map,
+//					position,
+//					*(Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator)
+//				);
+
 			mapParams.selector =
-				new EdgeSelector_Radiance<PFP2>(
+				new Algo::Surface::Decimation::EdgeSelector_ColorNaive<PFP2>(
 					*map,
 					position,
-					normal,
-					mapParams.radiance,
-					*(Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator),
-					*(Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.normalApproximator),
-					*(Algo::Surface::Decimation::Approximator<PFP2, Utils::SphericalHarmonics<PFP2::REAL, PFP2::VEC3>, EDGE>*)(mapParams.radianceApproximator)
+					*(Algo::Surface::Decimation::Approximator<PFP2, PFP2::VEC3, EDGE>*)(mapParams.positionApproximator)
 				);
 		}
 	}

SCHNApps/Plugins/surface_render/src/surface_render.cpp

@@ -197,6 +197,7 @@ void Surface_Render_Plugin::vboRemoved(Utils::VBO *vbo)
 		{
 			m_dockTab->removePositionVBO(QString::fromStdString(vbo->name()));
 			m_dockTab->removeNormalVBO(QString::fromStdString(vbo->name()));
+			m_dockTab->removeColorVBO(QString::fromStdString(vbo->name()));
 		}
 	}
 
@@ -218,6 +219,11 @@ void Surface_Render_Plugin::vboRemoved(Utils::VBO *vbo)
 			mapParam.normalVBO = NULL;
 			if(view->isLinkedToMap(map)) viewsToUpdate.insert(view);
 		}
+		if(mapParam.colorVBO == vbo)
+		{
+			mapParam.colorVBO = NULL;
+			if(view->isLinkedToMap(map)) viewsToUpdate.insert(view);
+		}
 	}
 
 	foreach(View* v, viewsToUpdate)

SCHNApps/Plugins/surface_render/src/surface_render_dockTab.cpp

@@ -13,8 +13,8 @@ namespace SCHNApps
 Surface_Render_DockTab::Surface_Render_DockTab(SCHNApps* s, Surface_Render_Plugin* p) :
 	m_schnapps(s),
 	m_plugin(p),
-	b_updatingUI(false),
-	m_currentColorDial(0)
+	m_currentColorDial(0),
+	b_updatingUI(false)
 
 {
 	setupUi(this);
@@ -326,6 +326,9 @@ void Surface_Render_DockTab::updateMapParameters()
 	combo_normalVBO->clear();
 	combo_normalVBO->addItem("- select VBO -");
 
+	combo_colorVBO->clear();
+	combo_colorVBO->addItem("- select VBO -");
+
 	View* view = m_schnapps->getSelectedView();
 	MapHandlerGen* map = m_schnapps->getSelectedMap();
 

SCHNApps/Plugins/surface_selection/src/surface_selection.cpp

@@ -105,7 +105,7 @@ void Surface_Selection_Plugin::drawMap(View* view, MapHandlerGen* map)
 							m_pointSprite->setAttributePosition(m_selectedVerticesVBO);
 							m_pointSprite->setColor(CGoGN::Geom::Vec4f(1.0f, 0.0f, 0.0f, 1.0f));
 							m_pointSprite->setLightPosition(CGoGN::Geom::Vec3f(0.0f, 0.0f, 1.0f));
-							m_pointSprite->setSize(20 * map->getBBdiagSize() / nbCells);
+							m_pointSprite->setSize(map->getBBdiagSize() / 75.0f);
 
 							m_pointSprite->enableVertexAttribs();
 							glDrawArrays(GL_POINTS, 0, selector->getNbSelectedCells());
@@ -126,7 +126,7 @@ void Surface_Selection_Plugin::drawMap(View* view, MapHandlerGen* map)
 							{
 								case NormalAngle :
 								case SingleCell : {
-									m_pointSprite->setSize(30 * map->getBBdiagSize() / nbCells);
+									m_pointSprite->setSize(map->getBBdiagSize() / 60.0f);
 									break;
 								}
 								case WithinSphere : {

SCHNApps/include/mapHandler.hpp

@@ -100,7 +100,10 @@ void MapHandler<PFP>::updateBB()
 		VertexAttribute<VEC3, MAP> bbVertexAttribute(map, dynamic_cast<AttributeMultiVector<VEC3>*>(m_bbVertexAttribute));
 
 		m_bb = CGoGN::Algo::Geometry::computeBoundingBox<PFP>(*map, bbVertexAttribute);
+		if (m_bb.isInitialized())
 			m_bbDiagSize = m_bb.diagSize();
+		else
+			m_bbDiagSize = 0;
 	}
 	else
 	{
@@ -117,6 +120,9 @@ void MapHandler<PFP>::updateBB()
 template <typename PFP>
 void MapHandler<PFP>::updateBBDrawer()
 {
+	if (!m_bb.isInitialized())
+		return;
+
 	if (!m_bbDrawer)
 		m_bbDrawer = new Utils::Drawer();