[Plib-cvs] plib/src/ssg ssgBranch.cxx,1.24,1.25

[Wolfram K. <wol...@us...>]

Update of /cvsroot/plib/plib/src/ssg
In directory sc8-pr-cvs1:/tmp/cvs-serv11546

Modified Files:
	ssgBranch.cxx 
Log Message:
For the merging of hierarchy nodes after reading *.mdl files:
maxVertices implemented.

Index: ssgBranch.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgBranch.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ssgBranch.cxx	13 Dec 2003 22:19:04 -0000	1.24
+++ ssgBranch.cxx	17 Jan 2004 21:50:25 -0000	1.25
@@ -389,6 +389,7 @@
 // #define VERBOSE
 int maxTriangles = 100; // Thats a nice value for handling MDL files for BoB. 
                         // You might want to assign another value, possibly -1 before calling mergeHNodes
+int maxVertices = 195; // see maxTriangles
 
 
 
@@ -507,6 +508,7 @@
 					// now: l1 = kid at i1, l2 = kid at i1+delta		
 					if ( (l1->getState() == l2->getState()) && 
 						   ((maxTriangles < 0) || (l1->getNumTriangles()+l2->getNumTriangles()<maxTriangles )) &&
+							 ((maxVertices < 0) || (l1->getNumVertices()+l2->getNumVertices()<maxVertices )) &&
 							 (0 == strcmp(l1->getPrintableName(), l2->getPrintableName())) 
 							) 
 					{
@@ -611,7 +613,8 @@
 // a) Both have the same state 
 // b) the same name
 // c) the result would not have more than maxTriangles triangles (if maxTriangles is negative, this is not checked).
-// d) both are of type GL_TRIANGLE_FAN or GL_TRIANGLES
+// d) the result would not have more than maxVertices vertices (if maxVertices is negative, this is not checked).
+// e) both are of type GL_TRIANGLE_FAN or GL_TRIANGLES
 {