Changeset 2077Tweet

Timestamp:

Nov 7, 2012, 6:27:53 PM (8 years ago)

Author:

sam

Message:

mesh: start working on mesh and submesh stuff.

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• core.h (modified) (1 diff)
• easymesh/easymesh.cpp (modified) (1 diff)
• lolcore.vcxproj (modified) (2 diffs)
• lolcore.vcxproj.filters (modified) (3 diffs)
• mesh (added)
• mesh/mesh.cpp (added)
• mesh/mesh.h (added)

trunk/src/Makefile.am

@@ -63 +63 @@
     generated/lolfx-parser.cpp generated/lolfx-parser.h \
     generated/lolfx-scanner.cpp \
+    \
+    mesh/mesh.cpp mesh/mesh.h \
     \
     image/image.cpp image/image.h image/image-private.h \

trunk/src/core.h

@@ -121 +121 @@
 #include "gpu/vertexbuffer.h"
 #include "gpu/framebuffer.h"
+#include "mesh/mesh.h"
 #include "image/image.h"
 #include "application/application.h"

trunk/src/easymesh/easymesh.cpp

@@ -121 +121 @@
     m_gpu.shader->SetUniform(m_gpu.normalmat, normalmat);
     m_gpu.shader->SetUniform(m_gpu.damage, damage);
+    m_gpu.vdecl->Bind();
     m_gpu.vdecl->SetStream(m_gpu.vbo, m_gpu.coord, m_gpu.norm, m_gpu.color);
-    m_gpu.vdecl->Bind();
     m_gpu.ibo->Bind();
     m_gpu.vdecl->DrawIndexedElements(MeshPrimitive::Triangles,

trunk/src/lolcore.vcxproj

@@ -276 +276 @@
     <ClCompile Include="math\trig.cpp" />
     <ClCompile Include="math\vector.cpp" />
+    <ClCompile Include="mesh\mesh.cpp" />
     <ClCompile Include="platform.cpp" />
     <ClCompile Include="platform\d3d9\d3d9input.cpp" />
@@ -590 +591 @@
     <ClInclude Include="lol\math\vector.h" />
     <ClInclude Include="lol\unit.h" />
+    <ClInclude Include="mesh\mesh.h" />
     <ClInclude Include="map.h" />
     <ClInclude Include="numeric.h" />

trunk/src/lolcore.vcxproj.filters

@@ -27 +27 @@
       <UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\mesh">
+      <UniqueIdentifier>{1eaa8df5-7a31-4358-a1e9-0e265de6ed49}</UniqueIdentifier>
+    </Filter>
     <Filter Include="src\gpu">
       <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier>
@@ -95 +98 @@
       <Filter>src\math</Filter>
     </ClCompile>
+    <ClCompile Include="mesh\mesh.cpp">
+      <Filter>src\mesh</Filter>
+    </ClCompile>
     <ClCompile Include="gpu\shader.cpp">
       <Filter>src\gpu</Filter>
@@ -672 +678 @@
     <ClInclude Include="lol\unit.h">
       <Filter>src\lol</Filter>
+    </ClInclude>
+    <ClInclude Include="mesh\mesh.h">
+      <Filter>src\mesh</Filter>
     </ClInclude>
     <ClInclude Include="gpu\shader.h">