#5912: Move GeometryStore implementation to render libs, to make it a…

…ccessible to unit tests
codereader · Mar 5, 2022 · 3490d0a · 3490d0a
1 parent ab413fd
commit 3490d0a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/...core/rendersystem/backend/GeometryStore.h → libs/render/GeometryStore.h b/...core/rendersystem/backend/GeometryStore.h → libs/render/GeometryStore.h
@@ -2,8 +2,9 @@
 
 #include <stdexcept>
 #include <limits>
+#include "igl.h"
 #include "igeometrystore.h"
-#include "render/ContinuousBuffer.h"
+#include "ContinuousBuffer.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.h b/radiantcore/rendersystem/OpenGLRenderSystem.h
@@ -8,8 +8,8 @@
 #include "backend/OpenGLShader.h"
 #include "backend/OpenGLStateLess.h"
 #include "backend/TextRenderer.h"
-#include "backend/GeometryStore.h"
 #include "backend/SceneRenderer.h"
+#include "render/GeometryStore.h"
 
 namespace render
 {

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -1015,7 +1015,6 @@
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\SceneRenderer.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\SurfaceRenderer.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\TextRenderer.h" />
-    <ClInclude Include="..\..\radiantcore\rendersystem\backend\GeometryStore.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\WindingRenderer.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\debug\SpacePartitionRenderer.h" />
     <ClInclude Include="..\..\radiantcore\rendersystem\GLFont.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2325,9 +2325,6 @@
     <ClInclude Include="..\..\radiantcore\entity\RenderableObjectCollection.h">
       <Filter>src\entity</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\rendersystem\backend\GeometryStore.h">
-      <Filter>src\rendersystem\backend</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiantcore\rendersystem\backend\glprogram\GLSLCubeMapProgram.h">
       <Filter>src\rendersystem\backend\glprogram</Filter>
     </ClInclude>

diff --git a/tools/msvc/libs.vcxproj b/tools/msvc/libs.vcxproj
@@ -213,6 +213,7 @@
     <ClInclude Include="..\..\libs\render\Colour4b.h" />
     <ClInclude Include="..\..\libs\render\CompactWindingVertexBuffer.h" />
     <ClInclude Include="..\..\libs\render\ContinuousBuffer.h" />
+    <ClInclude Include="..\..\libs\render\GeometryStore.h" />
     <ClInclude Include="..\..\libs\render\IndexedVertexBuffer.h" />
     <ClInclude Include="..\..\libs\render\MeshVertex.h" />
     <ClInclude Include="..\..\libs\render\NopRenderView.h" />

diff --git a/tools/msvc/libs.vcxproj.filters b/tools/msvc/libs.vcxproj.filters
@@ -371,6 +371,9 @@
     <ClInclude Include="..\..\libs\render\MeshVertex.h">
       <Filter>render</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\render\GeometryStore.h">
+      <Filter>render</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="util">