add option to compute kmean & kgaussian from compute curvature function

SCHNApps/Plugins/differentialProperties/include/differentialProperties.h

@@ -62,6 +62,8 @@ public slots:
 		const QString& KminAttributeName = "Kmin",
 		const QString& kminAttributeName = "kmin",
 		const QString& KnormalAttributeName = "Knormal",
+		bool compute_kmean = true,
+		bool compute_kgaussian = true,
 		bool autoUpdate = true
 	);
 
@@ -90,10 +92,10 @@ private:
 		ComputeCurvatureParameters(
 			const QString& p, const QString& n,
 			const QString& Kmax, const QString& kmax, const QString& Kmin, const QString& kmin, const QString& Knormal,
-			bool update) :
+			bool kmean, bool kgaussian, bool update) :
 			positionName(p), normalName(n),
 			KmaxName(Kmax), kmaxName(kmax), KminName(Kmin), kminName(kmin), KnormalName(Knormal),
-			autoUpdate(update)
+			compute_kmean(kmean), compute_kgaussian(kgaussian), autoUpdate(update)
 		{}
 		QString positionName;
 		QString normalName;
@@ -102,6 +104,8 @@ private:
 		QString KminName;
 		QString kminName;
 		QString KnormalName;
+		bool compute_kmean;
+		bool compute_kgaussian;
 		bool autoUpdate;
 	};
 	QHash<QString, ComputeCurvatureParameters> computeCurvatureLastParameters;

SCHNApps/Plugins/differentialProperties/src/differentialProperties.cpp

@@ -186,6 +186,8 @@ void DifferentialPropertiesPlugin::computeCurvature(
 	const QString& KminAttributeName,
 	const QString& kminAttributeName,
 	const QString& KnormalAttributeName,
+	bool compute_kmean,
+	bool compute_kgaussian,
 	bool autoUpdate)
 {
 	MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(m_window->getMap(mapName));
@@ -232,7 +234,7 @@ void DifferentialPropertiesPlugin::computeCurvature(
 		ComputeCurvatureParameters(
 			positionAttributeName, normalAttributeName,
 			KmaxAttributeName, kmaxAttributeName, KminAttributeName, kminAttributeName, KnormalAttributeName,
-			autoUpdate);
+			compute_kmean, compute_kgaussian, autoUpdate);
 
 	mh->createVBO(Kmax);
 	mh->createVBO(kmax);
@@ -245,6 +247,32 @@ void DifferentialPropertiesPlugin::computeCurvature(
 	mh->notifyAttributeModification(Kmin);
 	mh->notifyAttributeModification(kmin);
 	mh->notifyAttributeModification(Knormal);
+
+	if(compute_kmean)
+	{
+		VertexAttribute<PFP2::REAL> kmean = mh->getAttribute<PFP2::REAL, VERTEX>("kmean");
+		if(!kmean.isValid())
+			kmean = mh->addAttribute<PFP2::REAL, VERTEX>("kmean");
+
+		for(unsigned int i = kmin.begin(); i != kmin.end(); kmin.next(i))
+			kmean[i] = (kmin[i] + kmax[i]) / 2.0;
+
+		mh->createVBO(kmean);
+		mh->notifyAttributeModification(kmean);
+	}
+
+	if(compute_kgaussian)
+	{
+		VertexAttribute<PFP2::REAL> kgaussian = mh->getAttribute<PFP2::REAL, VERTEX>("kgaussian");
+		if(!kgaussian.isValid())
+			kgaussian = mh->addAttribute<PFP2::REAL, VERTEX>("kgaussian");
+
+		for(unsigned int i = kmin.begin(); i != kmin.end(); kmin.next(i))
+			kgaussian[i] = kmin[i] * kmax[i];
+
+		mh->createVBO(kgaussian);
+		mh->notifyAttributeModification(kgaussian);
+	}
 }
 
 #ifndef DEBUG

SCHNApps/Plugins/renderScalar/src/renderScalar.cpp

@@ -67,7 +67,12 @@ void RenderScalarPlugin::redraw(View* view)
 			m_scalarShader->setMinValue(p->scalarMin);
 			m_scalarShader->setMaxValue(p->scalarMax);
 			m_scalarShader->setExpansion(p->expansion);
+
+			glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+			glEnable(GL_POLYGON_OFFSET_FILL);
+			glPolygonOffset(1.0f, 1.0f);
 			m->draw(m_scalarShader, Algo::Render::GL2::TRIANGLES);
+			glDisable(GL_POLYGON_OFFSET_FILL);
 		}
 	}
 }
@@ -251,8 +256,8 @@ void RenderScalarPlugin::attributeModified(unsigned int orbit, QString nameAttr)
 				if(perMap->scalarVBO && nameAttr == QString::fromStdString(perMap->scalarVBO->name()))
 				{
 					const VertexAttribute<PFP2::REAL>& attr = map->getAttribute<PFP2::REAL, VERTEX>(nameAttr);
-					perMap->scalarMin = 1e20;
-					perMap->scalarMax = -1e20;
+					perMap->scalarMin = std::numeric_limits<float>::max();
+					perMap->scalarMax = std::numeric_limits<float>::min();
 					for(unsigned int i = attr.begin(); i != attr.end(); attr.next(i))
 					{
 						perMap->scalarMin = attr[i] < perMap->scalarMin ? attr[i] : perMap->scalarMin;