Changeset 2077


Ignore:
Timestamp:
Nov 7, 2012, 6:27:53 PM (7 years ago)
Author:
sam
Message:

mesh: start working on mesh and submesh stuff.

Location:
trunk/src
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r2009 r2077  
    6363    generated/lolfx-parser.cpp generated/lolfx-parser.h \
    6464    generated/lolfx-scanner.cpp \
     65    \
     66    mesh/mesh.cpp mesh/mesh.h \
    6567    \
    6668    image/image.cpp image/image.h image/image-private.h \
  • trunk/src/core.h

    r2009 r2077  
    121121#include "gpu/vertexbuffer.h"
    122122#include "gpu/framebuffer.h"
     123#include "mesh/mesh.h"
    123124#include "image/image.h"
    124125#include "application/application.h"
  • trunk/src/easymesh/easymesh.cpp

    r1963 r2077  
    121121    m_gpu.shader->SetUniform(m_gpu.normalmat, normalmat);
    122122    m_gpu.shader->SetUniform(m_gpu.damage, damage);
     123    m_gpu.vdecl->Bind();
    123124    m_gpu.vdecl->SetStream(m_gpu.vbo, m_gpu.coord, m_gpu.norm, m_gpu.color);
    124     m_gpu.vdecl->Bind();
    125125    m_gpu.ibo->Bind();
    126126    m_gpu.vdecl->DrawIndexedElements(MeshPrimitive::Triangles,
  • trunk/src/lolcore.vcxproj

    r2009 r2077  
    276276    <ClCompile Include="math\trig.cpp" />
    277277    <ClCompile Include="math\vector.cpp" />
     278    <ClCompile Include="mesh\mesh.cpp" />
    278279    <ClCompile Include="platform.cpp" />
    279280    <ClCompile Include="platform\d3d9\d3d9input.cpp" />
     
    590591    <ClInclude Include="lol\math\vector.h" />
    591592    <ClInclude Include="lol\unit.h" />
     593    <ClInclude Include="mesh\mesh.h" />
    592594    <ClInclude Include="map.h" />
    593595    <ClInclude Include="numeric.h" />
  • trunk/src/lolcore.vcxproj.filters

    r2009 r2077  
    2727      <UniqueIdentifier>{2caadbda-b9f1-446d-bbd2-55c959db342c}</UniqueIdentifier>
    2828    </Filter>
     29    <Filter Include="src\mesh">
     30      <UniqueIdentifier>{1eaa8df5-7a31-4358-a1e9-0e265de6ed49}</UniqueIdentifier>
     31    </Filter>
    2932    <Filter Include="src\gpu">
    3033      <UniqueIdentifier>{ec9b94fc-c716-4ef2-9c3b-c7f3447574b0}</UniqueIdentifier>
     
    9598      <Filter>src\math</Filter>
    9699    </ClCompile>
     100    <ClCompile Include="mesh\mesh.cpp">
     101      <Filter>src\mesh</Filter>
     102    </ClCompile>
    97103    <ClCompile Include="gpu\shader.cpp">
    98104      <Filter>src\gpu</Filter>
     
    672678    <ClInclude Include="lol\unit.h">
    673679      <Filter>src\lol</Filter>
     680    </ClInclude>
     681    <ClInclude Include="mesh\mesh.h">
     682      <Filter>src\mesh</Filter>
    674683    </ClInclude>
    675684    <ClInclude Include="gpu\shader.h">
Note: See TracChangeset for help on using the changeset viewer.