Browse Source

Mesh: PrimitiveRenderer naming convention fixup

undefined
Benjamin ‘Touky’ Huet Sam Hocevar <sam@hocevar.net> 9 years ago
parent
commit
b0e0678468
7 changed files with 27 additions and 13 deletions
  1. +14
    -2
      doc/samples/meshviewer/meshviewer.cpp
  2. +1
    -1
      src/Makefile.am
  3. +1
    -1
      src/lol/extras.h
  4. +3
    -3
      src/lolcore.vcxproj
  5. +8
    -6
      src/lolcore.vcxproj.filters
  6. +0
    -0
      src/mesh/primitivemesh.cpp
  7. +0
    -0
      src/mesh/primitivemesh.h

+ 14
- 2
doc/samples/meshviewer/meshviewer.cpp View File

@@ -152,6 +152,8 @@ MeshViewer::~MeshViewer()
//-----------------------------------------------------------------------------
void MeshViewer::Start()
{
if (m_init) return;

/** OLD STUFF **/
//Prepare();

@@ -185,17 +187,24 @@ void MeshViewer::Start()
m_controller->Init(m_profile);
#endif //HAS_INPUT

/** ----- Init is done ----- **/
m_init = true;
//Ref all entities
for (Entity* entity : m_entities) Ticker::Ref(entity);

/** ----- Start threads ----- **/
m_file_check->Start();

/** ----- Init is done ----- **/
m_init = true;
}

//-----------------------------------------------------------------------------
void MeshViewer::Stop()
{
if (!m_init) return;

/** OLD STUFF **/
//Unprepare();

//Destroy scene setup
UpdateSceneSetup(true);

@@ -272,7 +281,10 @@ void MeshViewer::TickGame(float seconds)
{
//Shutdown logic
if (m_controller->IsKeyPressed(MeshViewerKeyInput::Exit))
{
Ticker::Shutdown();
return;
}
}
#endif //HAS_INPUT



+ 1
- 1
src/Makefile.am View File

@@ -106,7 +106,7 @@ liblolcore_sources = \
gpu/lolfx.cpp \
\
mesh/mesh.cpp mesh/mesh.h \
mesh/primitive.cpp mesh/primitive.h \
mesh/primitivemesh.cpp mesh/primitivemesh.h \
\
sys/init.cpp sys/timer.cpp sys/file.cpp sys/hacks.cpp \
sys/thread.cpp sys/threadbase.h \


+ 1
- 1
src/lol/extras.h View File

@@ -51,7 +51,7 @@
// Other objects
#include <lol/../dict.h>
#include <lol/../mesh/mesh.h>
#include <lol/../mesh/primitive.h>
#include <lol/../mesh/primitivemesh.h>
#include <lol/../application/application.h>
#include <lol/../easymesh/csgbsp.h>
#include <lol/../easymesh/easymesh.h>


+ 3
- 3
src/lolcore.vcxproj View File

@@ -166,7 +166,7 @@
<ClCompile Include="math\trig.cpp" />
<ClCompile Include="math\vector.cpp" />
<ClCompile Include="mesh\mesh.cpp" />
<ClCompile Include="mesh\primitive.cpp" />
<ClCompile Include="mesh\primitivemesh.cpp" />
<ClCompile Include="messageservice.cpp" />
<ClCompile Include="platform.cpp" />
<ClCompile Include="platform\d3d9\d3d9input.cpp" />
@@ -327,7 +327,7 @@
<ClInclude Include="lol\sys\timer.h" />
<ClInclude Include="lol\unit.h" />
<ClInclude Include="mesh\mesh.h" />
<ClInclude Include="mesh\primitive.h" />
<ClInclude Include="mesh\primitivemesh.h" />
<ClInclude Include="messageservice.h" />
<ClInclude Include="numeric.h" />
<ClInclude Include="platform.h" />
@@ -427,4 +427,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
</ImportGroup>
</Project>
</Project>

+ 8
- 6
src/lolcore.vcxproj.filters View File

@@ -147,9 +147,6 @@
<ClCompile Include="mesh\mesh.cpp">
<Filter>mesh</Filter>
</ClCompile>
<ClCompile Include="mesh\primitive.cpp">
<Filter>mesh</Filter>
</ClCompile>
<ClCompile Include="gpu\rendercontext.cpp">
<Filter>gpu</Filter>
</ClCompile>
@@ -424,6 +421,10 @@
<ClCompile Include="textureimage.cpp">
<Filter>tileset</Filter>
</ClCompile>
<ClCompile Include="lolimgui.cpp" />
<ClCompile Include="mesh\primitivemesh.cpp">
<Filter>mesh</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="debug\fps.h">
@@ -510,9 +511,6 @@
<ClInclude Include="mesh\mesh.h">
<Filter>mesh</Filter>
</ClInclude>
<ClInclude Include="mesh\primitive.h">
<Filter>mesh</Filter>
</ClInclude>
<ClInclude Include="application\application.h">
<Filter>application</Filter>
</ClInclude>
@@ -790,6 +788,10 @@
<ClInclude Include="textureimage-private.h">
<Filter>tileset</Filter>
</ClInclude>
<ClInclude Include="lolimgui.h" />
<ClInclude Include="mesh\primitivemesh.h">
<Filter>mesh</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<LolFxCompile Include="gpu\emptymaterial.lolfx">


src/mesh/primitive.cpp → src/mesh/primitivemesh.cpp View File


src/mesh/primitive.h → src/mesh/primitivemesh.h View File


Loading…
Cancel
Save