VOXELFRONTEND: new module

src/client/CMakeLists.txt

@@ -17,7 +17,7 @@ set(SRCS
 	ui/LostPasswordWindow.h
 )
 engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} WINDOWED)
-engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES turbobadger frontend util)
+engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES turbobadger voxelfrontend util)
 check_ui_turbobadger(${PROJECT_NAME})
 
 gtest_suite_files(tests

src/client/Client.h

@@ -6,7 +6,7 @@
 
 #include "ServerMessages_generated.h"
 #include "frontend/ClientEntity.h"
-#include "frontend/WorldRenderer.h"
+#include "voxelfrontend/WorldRenderer.h"
 #include "voxel/font/VoxelFont.h"
 #include "util/PosLerp.h"
 #include "core/Var.h"

src/modules/CMakeLists.txt

@@ -19,6 +19,7 @@ add_subdirectory(stock)
 add_subdirectory(poi)
 add_subdirectory(backend)
 add_subdirectory(frontend)
+add_subdirectory(voxelfrontend)
 add_subdirectory(commonlua)
 add_subdirectory(persistence)
 add_subdirectory(testcore)

src/modules/frontend/CMakeLists.txt

@@ -4,28 +4,20 @@ set(SRCS
 	ClientEntity.h ClientEntity.cpp
 	ClientEntityId.h
 	GridRenderer.cpp GridRenderer.h
-	MapRenderer.cpp MapRenderer.h
 	Movement.h
-	OctreeRenderer.cpp OctreeRenderer.h
 	Plane.h
-	PlantDistributor.cpp PlantDistributor.h
 	RandomColorTexture.h RandomColorTexture.cpp
-	RawVolumeRenderer.cpp RawVolumeRenderer.h
-	ShaderAttribute.h
 	Shadow.h Shadow.cpp
 	ShapeRenderer.cpp ShapeRenderer.h
-	WorldRenderer.h WorldRenderer.cpp
 )
 
 set(LIB frontend)
 add_library(${LIB} ${SRCS})
-generate_shaders(${LIB} world mesh water world_instanced shadowmap shadowmap_instanced shadowmap_render color color_instanced)
-engine_target_link_libraries(TARGET ${LIB} DEPENDENCIES network voxel cooldown attrib)
+generate_shaders(${LIB} mesh shadowmap shadowmap_instanced shadowmap_render color color_instanced)
+engine_target_link_libraries(TARGET ${LIB} DEPENDENCIES network noise cooldown attrib)
 set_target_properties(${LIB} PROPERTIES FOLDER ${LIB})
 
 gtest_suite_files(tests
 	tests/FrontendShaderTest.cpp
-	tests/MaterialTest.cpp
-	tests/WorldRendererTest.cpp
 )
-gtest_suite_deps(tests ${LIB} frontend image)
+gtest_suite_deps(tests ${LIB} frontend)

src/modules/frontend/tests/FrontendShaderTest.cpp

@@ -10,15 +10,6 @@ namespace frontend {
 class FrontendShaderTest : public video::AbstractGLTest {
 };
 
-TEST_F(FrontendShaderTest, testWorldShader) {
-	if (!_supported) {
-		return;
-	}
-	shader::WorldShader shader;
-	ASSERT_TRUE(shader.setup());
-	shader.shutdown();
-}
-
 TEST_F(FrontendShaderTest, testMeshShader) {
 	if (!_supported) {
 		return;

src/modules/voxelfrontend/CMakeLists.txt

@@ -0,0 +1,21 @@
+set(SRCS
+	MapRenderer.cpp MapRenderer.h
+	OctreeRenderer.cpp OctreeRenderer.h
+	PlantDistributor.cpp PlantDistributor.h
+	RawVolumeRenderer.cpp RawVolumeRenderer.h
+	ShaderAttribute.h
+	WorldRenderer.h WorldRenderer.cpp
+)
+
+set(LIB voxelfrontend)
+add_library(${LIB} ${SRCS})
+generate_shaders(${LIB} world water world_instanced)
+engine_target_link_libraries(TARGET ${LIB} DEPENDENCIES frontend voxel)
+set_target_properties(${LIB} PROPERTIES FOLDER ${LIB})
+
+gtest_suite_files(tests
+	tests/VoxelFrontendShaderTest.cpp
+	tests/MaterialTest.cpp
+	tests/WorldRendererTest.cpp
+)
+gtest_suite_deps(tests ${LIB} voxelfrontend image)

src/modules/voxelfrontend/OctreeRenderer.h

@@ -4,10 +4,11 @@
 
 #include "voxel/OctreeVolume.h"
 #include "frontend/Shadow.h"
-#include "frontend/ShaderAttribute.h"
+#include "ShaderAttribute.h"
 #include "frontend/RandomColorTexture.h"
 #include "video/Camera.h"
 #include "video/DepthBuffer.h"
+#include "VoxelfrontendShaders.h"
 #include "FrontendShaders.h"
 #include "video/Shader.h"
 #include "video/VertexBuffer.h"

src/modules/voxelfrontend/RawVolumeRenderer.cpp

@@ -1,9 +1,13 @@
+/**
+ * @file
+ */
+
 #include "RawVolumeRenderer.h"
 #include "voxel/polyvox/CubicSurfaceExtractor.h"
 #include "voxel/MaterialColor.h"
 #include "video/ScopedLineWidth.h"
 #include "video/ScopedPolygonMode.h"
-#include "frontend/ShaderAttribute.h"
+#include "ShaderAttribute.h"
 #include "video/Camera.h"
 #include "video/Types.h"
 #include "video/Renderer.h"

src/modules/voxelfrontend/RawVolumeRenderer.h

@@ -1,7 +1,12 @@
+/**
+ * @file
+ */
+
 #pragma once
 
 #include "voxel/polyvox/RawVolume.h"
 #include "video/VertexBuffer.h"
+#include "VoxelfrontendShaders.h"
 #include "FrontendShaders.h"
 #include "voxel/polyvox/Mesh.h"
 #include "frontend/Shadow.h"

src/modules/voxelfrontend/WorldRenderer.cpp

@@ -11,11 +11,11 @@
 #include "core/App.h"
 #include "core/Var.h"
 #include "voxel/MaterialColor.h"
-#include "frontend/PlantDistributor.h"
+#include "PlantDistributor.h"
 #include "video/ScopedViewPort.h"
 #include "video/ScopedLineWidth.h"
 #include "video/ScopedPolygonMode.h"
-#include "frontend/ShaderAttribute.h"
+#include "ShaderAttribute.h"
 
 namespace frontend {
 

src/modules/voxelfrontend/WorldRenderer.h

@@ -13,12 +13,13 @@
 #include "video/UniformBuffer.h"
 #include "video/GBuffer.h"
 #include "video/DepthBuffer.h"
+#include "VoxelfrontendShaders.h"
 #include "FrontendShaders.h"
 #include "core/GLM.h"
 #include "math/Octree.h"
 #include "core/Var.h"
 #include "core/Color.h"
-#include "ClientEntity.h"
+#include "frontend/ClientEntity.h"
 #include "frontend/Shadow.h"
 #include "frontend/RandomColorTexture.h"
 #include "video/ShapeBuilder.h"

src/modules/voxelfrontend/tests/VoxelFrontendShaderTest.cpp

@@ -0,0 +1,22 @@
+/**
+ * @file
+ */
+
+#include "video/tests/AbstractGLTest.h"
+#include "VoxelfrontendShaders.h"
+
+namespace frontend {
+
+class VoxelFrontendShaderTest : public video::AbstractGLTest {
+};
+
+TEST_F(VoxelFrontendShaderTest, testWorldShader) {
+	if (!_supported) {
+		return;
+	}
+	shader::WorldShader shader;
+	ASSERT_TRUE(shader.setup());
+	shader.shutdown();
+}
+
+}

src/modules/voxelfrontend/tests/WorldRendererTest.cpp

@@ -3,7 +3,7 @@
  */
 
 #include "core/tests/AbstractTest.h"
-#include "frontend/WorldRenderer.h"
+#include "voxelfrontend/WorldRenderer.h"
 #include "voxel/World.h"
 
 namespace frontend {

src/tests/testvoxelfont/CMakeLists.txt

@@ -3,4 +3,4 @@ set(SRCS
 	TestVoxelFont.h TestVoxelFont.cpp
 )
 engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} WINDOWED NOINSTALL)
-engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES testcore)
+engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES testcore voxelfrontend)

src/tests/testvoxelfont/TestVoxelFont.h

@@ -6,7 +6,7 @@
 
 #include "testcore/TestApp.h"
 #include "voxel/font/VoxelFont.h"
-#include "frontend/RawVolumeRenderer.h"
+#include "voxelfrontend/RawVolumeRenderer.h"
 #include "video/VertexBuffer.h"
 #include "FrontendShaders.h"
 

src/tools/mapedit/CMakeLists.txt

@@ -3,4 +3,4 @@ set(SRCS
 	MapEdit.h MapEdit.cpp
 )
 engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} WINDOWED)
-engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES imgui frontend voxel util commonlua)
+engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES imgui frontend voxelfrontend util commonlua)

src/tools/mapedit/MapEdit.h

@@ -6,7 +6,7 @@
 
 #include "ui/imgui/IMGUIApp.h"
 #include "FrontendShaders.h"
-#include "frontend/WorldRenderer.h"
+#include "voxelfrontend/WorldRenderer.h"
 #include "frontend/ClientEntity.h"
 #include "frontend/Axis.h"
 #include "video/Camera.h"

src/tools/noisetool2/CMakeLists.txt

@@ -14,4 +14,4 @@ set(SRCS
 	nodes/RGBANode.h nodes/RGBANode.cpp
 )
 engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} WINDOWED)
-engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES imgui noise image voxel frontend collection)
+engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES imgui noise image voxelfrontend collection)

src/tools/noisetool2/nodes/VolumeNode.h

@@ -1,9 +1,13 @@
+/**
+ * @file
+ */
+
 #pragma once
 
 #include "NNode.h"
 #include "collection/ConcurrentQueue.h"
 #include "core/ThreadPool.h"
-#include "frontend/RawVolumeRenderer.h"
+#include "voxelfrontend/RawVolumeRenderer.h"
 #include "video/FrameBuffer.h"
 #include "video/Texture.h"
 #include "video/Camera.h"

