Changeset 2077
- Timestamp:
- Nov 7, 2012, 6:27:53 PM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 3 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.am
r2009 r2077 63 63 generated/lolfx-parser.cpp generated/lolfx-parser.h \ 64 64 generated/lolfx-scanner.cpp \ 65 \ 66 mesh/mesh.cpp mesh/mesh.h \ 65 67 \ 66 68 image/image.cpp image/image.h image/image-private.h \ -
trunk/src/core.h
r2009 r2077 121 121 #include "gpu/vertexbuffer.h" 122 122 #include "gpu/framebuffer.h" 123 #include "mesh/mesh.h" 123 124 #include "image/image.h" 124 125 #include "application/application.h" -
trunk/src/easymesh/easymesh.cpp
r1963 r2077 121 121 m_gpu.shader->SetUniform(m_gpu.normalmat, normalmat); 122 122 m_gpu.shader->SetUniform(m_gpu.damage, damage); 123 m_gpu.vdecl->Bind(); 123 124 m_gpu.vdecl->SetStream(m_gpu.vbo, m_gpu.coord, m_gpu.norm, m_gpu.color); 124 m_gpu.vdecl->Bind();125 125 m_gpu.ibo->Bind(); 126 126 m_gpu.vdecl->DrawIndexedElements(MeshPrimitive::Triangles, -
trunk/src/lolcore.vcxproj
r2009 r2077 276 276 <ClCompile Include="math\trig.cpp" /> 277 277 <ClCompile Include="math\vector.cpp" /> 278 <ClCompile Include="mesh\mesh.cpp" /> 278 279 <ClCompile Include="platform.cpp" /> 279 280 <ClCompile Include="platform\d3d9\d3d9input.cpp" /> … … 590 591 <ClInclude Include="lol\math\vector.h" /> 591 592 <ClInclude Include="lol\unit.h" /> 593 <ClInclude Include="mesh\mesh.h" /> 592 594 <ClInclude Include="map.h" /> 593 595 <ClInclude Include="numeric.h" /> -
trunk/src/lolcore.vcxproj.filters
r2009 r2077 27 27 <UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier> 28 28 </Filter> 29 <Filter Include="src\mesh"> 30 <UniqueIdentifier>{1eaa8df5-7a31-4358-a1e9-0e265de6ed49}</UniqueIdentifier> 31 </Filter> 29 32 <Filter Include="src\gpu"> 30 33 <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier> … … 95 98 <Filter>src\math</Filter> 96 99 </ClCompile> 100 <ClCompile Include="mesh\mesh.cpp"> 101 <Filter>src\mesh</Filter> 102 </ClCompile> 97 103 <ClCompile Include="gpu\shader.cpp"> 98 104 <Filter>src\gpu</Filter> … … 672 678 <ClInclude Include="lol\unit.h"> 673 679 <Filter>src\lol</Filter> 680 </ClInclude> 681 <ClInclude Include="mesh\mesh.h"> 682 <Filter>src\mesh</Filter> 674 683 </ClInclude> 675 684 <ClInclude Include="gpu\shader.h">
Note: See TracChangeset
for help on using the changeset viewer.