Changeset 2469 for GTP

Timestamp:

06/28/07 17:34:14 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/pathmap/Mesh.cpp (modified) (6 diffs)

GTP/trunk/App/Demos/Illum/pathmap/Mesh.cpp

@@ -70 +70 @@
         }
 
+        //add a texcoord set for prm
         DWORD fvf = mesh->GetFVF();
         fvf |= D3DFVF_NORMAL;
         DWORD nTexCoords = fvf & D3DFVF_TEXCOUNT_MASK;
-        nTexCoords += D3DFVF_TEX1;
-        fvf &= ~D3DFVF_TEXCOUNT_MASK;
-        fvf |= nTexCoords;
-        fvf |= D3DFVF_TEXCOORDSIZE2(nTexCoords / D3DFVF_TEX1);
-        //add a texcoord set for prm
-        if(generateUV)
+        if(generateUV || (originalAtlasTexCoordIndex == 0 && nTexCoords == D3DFVF_TEX1))
+        {
+                nTexCoords += D3DFVF_TEX1;
+                fvf &= ~D3DFVF_TEXCOUNT_MASK;
+                fvf |= nTexCoords;
+                fvf |= D3DFVF_TEXCOORDSIZE2(nTexCoords / D3DFVF_TEX1);
                 setVertexFormat(fvf);
+        }
 
         if(generateTBN)
@@ -127 +129 @@
                         mex.explode();
 
-                        //mex.saveFragMeshes();
+//                      mex.saveFragMeshes();
 
                         mex.generateAtlas(prmAtlasSize);
@@ -368 +370 @@
         int ATLASSIZE = prmAtlasSize;
 
-        std::vector<SubMesh*>::iterator iSubMesh = subMeshes.begin()-1;
+        bool firstSub = true;
+        std::vector<SubMesh*>::iterator iSubMesh = subMeshes.begin();
         DWORD prevAttribute = 0xffffffff;
 
@@ -377 +380 @@
                 {
                         prevAttribute = attributeArray[u];
-                        iSubMesh++;
+                        if(firstSub)
+                                firstSub = false;
+                        else
+                                iSubMesh++;
                         (*iSubMesh)->edgeStartIndex = iEdge;
                         (*iSubMesh)->edgeCount = 0;
@@ -524 +530 @@
         }
         delete oldDefaults;
+        e.pDefaults = newDefaults;
 
         newDefaults[e.NumDefaults].Type = D3DXEDT_STRING;
         newDefaults[e.NumDefaults].NumBytes = strlen(name) + 1;
-        newDefaults[e.NumDefaults].pValue = new char[e.pDefaults[i].NumBytes];
+        newDefaults[e.NumDefaults].pValue = new char[e.pDefaults[e.NumDefaults].NumBytes];
         strcpy((LPSTR)newDefaults[e.NumDefaults].pValue, value);
         newDefaults[e.NumDefaults].pParamName = new char[strlen(name)+1];
@@ -729 +736 @@
                  D3DDECL_END() };
 
-        //mesh->UpdateSemantics(pathMapMeshDecl);
+//      mesh->UpdateSemantics(pathMapMeshDecl);
 
         LPDIRECT3DVERTEXBUFFER9 svertexBuffer;