ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tmp

Browse source
This commit is contained in:
IlyaShurupov 2024-04-29 12:37:39 +03:00
parent 8171ba03da
commit 86a41c1876
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
3DEditor/CMakeLists.txt
View file

@ -15,8 +15,8 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets Math Ra
target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS}) target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS})
### -------------------------- Applications -------------------------- ### ### -------------------------- Applications -------------------------- ###
add_executable(edit3d ./applications/Entry.cpp ./applications/SceneLoad.cpp) add_executable(3DEditorApp ./applications/Entry.cpp ./applications/SceneLoad.cpp)
target_link_libraries(edit3d ${PROJECT_NAME} Lua ImageIO) target_link_libraries(3DEditorApp ${PROJECT_NAME} Lua ImageIO)
file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

3
3DEditor/applications/Entry.cpp
View file

@ -15,7 +15,7 @@ public:
// mGui = new EditorWidget<EventHandler, Canvas>(canvas, &geometry, renderResolution); // mGui = new EditorWidget<EventHandler, Canvas>(canvas, &geometry, renderResolution);
mGui = new ShortcutsTest<EventHandler, Canvas>(); mGui = new ShortcutsTest<EventHandler, Canvas>();
loadMeshes(geometry, "rsc/scene.obj"); loadMeshes(geometry, "rsc/scene.obj");
geometry.mCamera.lookAtPoint({ 0, 0, 0 }, { 3, 3, 2 }, { 0, 0, 1 }); geometry.mCamera.lookAtPoint({ 0, 0, 0 }, { 3, 3, 2 }, { 0, 0, 1 });
@ -24,6 +24,7 @@ public:
~EditorGUI() override { delete mGui; } ~EditorGUI() override { delete mGui; }
void processFrame(EventHandler* eventHandler) override { void processFrame(EventHandler* eventHandler) override {
auto rec = RectF({ 0, 0 }, mWindow->getSize()); auto rec = RectF({ 0, 0 }, mWindow->getSize());
mGui->proc(*eventHandler, rec, rec); mGui->proc(*eventHandler, rec, rec);
} }

2
CMakeLists.txt
View file

@ -24,4 +24,4 @@ add_subdirectory(Widgets)
add_subdirectory(LibraryViewer) add_subdirectory(LibraryViewer)
add_subdirectory(RasterRender) add_subdirectory(RasterRender)
add_subdirectory(Sketch3D) add_subdirectory(Sketch3D)
add_subdirectory(3DEditor) add_subdirectory(3DEditor)