From 5d96d6905f8034f82680a8d050e5aa97ae778bdc Mon Sep 17 00:00:00 2001 From: IlyaShurupov Date: Tue, 18 Jun 2024 17:33:39 +0300 Subject: [PATCH] clean up --- 3DEditor/CMakeLists.txt | 8 ++++---- 3DEditor/public/EditorWidget.hpp | 5 +++-- RasterRender/CMakeLists.txt | 2 +- {3DEditor => RasterRender}/private/GPUBuffers.hpp | 0 {3DEditor => RasterRender}/private/Render.cpp | 14 +++++++------- .../public/RasterRender.hpp | 6 +++--- RayTracer/CMakeLists.txt | 2 +- RayTracer/{applications => }/rsc/cube/meshes.obj | 0 RayTracer/{applications => }/rsc/cube/script.lua | 0 RayTracer/{applications => }/rsc/normals.blend | Bin .../{applications => }/rsc/normals/normals.obj | 0 .../{applications => }/rsc/normals/script.lua | 0 RayTracer/{applications => }/rsc/scene.blend | Bin RayTracer/{applications => }/rsc/scene/meshes.mtl | 0 RayTracer/{applications => }/rsc/scene/meshes.obj | 0 RayTracer/{applications => }/rsc/scene/script.lua | 0 16 files changed, 19 insertions(+), 18 deletions(-) rename {3DEditor => RasterRender}/private/GPUBuffers.hpp (100%) rename {3DEditor => RasterRender}/private/Render.cpp (73%) rename 3DEditor/public/Render.hpp => RasterRender/public/RasterRender.hpp (79%) rename RayTracer/{applications => }/rsc/cube/meshes.obj (100%) rename RayTracer/{applications => }/rsc/cube/script.lua (100%) rename RayTracer/{applications => }/rsc/normals.blend (100%) rename RayTracer/{applications => }/rsc/normals/normals.obj (100%) rename RayTracer/{applications => }/rsc/normals/script.lua (100%) rename RayTracer/{applications => }/rsc/scene.blend (100%) rename RayTracer/{applications => }/rsc/scene/meshes.mtl (100%) rename RayTracer/{applications => }/rsc/scene/meshes.obj (100%) rename RayTracer/{applications => }/rsc/scene/script.lua (100%) diff --git a/3DEditor/CMakeLists.txt b/3DEditor/CMakeLists.txt index 3f328b7..2e54bca 100644 --- a/3DEditor/CMakeLists.txt +++ b/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_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets Math RasterRender 3DScene) -target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS}) +target_include_directories(${PROJECT_NAME} INTERFACE ./public/ ${BINDINGS_INCLUDE} ./ext/) +target_link_libraries(${PROJECT_NAME} INTERFACE Graphics Connection Widgets Math RasterRender) +target_link_libraries(${PROJECT_NAME} INTERFACE ${BINDINGS_LIBS}) ### -------------------------- Applications -------------------------- ### file(GLOB APP_SOURCES "./applications/*.cpp") diff --git a/3DEditor/public/EditorWidget.hpp b/3DEditor/public/EditorWidget.hpp index a7996d3..b9564b2 100644 --- a/3DEditor/public/EditorWidget.hpp +++ b/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; }; diff --git a/RasterRender/CMakeLists.txt b/RasterRender/CMakeLists.txt index fd8c89c..c79d8ef 100644 --- a/RasterRender/CMakeLists.txt +++ b/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}) \ No newline at end of file diff --git a/3DEditor/private/GPUBuffers.hpp b/RasterRender/private/GPUBuffers.hpp similarity index 100% rename from 3DEditor/private/GPUBuffers.hpp rename to RasterRender/private/GPUBuffers.hpp diff --git a/3DEditor/private/Render.cpp b/RasterRender/private/Render.cpp similarity index 73% rename from 3DEditor/private/Render.cpp rename to RasterRender/private/Render.cpp index c5f288e..53037ce 100644 --- a/3DEditor/private/Render.cpp +++ b/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; } diff --git a/3DEditor/public/Render.hpp b/RasterRender/public/RasterRender.hpp similarity index 79% rename from 3DEditor/public/Render.hpp rename to RasterRender/public/RasterRender.hpp index 8d49533..9255112 100644 --- a/3DEditor/public/Render.hpp +++ b/RasterRender/public/RasterRender.hpp @@ -7,10 +7,10 @@ #include "Shader.hpp" namespace tp { - class Render { + class RasterRender { public: - explicit Render(Vec2F renderResolution); - ~Render(); + explicit RasterRender(Vec2F renderResolution); + ~RasterRender(); void render(const Scene& geometry, Vec2F size); uint4 getRenderBufferID(); diff --git a/RayTracer/CMakeLists.txt b/RayTracer/CMakeLists.txt index 976834c..bbf72ea 100644 --- a/RayTracer/CMakeLists.txt +++ b/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") diff --git a/RayTracer/applications/rsc/cube/meshes.obj b/RayTracer/rsc/cube/meshes.obj similarity index 100% rename from RayTracer/applications/rsc/cube/meshes.obj rename to RayTracer/rsc/cube/meshes.obj diff --git a/RayTracer/applications/rsc/cube/script.lua b/RayTracer/rsc/cube/script.lua similarity index 100% rename from RayTracer/applications/rsc/cube/script.lua rename to RayTracer/rsc/cube/script.lua diff --git a/RayTracer/applications/rsc/normals.blend b/RayTracer/rsc/normals.blend similarity index 100% rename from RayTracer/applications/rsc/normals.blend rename to RayTracer/rsc/normals.blend diff --git a/RayTracer/applications/rsc/normals/normals.obj b/RayTracer/rsc/normals/normals.obj similarity index 100% rename from RayTracer/applications/rsc/normals/normals.obj rename to RayTracer/rsc/normals/normals.obj diff --git a/RayTracer/applications/rsc/normals/script.lua b/RayTracer/rsc/normals/script.lua similarity index 100% rename from RayTracer/applications/rsc/normals/script.lua rename to RayTracer/rsc/normals/script.lua diff --git a/RayTracer/applications/rsc/scene.blend b/RayTracer/rsc/scene.blend similarity index 100% rename from RayTracer/applications/rsc/scene.blend rename to RayTracer/rsc/scene.blend diff --git a/RayTracer/applications/rsc/scene/meshes.mtl b/RayTracer/rsc/scene/meshes.mtl similarity index 100% rename from RayTracer/applications/rsc/scene/meshes.mtl rename to RayTracer/rsc/scene/meshes.mtl diff --git a/RayTracer/applications/rsc/scene/meshes.obj b/RayTracer/rsc/scene/meshes.obj similarity index 100% rename from RayTracer/applications/rsc/scene/meshes.obj rename to RayTracer/rsc/scene/meshes.obj diff --git a/RayTracer/applications/rsc/scene/script.lua b/RayTracer/rsc/scene/script.lua similarity index 100% rename from RayTracer/applications/rsc/scene/script.lua rename to RayTracer/rsc/scene/script.lua