Changeset 1017 for GTP/trunk/Lib/Geom/shared/GeoTool

Timestamp:

06/15/06 11:50:48 (19 years ago)

Author:

gumbau

Message:

LodStripsConstructor? optimized and fixed bug building a lodtree

Location:

GTP/trunk/Lib/Geom/shared/GeoTool

Files:

• GeoTool.ncb (modified) (previous)
• GeoTool.suo (modified) (previous)
• include/GeoMeshSaver.h (modified) (1 diff)
• src/GeoMeshSaver.cpp (modified) (5 diffs)
• src/GeoMeshViewUI.cpp (modified) (4 diffs)

GTP/trunk/Lib/Geom/shared/GeoTool/include/GeoMeshSaver.h

@@ -113 +113 @@
                         //      Saves a Mesh into a file.
                         int     save(Mesh       *geoMesh,       const   char    *fileNameMesh);
+
+                        // temporal members used to tweak the lodtree leaf submesh
+                        int leavesSubMesh;
+                        VertexBuffer *leavesVB;
+                        Index *indices;
+                        int numindices;
         };
 }

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshSaver.cpp

@@ -23 +23 @@
 GeoMeshSaver::GeoMeshSaver()
 {
+        leavesSubMesh=-1;
+        leavesVB=NULL;
+        numindices=0;
+        indices=NULL;
 }
 
@@ -60 +64 @@
         unnormalizeModel(mGeoMesh);
 
+        if (leavesSubMesh>-1 && leavesVB)
+        {
+                Vector3 bmax(geoMesh->mMeshBounds.maxX,geoMesh->mMeshBounds.maxY,geoMesh->mMeshBounds.maxZ);
+                Vector3 bmin(geoMesh->mMeshBounds.minX,geoMesh->mMeshBounds.minY,geoMesh->mMeshBounds.minZ);
+                Vector3 center = (bmax+bmin)*0.5f;
+                float scale = geoMesh->mMeshBounds.scaleFactor;
+                
+                mGeoMesh->mSubMesh[leavesSubMesh].mSharedVertexBuffer=false;
+                mGeoMesh->mSubMesh[leavesSubMesh].mStripCount=0;
+                mGeoMesh->mSubMesh[leavesSubMesh].mIndexCount=numindices;
+                int icount = mGeoMesh->mSubMesh[leavesSubMesh].mIndexCount;
+                mGeoMesh->mSubMesh[leavesSubMesh].mIndex=new Index[icount];
+                for (int i=0; i<icount; i++)
+                        mGeoMesh->mSubMesh[leavesSubMesh].mIndex[i]=indices[i];
+
+                mGeoMesh->mSubMesh[leavesSubMesh].mType=GEO_TRIANGLE_LIST;
+                mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer=new VertexBuffer();
+                mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mVertexInfo=VERTEX_POSITION;
+                mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mVertexCount=leavesVB->mVertexCount;;
+                int vcount = mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mVertexCount;
+                mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mPosition=new Vector3[vcount];
+                mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mNormal=new Vector3[vcount];
+                mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mTexCoords=new Vector2[vcount];
+                for (int i=0; i<vcount; i++)
+                {
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mPosition[i].x = leavesVB->mPosition[i].x / scale + center.x;
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mPosition[i].y = leavesVB->mPosition[i].y / scale + center.y;
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mPosition[i].z = leavesVB->mPosition[i].z / scale + center.z;
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mNormal[i].x = leavesVB->mNormal[i].x;
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mNormal[i].y = leavesVB->mNormal[i].y;
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mNormal[i].z = leavesVB->mNormal[i].z;
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mTexCoords[i].x = leavesVB->mTexCoords[i].x;
+                        mGeoMesh->mSubMesh[leavesSubMesh].mVertexBuffer->mTexCoords[i].y = leavesVB->mTexCoords[i].y;
+                }
+        }
+
         //      Open the file.
-        mSerializer     =       new     Serializer(     name,
-                                                                                                                                Serializer::WRITE);
-
+        mSerializer     =       new     Serializer(name,Serializer::WRITE);
 
         //      Write the file header.
@@ -773 +811 @@
         //      Translate around center then scale.
         //      For each submesh.
+
+        bool sharedScaled=false;
+
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
         {
@@ -778 +819 @@
                 vertex_buffer   =       geoMesh->mSubMesh[submesh].mVertexBuffer;
 
+                if (geoMesh->mSubMesh[submesh].mSharedVertexBuffer && sharedScaled)
+                        continue;
+                        
                 //      For each index of the strip.
                 for (int i = 0; i < vertex_buffer->mVertexCount; i++)
@@ -791 +835 @@
                 //      If is a shared vertex Buffer.
                 if (geoMesh->mSubMesh[submesh].mSharedVertexBuffer)
-                {
-                        break;
-                }
-        }
-}
-
+                        sharedScaled=true;
+        }
+}
+

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshViewUI.cpp

@@ -1003 +1003 @@
 }
 
+VertexBuffer *origSubMeshVB=NULL;
+int orig_numindices=0;
+Index *orig_indices=NULL;
+
 //---------------------------------------------------------------------------
 //      Button Process Callback
@@ -1014 +1018 @@
         progressBarType =       PROCESS;
         mProcessBar->position(0);
+
+        origSubMeshVB=NULL;
 
         //      Initialize error flag.
@@ -1080 +1086 @@
                                 else
                                 {
+                                        origSubMeshVB=mGeoMesh->mSubMesh[idMeshLeaves].mVertexBuffer->Clone();
+                                        orig_numindices=mGeoMesh->mSubMesh[idMeshLeaves].mIndexCount;
+                                        orig_indices=new Index[orig_numindices];
+                                        for (int i=0; i<orig_numindices; i++)
+                                                orig_indices[i]=mGeoMesh->mSubMesh[idMeshLeaves].mIndex[i];
+
                                         std::cout << "Simplificando hojas...";
                                         simplifyLeavesCollapse();
@@ -1324 +1336 @@
                                                 file_name[strlen(file_name) - 4]        =       '\0';
                                                 
+                                                mesh_saver->leavesSubMesh=idMeshLeaves;
+                                                mesh_saver->leavesVB=origSubMeshVB;
+                                                mesh_saver->numindices=orig_numindices;
+                                                mesh_saver->indices=orig_indices;
                                                 mesh_saver->save(       mGeoMesh,
                                                                                                                         strcat(file_name,".mesh"));