Merge pull request OpenVSP#5 from ramcdona/Fixes

CompGeom fix and version bump to 2.0.3.
jfenbert · Feb 22, 2012 · 9a6f584 · 9a6f584
2 parents 7b37d54 + ce762ea
commit 9a6f584
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/src/vsp/main.h b/src/vsp/main.h
@@ -10,9 +10,9 @@
 #ifndef main_h
 #define main_h
 
-#define VSPVERSION1 "Vehicle Sketch Pad 2.0.2"
-#define VSPVERSION2 "OpenVSP 2.0.2 - 2/21/12"
-#define VSPVERSION3 "OpenVSP 2.0.2 : Vehicle Sketch Pad"
+#define VSPVERSION1 "Vehicle Sketch Pad 2.0.3"
+#define VSPVERSION2 "OpenVSP 2.0.3 - 2/22/12"
+#define VSPVERSION3 "OpenVSP 2.0.3 : Vehicle Sketch Pad"
 
 void vsp_exit();
 

diff --git a/src/vsp/tMesh.cpp b/src/vsp/tMesh.cpp
@@ -1415,23 +1415,41 @@ void TTri::triangulateSplit( int flattenAxis )
 	//==== Load Points into Traingle Struct ====//
 	in.numberofpoints = nVec.size();
 
+
+	//==== Find Bounds of NVec ====//
+	bbox box;
+	for ( j = 0 ; j < (int)nVec.size() ; j++ )
+		box.update( nVec[j]->pnt );
+
+	vec3d center = box.get_center();
+
+	double min_s = 0.0001;
+	double sx = max( box.get_max(0) - box.get_min(0), min_s );
+	double sy = max( box.get_max(1) - box.get_min(1), min_s );
+	double sz = max( box.get_max(2) - box.get_min(2), min_s );
+
 	int cnt = 0;
 	for ( j = 0 ; j < (int)nVec.size() ; j++ )
 	{
+		vec3d pnt = nVec[j]->pnt - center;
+		pnt.scale_x( 1.0/sx );
+		pnt.scale_y( 1.0/sy );
+		pnt.scale_z( 1.0/sz );
+
 		if ( flattenAxis == 0 )
 		{
-			in.pointlist[cnt] = nVec[j]->pnt.y();	cnt++;
-			in.pointlist[cnt] = nVec[j]->pnt.z();	cnt++;
+			in.pointlist[cnt] = pnt.y();	cnt++;
+			in.pointlist[cnt] = pnt.z();	cnt++;
 		}
 		else if ( flattenAxis == 1 )
 		{
-			in.pointlist[cnt] = nVec[j]->pnt.x();	cnt++;
-			in.pointlist[cnt] = nVec[j]->pnt.z();	cnt++;
+			in.pointlist[cnt] = pnt.x();	cnt++;
+			in.pointlist[cnt] = pnt.z();	cnt++;
 		}
 		else if ( flattenAxis == 2 )
 		{
-			in.pointlist[cnt] = nVec[j]->pnt.x();	cnt++;
-			in.pointlist[cnt] = nVec[j]->pnt.y();	cnt++;
+			in.pointlist[cnt] = pnt.x();	cnt++;
+			in.pointlist[cnt] = pnt.y();	cnt++;
 		}
 	}
 //static FILE* fp = fopen( "debug.txt", "w" );
@@ -1607,9 +1625,27 @@ void TTri::niceTriSplit( int flattenAxis )
 	//==== Load Points into Traingle Struct ====//
 	in.numberofpoints = nVec.size();
 
+	//==== Find Bounds of NVec ====//
+	bbox box;
+	for ( j = 0 ; j < (int)nVec.size() ; j++ )
+		box.update( nVec[j]->pnt );
+
+	vec3d center = box.get_center();
+
+	double min_s = 0.0001;
+	double sx = max( box.get_max(0) - box.get_min(0), min_s );
+	double sy = max( box.get_max(1) - box.get_min(1), min_s );
+	double sz = max( box.get_max(2) - box.get_min(2), min_s );
+
 	int cnt = 0;
 	for ( j = 0 ; j < (int)nVec.size() ; j++ )
 	{
+		//==== Center and Rescale Triangle For Better Mapping ====//
+		vec3d pnt = nVec[j]->pnt - center;
+		pnt.scale_x( 1.0/sx );
+		pnt.scale_y( 1.0/sy );
+		pnt.scale_z( 1.0/sz );
+
 		if ( flattenAxis == 0 )
 		{
 			in.pointlist[cnt] = nVec[j]->pnt.y();	cnt++;