Changeset 2304 for GTP/trunk/App/Demos/Illum/pathmap/FlexVertex.cpp

Timestamp:

04/01/07 00:02:16 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/pathmap/FlexVertex.cpp (modified) (1 diff)

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

@@ -2 +2 @@
 #include ".\flexvertex.h"
 
-unsigned int FlexVertex::posByteOffset(0);
-unsigned int FlexVertex::normalByteOffset(12);
-unsigned int FlexVertex::diffuseByteOffset(24);
-unsigned int FlexVertex::specularByteOffset(28);
-unsigned int FlexVertex::texByteOffset[16] = {  32, 40, 48, 56, 64, 72, 80, 88,
-                                                                                                96, 104, 112, 120, 128, 136, 144, 152};
-unsigned int FlexVertex::nTex = 2;
+FlexFormat* FlexVertex::format = NULL;
 
-void FlexVertex::setFormat(D3DVERTEXELEMENT9* decl)
+void FlexVertex::setFormat(FlexFormat* format)
+{
+        FlexVertex::format = format;
+}
+
+FlexFormat::FlexFormat()
+:
+posByteOffset(0),
+normalByteOffset(12),
+diffuseByteOffset(24),
+specularByteOffset(28),
+nTex(2)
+{
+        unsigned int ii[16] = {32, 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120, 128, 136, 144, 152};
+        for(int iu=0; iu<16; iu++)
+                texByteOffset[iu] = ii[iu];
+}
+
+void FlexVertexArray::setFormat(D3DVERTEXELEMENT9* decl)
 {
         int i=0;
-        nTex = 0;
+        format.nTex = 0;
         while(decl[i].Type != D3DDECLTYPE_UNUSED)
         {
                 if(decl[i].Usage == D3DDECLUSAGE_POSITION)
-                        posByteOffset = decl[i].Offset;
+                        format.posByteOffset = decl[i].Offset;
                 if(decl[i].Usage == D3DDECLUSAGE_NORMAL)
-                        normalByteOffset = decl[i].Offset;
+                        format.normalByteOffset = decl[i].Offset;
                 if(decl[i].Usage == D3DDECLUSAGE_COLOR)
                 {
                         if(decl[i].UsageIndex == 0)
-                                diffuseByteOffset = decl[i].Offset;
+                                format.diffuseByteOffset = decl[i].Offset;
                         if(decl[i].UsageIndex == 1)
-                                specularByteOffset = decl[i].Offset;
+                                format.specularByteOffset = decl[i].Offset;
                 }
                 if(decl[i].Usage == D3DDECLUSAGE_TEXCOORD)
                 {
-                        texByteOffset[decl[i].UsageIndex] = decl[i].Offset;
-                        if(decl[i].UsageIndex >= nTex)
-                                nTex = decl[i].UsageIndex+1;
+                        format.texByteOffset[decl[i].UsageIndex] = decl[i].Offset;
+                        if(decl[i].UsageIndex >= format.nTex)
+                                format.nTex = decl[i].UsageIndex+1;
                 }
                 i++;
         }
+        FlexVertex::setFormat(&format);
 }