src/tools/shapetool/CMakeLists.txt

@@ -3,5 +3,5 @@ set(SRCS
 	ShapeTool.h ShapeTool.cpp
 )
 engine_add_executable(TARGET ${PROJECT_NAME} SRCS ${SRCS} WINDOWED)
-engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES turbobadger frontend util commonlua)
+engine_target_link_libraries(TARGET ${PROJECT_NAME} DEPENDENCIES turbobadger voxelfrontend util commonlua)
 check_ui_turbobadger(${PROJECT_NAME})

src/tools/shapetool/ShapeTool.h

@@ -6,7 +6,7 @@
 
 #include "ui/turbobadger/UIApp.h"
 #include "FrontendShaders.h"
-#include "frontend/OctreeRenderer.h"
+#include "voxelfrontend/OctreeRenderer.h"
 #include "frontend/ClientEntity.h"
 #include "frontend/Axis.h"
 #include "video/Camera.h"

src/tools/voxedit/ui/editorscene/Model.h

@@ -11,7 +11,7 @@
 #include "voxel/TreeContext.h"
 #include "voxel/generator/BuildingGeneratorContext.h"
 #include "voxel/generator/NoiseGenerator.h"
-#include "frontend/RawVolumeRenderer.h"
+#include "voxelfrontend/RawVolumeRenderer.h"
 #include "video/ShapeBuilder.h"
 #include "frontend/ShapeRenderer.h"
 #include "frontend/GridRenderer.h"

src/tools/voxedit/voxedit-util/CMakeLists.txt

@@ -22,7 +22,7 @@ set(SRCS
 set(LIB voxedit-util)
 add_library(${LIB} ${SRCS})
 set_target_properties(${LIB} PROPERTIES FOLDER ${LIB})
-engine_target_link_libraries(TARGET ${LIB} DEPENDENCIES frontend util voxel math)
+engine_target_link_libraries(TARGET ${LIB} DEPENDENCIES voxelfrontend util voxel math)
 
 gtest_suite_files(tests
 	tests/UndoHandlerTest.cpp