[Hgengine-cvs] Mercury/Util/ModelOptimizer compile.sh, 1.1, 1.2 main.cpp, 1.10, 1.11

[Charles L. <cn...@us...>]

Update of /cvsroot/hgengine/Mercury/Util/ModelOptimizer
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10511

Modified Files:
	compile.sh main.cpp 
Log Message:
fix model optimizer


Index: main.cpp
===================================================================
RCS file: /cvsroot/hgengine/Mercury/Util/ModelOptimizer/main.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main.cpp	29 Sep 2008 20:59:23 -0000	1.10
--- main.cpp	21 Apr 2009 03:41:23 -0000	1.11
***************
*** 6,10 ****
  using namespace std;
  
! #define MINIMUM_WEIGHT					0.0005
  #define MINIMUM_TO_CREATE_STATIC_MESH	16
  #define MINIMUM_TO_CREATE_BONE_MESH		9
--- 6,10 ----
  using namespace std;
  
! #define MINIMUM_WEIGHT					0.001
  #define MINIMUM_TO_CREATE_STATIC_MESH	16
  #define MINIMUM_TO_CREATE_BONE_MESH		9
***************
*** 58,66 ****
  //	return 0;
  
- 	for( i = 0; i < c.vMeshes.size(); i++ )
- 	{
- 		iTotalVerts += c.vMeshes[i].vVerticies.size();
- 		iTotalFaces += c.vMeshes[i].vTriangles.size();
- 	}
  
  	for( i = 0; i < c.vBones.size(); i++ )
--- 58,61 ----
***************
*** 69,76 ****
--- 64,79 ----
  	printf( "Model Loaded.\n" );
  	printf( "  Animations:   %d\n", c.vAnimations.size() );
+ 	for( i = 0; i < c.vAnimations.size(); i++ )
+ 		printf( "    %02d: %s %f\n", i, c.vAnimations[i].sName.c_str(), c.vAnimations[i].fDuration );
  	printf( "  Bones:        %d\n", c.vBones.size() );
  	printf( "    Assignments:%d\n", iTotalAssignments );
  	printf( "  Materials:    %d\n", c.vMaterials.size() );
  	printf( "  Meshes:       %d\n", c.vMeshes.size() );
+ 	for( i = 0; i < c.vMeshes.size(); i++ )
+ 	{
+ 		printf( "    %03d: [%d] [%d] [%d] [%d] [%d]\n", i, c.vMeshes[i].vTriangles.size(), c.vMeshes[i].vVerticies.size(), c.vMeshes[i].bCache, c.vMeshes[i].iMaterialNumber, c.vMeshes[i].iBoneAttached );
+ 		iTotalVerts += c.vMeshes[i].vVerticies.size();
+ 		iTotalFaces += c.vMeshes[i].vTriangles.size();
+ 	}
  	printf( "    Faces:      %d\n", iTotalFaces );
  	printf( "    Verts:      %d\n", iTotalVerts );
***************
*** 244,248 ****
  				for( k = 0; k < 3; k++ )
  				{
! 					for( int l = 0; l < vBoneExclusiveVertexCounts[iThisBone].size(); l++ )
  						if( vBoneExclusiveVertexCounts[iThisBone][l] == IntegerPair( i, c.vMeshes[i].vTriangles[j].iFace[k] ) )
  							break;
--- 247,252 ----
  				for( k = 0; k < 3; k++ )
  				{
! 					int l;
! 					for( l = 0; l < vBoneExclusiveVertexCounts[iThisBone].size(); l++ )
  						if( vBoneExclusiveVertexCounts[iThisBone][l] == IntegerPair( i, c.vMeshes[i].vTriangles[j].iFace[k] ) )
  							break;

Index: compile.sh
===================================================================
RCS file: /cvsroot/hgengine/Mercury/Util/ModelOptimizer/compile.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** compile.sh	29 Sep 2008 20:59:23 -0000	1.1
--- compile.sh	21 Apr 2009 03:41:23 -0000	1.2
***************
*** 1 ****
! g++ ModelContainer.cpp StripAndFanner.cpp main.cpp -I../../src -o optimizer ../../src/MercuryMath.cpp ../../src/MercuryMatrix.cpp ../../src/MercuryTypes.cpp
--- 1 ----
! g++ ModelContainer.cpp StripAndFanner.cpp main.cpp -I../../src -o optimizer ../../src/MercuryMath.cpp ../../src/MercuryMatrix.cpp ../../src/MercuryTypes.cpp -g