[Bf-blender-cvs] [e07034f] master: Freestyle: code cleanup: removed old commented lines of code in SilhouetteGeomEngine.

Tamito Kajiyama noreply at git.blender.org
Wed May 21 17:47:20 CEST 2014


Commit: e07034f8e1155b24dce67345a6f7eca13f7beac1
Author: Tamito Kajiyama
Date:   Wed May 21 11:57:25 2014 +0900
https://developer.blender.org/rBe07034f8e1155b24dce67345a6f7eca13f7beac1

Freestyle: code cleanup: removed old commented lines of code in SilhouetteGeomEngine.

===================================================================

M	source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp

===================================================================

diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index aa5bc5a..3bfa4e5 100644
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -130,45 +130,19 @@ void SilhouetteGeomEngine::retrieveViewport(int viewport[4])
 	memcpy(viewport, _viewport, 4 * sizeof(int));
 }
 
-//#define HUGE 1.0e9
-
 void SilhouetteGeomEngine::ProjectSilhouette(vector<SVertex*>& ioVertices)
 {
 	Vec3r newPoint;
-#if 0
-	real min = HUGE;
-	real max = -HUGE;
-#endif
 	vector<SVertex*>::iterator sv, svend;
 	for (sv = ioVertices.begin(), svend = ioVertices.end(); sv != svend; sv++) {
 		GeomUtils::fromWorldToImage((*sv)->point3D(), newPoint, _modelViewMatrix, _projectionMatrix, _viewport);
 		(*sv)->setPoint2D(newPoint);
-#if 0
-		cerr << (*sv)->point2d().z() << "  ";
-		real d = (*sv)->point2d()[2];
-		if (d > max)
-			max =d;
-		if (d < min)
-			min =d;
-#endif
-	}
-#if 0
-	for (sv = ioVertices.begin(), svend = ioVertices.end(); sv != svend; sv++) {
-		Vec3r P((*sv)->point2d());
-		(*sv)->setPoint2D(Vec3r(P[0], P[1], 1.0 - (P[2] - min) / (max - min)));
-		//cerr << (*sv)->point2d()[2] << "  ";
 	}
-#endif
 }
 
 void SilhouetteGeomEngine::ProjectSilhouette(SVertex *ioVertex)
 {
 	Vec3r newPoint;
-#if 0
-	real min = HUGE;
-	real max = -HUGE;
-	vector<SVertex*>::iterator sv, svend;
-#endif
 	GeomUtils::fromWorldToImage(ioVertex->point3D(), newPoint, _modelViewMatrix, _projectionMatrix, _viewport);
 	ioVertex->setPoint2D(newPoint);
 }




More information about the Bf-blender-cvs mailing list