From 86a41c1876a27473a3a28a5eef89d27677d48114 Mon Sep 17 00:00:00 2001 From: IlyaShurupov Date: Mon, 29 Apr 2024 12:37:39 +0300 Subject: [PATCH] tmp --- 3DEditor/CMakeLists.txt | 4 ++-- 3DEditor/applications/Entry.cpp | 3 ++- CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/3DEditor/CMakeLists.txt b/3DEditor/CMakeLists.txt index 4ade195..e11e387 100644 --- a/3DEditor/CMakeLists.txt +++ b/3DEditor/CMakeLists.txt @@ -15,8 +15,8 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets Math Ra target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS}) ### -------------------------- Applications -------------------------- ### -add_executable(edit3d ./applications/Entry.cpp ./applications/SceneLoad.cpp) -target_link_libraries(edit3d ${PROJECT_NAME} Lua ImageIO) +add_executable(3DEditorApp ./applications/Entry.cpp ./applications/SceneLoad.cpp) +target_link_libraries(3DEditorApp ${PROJECT_NAME} Lua ImageIO) file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") diff --git a/3DEditor/applications/Entry.cpp b/3DEditor/applications/Entry.cpp index fdd62de..fb1e37e 100644 --- a/3DEditor/applications/Entry.cpp +++ b/3DEditor/applications/Entry.cpp @@ -15,7 +15,7 @@ public: // mGui = new EditorWidget(canvas, &geometry, renderResolution); mGui = new ShortcutsTest(); - + loadMeshes(geometry, "rsc/scene.obj"); geometry.mCamera.lookAtPoint({ 0, 0, 0 }, { 3, 3, 2 }, { 0, 0, 1 }); @@ -24,6 +24,7 @@ public: ~EditorGUI() override { delete mGui; } void processFrame(EventHandler* eventHandler) override { + auto rec = RectF({ 0, 0 }, mWindow->getSize()); mGui->proc(*eventHandler, rec, rec); } diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f36c2..c211e67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,4 +24,4 @@ add_subdirectory(Widgets) add_subdirectory(LibraryViewer) add_subdirectory(RasterRender) add_subdirectory(Sketch3D) -add_subdirectory(3DEditor) \ No newline at end of file +add_subdirectory(3DEditor)