clean up

3DEditor/CMakeLists.txt

@@ -8,11 +8,11 @@ set(BINDINGS_LIBS glfw Imgui)
 file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp")
 file(GLOB HEADERS "./public/*.hpp" "./public/*/*.hpp")
 
-add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
+add_library(${PROJECT_NAME} INTERFACE ${HEADERS})
 
-target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/)
+target_include_directories(${PROJECT_NAME} INTERFACE ./public/ ${BINDINGS_INCLUDE} ./ext/)
-target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets Math RasterRender 3DScene)
+target_link_libraries(${PROJECT_NAME} INTERFACE Graphics Connection Widgets Math RasterRender)
-target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS})
+target_link_libraries(${PROJECT_NAME} INTERFACE ${BINDINGS_LIBS})
 
 ### -------------------------- Applications  --------------------------  ###
 file(GLOB APP_SOURCES "./applications/*.cpp")

3DEditor/public/EditorWidget.hpp

@@ -1,5 +1,5 @@
 #include "Widgets.hpp"
-#include "Render.hpp"
+#include "RasterRender.hpp"
 
 namespace tp {
 
@@ -28,8 +28,9 @@ namespace tp {
 		}
 
 	public:
-		Render mRender;
+		RasterRender mRender;
 		Scene* mScene = nullptr;
+
 		Canvas* mCanvas = nullptr;
 		Canvas::ImageHandle mImage;
 	};

RasterRender/CMakeLists.txt

@@ -11,5 +11,5 @@ file(GLOB HEADERS "./public/*.hpp" "./public/*/*.hpp")
 add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
 
 target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/)
-target_link_libraries(${PROJECT_NAME} PUBLIC Math Connection)
+target_link_libraries(${PROJECT_NAME} PUBLIC Math Connection 3DScene)
 target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS})

RasterRender/private/Render.cpp

@@ -1,21 +1,21 @@
-#include "Render.hpp"
+#include "RasterRender.hpp"
 #include "GPUBuffers.hpp"
 
 using namespace tp;
 
-Render::Render(Vec2F renderResolution) :
+RasterRender::RasterRender(Vec2F renderResolution) :
 	mRenderBuffer(renderResolution) {
 
 	mDefaultShader.load("rsc/shaders/default.vert", nullptr, "rsc/shaders/default.frag", true);
 }
 
-Render::~Render() {}
+RasterRender::~RasterRender() {}
 
-uint4 Render::getRenderBufferID() { return mRenderBuffer.texId(); }
+uint4 RasterRender::getRenderBufferID() { return mRenderBuffer.texId(); }
 
-Vec2F Render::getBufferSize() { return mRenderBuffer.getSize(); }
+Vec2F RasterRender::getBufferSize() { return mRenderBuffer.getSize(); }
 
-void Render::render(const Scene& geometry, Vec2F size) {
+void RasterRender::render(const Scene& geometry, Vec2F size) {
 
 	for (auto object : geometry.mObjects) {
 		if (!object->mGUPBuffers) {
@@ -55,4 +55,4 @@ void Render::render(const Scene& geometry, Vec2F size) {
 	mRenderBuffer.endDraw();
 }
 
-RenderBuffer* Render::getRenderBuffer() { return &mRenderBuffer; }
+RenderBuffer* RasterRender::getRenderBuffer() { return &mRenderBuffer; }

RasterRender/public/RasterRender.hpp

@@ -7,10 +7,10 @@
 #include "Shader.hpp"
 
 namespace tp {
-	class Render {
+	class RasterRender {
 	public:
-		explicit Render(Vec2F renderResolution);
+		explicit RasterRender(Vec2F renderResolution);
-		~Render();
+		~RasterRender();
 
 		void render(const Scene& geometry, Vec2F size);
 		uint4 getRenderBufferID();

RayTracer/CMakeLists.txt

@@ -11,7 +11,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC 3DScene Connection)
 file(GLOB APP_SOURCES "./applications/*.cpp")
 add_executable(rayt ${APP_SOURCES})
 target_link_libraries(rayt ${PROJECT_NAME} Lua ImageIO)
-file(COPY "applications/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
 
 ### -------------------------- Tests  --------------------------  ###
 file(GLOB TEST_SOURCES "./tests/*.cpp" "./tests/*/*.cpp")