Merge pull request #231 from kimkulling/kimkulling/fix_editor_name

Kimkulling/fix editor name
kimkulling · Sep 6, 2024 · 9181039 · 9181039
2 parents 8f8d251 + ed85117
commit 9181039
Show file tree

Hide file tree

Showing 29 changed files with 9 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES( BEFORE
     contrib/assimp/include
     contrib/stb
     contrib/glew/include
-	contrib/unzip
+    contrib/unzip
     contrib/cppcore/include
     contrib/assimp/contrib/zlib
     contrib/cppcore/contrib/gtest-1.7.0/include
@@ -96,8 +96,8 @@ endif()
 
 if (WIN32)
     if (OSRE_BUILD_ED)
-        ADD_SUBDIRECTORY( src/Editor_imgui)
-        set_target_properties(osre_ed_imgui PROPERTIES FOLDER Editor)
+        ADD_SUBDIRECTORY( src/Editor)
+        set_target_properties(osre_ed PROPERTIES FOLDER Editor)
     endif()
 endif()
 

diff --git a/contrib/cppcore b/contrib/cppcore
diff --git a/src/Editor_imgui/CMakeLists.txt → src/Editor/CMakeLists.txt b/src/Editor_imgui/CMakeLists.txt → src/Editor/CMakeLists.txt
@@ -16,7 +16,7 @@ link_directories(
     ${Python3_LIBRARIES}
 )
 
-SET( inspector_module_src 
+SET( inspector_module_src
     src/Modules/InspectorModule/InspectorModule.cpp
     src/Modules/InspectorModule/InspectorModule.h
 )
@@ -31,19 +31,19 @@ SET( editor_module_src
     src/Modules/EditorModule/EditorModule.cpp
 )
 
-SET( modules_src 
+SET( modules_src
     src/Modules/ModuleRegistry.h
     src/Modules/ModuleRegistry.cpp
 )
 
-SET( scripting_src 
+SET( scripting_src
     src/Scripting/PythonInterface.cpp
     src/Scripting/PythonInterface.h
 )
 
 set(renderview_src
     src/RenderView/MainRenderView.cpp
-    src/RenderView/MainRenderView.h    
+    src/RenderView/MainRenderView.h
 )
 
 set(actions_src
@@ -76,7 +76,6 @@ SOURCE_GROUP(Modules\\LogModule       FILES ${log_module_src} )
 SOURCE_GROUP(Modules\\EditorModule    FILES ${editor_module_src} )
 SOURCE_GROUP(Modules\\                FILES ${modules_src} )
 SOURCE_GROUP(Scripting\\              FILES ${scripting_src} )
-
 SOURCE_GROUP(Main\\                   FILES ${main_src})
 
 ADD_EXECUTABLE( osre_ed

diff --git a/src/Editor_imgui/src/Actions/ActionBase.h → src/Editor/src/Actions/ActionBase.h b/src/Editor_imgui/src/Actions/ActionBase.h → src/Editor/src/Actions/ActionBase.h
diff --git a/...Editor_imgui/src/Actions/ImportAction.cpp → src/Editor/src/Actions/ImportAction.cpp b/...Editor_imgui/src/Actions/ImportAction.cpp → src/Editor/src/Actions/ImportAction.cpp
diff --git a/src/Editor_imgui/src/Actions/ImportAction.h → src/Editor/src/Actions/ImportAction.h b/src/Editor_imgui/src/Actions/ImportAction.h → src/Editor/src/Actions/ImportAction.h
diff --git a/src/Editor_imgui/src/Gui/UIElements.cpp → src/Editor/src/Gui/UIElements.cpp b/src/Editor_imgui/src/Gui/UIElements.cpp → src/Editor/src/Gui/UIElements.cpp
diff --git a/src/Editor_imgui/src/Gui/UIElements.h → src/Editor/src/Gui/UIElements.h b/src/Editor_imgui/src/Gui/UIElements.h → src/Editor/src/Gui/UIElements.h
diff --git a/src/Editor_imgui/src/Gui/UIElementsWin32.cpp → src/Editor/src/Gui/UIElementsWin32.cpp b/src/Editor_imgui/src/Gui/UIElementsWin32.cpp → src/Editor/src/Gui/UIElementsWin32.cpp
diff --git a/src/Editor_imgui/src/Gui/UIElementsWin32.h → src/Editor/src/Gui/UIElementsWin32.h b/src/Editor_imgui/src/Gui/UIElementsWin32.h → src/Editor/src/Gui/UIElementsWin32.h
diff --git a/...src/Modules/EditorModule/EditorModule.cpp → ...src/Modules/EditorModule/EditorModule.cpp b/...src/Modules/EditorModule/EditorModule.cpp → ...src/Modules/EditorModule/EditorModule.cpp
diff --git a/...i/src/Modules/EditorModule/EditorModule.h → ...r/src/Modules/EditorModule/EditorModule.h b/...i/src/Modules/EditorModule/EditorModule.h → ...r/src/Modules/EditorModule/EditorModule.h
diff --git a/...dules/InspectorModule/InspectorModule.cpp → ...dules/InspectorModule/InspectorModule.cpp b/...dules/InspectorModule/InspectorModule.cpp → ...dules/InspectorModule/InspectorModule.cpp
diff --git a/...Modules/InspectorModule/InspectorModule.h → ...Modules/InspectorModule/InspectorModule.h b/...Modules/InspectorModule/InspectorModule.h → ...Modules/InspectorModule/InspectorModule.h
diff --git a/...imgui/src/Modules/LogModule/LogModule.cpp → ...ditor/src/Modules/LogModule/LogModule.cpp b/...imgui/src/Modules/LogModule/LogModule.cpp → ...ditor/src/Modules/LogModule/LogModule.cpp
diff --git a/...r_imgui/src/Modules/LogModule/LogModule.h → src/Editor/src/Modules/LogModule/LogModule.h b/...r_imgui/src/Modules/LogModule/LogModule.h → src/Editor/src/Modules/LogModule/LogModule.h
diff --git a/...itor_imgui/src/Modules/ModuleRegistry.cpp → src/Editor/src/Modules/ModuleRegistry.cpp b/...itor_imgui/src/Modules/ModuleRegistry.cpp → src/Editor/src/Modules/ModuleRegistry.cpp
diff --git a/...Editor_imgui/src/Modules/ModuleRegistry.h → src/Editor/src/Modules/ModuleRegistry.h b/...Editor_imgui/src/Modules/ModuleRegistry.h → src/Editor/src/Modules/ModuleRegistry.h
diff --git a/src/Editor_imgui/src/OsreEdApp.cpp → src/Editor/src/OsreEdApp.cpp b/src/Editor_imgui/src/OsreEdApp.cpp → src/Editor/src/OsreEdApp.cpp
diff --git a/src/Editor_imgui/src/OsreEdApp.h → src/Editor/src/OsreEdApp.h b/src/Editor_imgui/src/OsreEdApp.h → src/Editor/src/OsreEdApp.h
diff --git a/src/Editor_imgui/src/ProgressReporter.cpp → src/Editor/src/ProgressReporter.cpp b/src/Editor_imgui/src/ProgressReporter.cpp → src/Editor/src/ProgressReporter.cpp
diff --git a/src/Editor_imgui/src/ProgressReporter.h → src/Editor/src/ProgressReporter.h b/src/Editor_imgui/src/ProgressReporter.h → src/Editor/src/ProgressReporter.h
diff --git a/...r_imgui/src/RenderView/MainRenderView.cpp → src/Editor/src/RenderView/MainRenderView.cpp b/...r_imgui/src/RenderView/MainRenderView.cpp → src/Editor/src/RenderView/MainRenderView.cpp
diff --git a/...tor_imgui/src/RenderView/MainRenderView.h → src/Editor/src/RenderView/MainRenderView.h b/...tor_imgui/src/RenderView/MainRenderView.h → src/Editor/src/RenderView/MainRenderView.h
diff --git a/src/Editor_imgui/src/SceneData.h → src/Editor/src/SceneData.h b/src/Editor_imgui/src/SceneData.h → src/Editor/src/SceneData.h
diff --git a/...r_imgui/src/Scripting/PythonInterface.cpp → src/Editor/src/Scripting/PythonInterface.cpp b/...r_imgui/src/Scripting/PythonInterface.cpp → src/Editor/src/Scripting/PythonInterface.cpp
diff --git a/...tor_imgui/src/Scripting/PythonInterface.h → src/Editor/src/Scripting/PythonInterface.h b/...tor_imgui/src/Scripting/PythonInterface.h → src/Editor/src/Scripting/PythonInterface.h
diff --git a/src/Editor_imgui/src/main.cpp → src/Editor/src/main.cpp b/src/Editor_imgui/src/main.cpp → src/Editor/src/main.cpp
diff --git a/src/Engine/RenderBackend/2D/CanvasRenderer.cpp b/src/Engine/RenderBackend/2D/CanvasRenderer.cpp
@@ -160,7 +160,7 @@ void CanvasRenderer::render(RenderBackendService *rbSrv) {
             }
         }
 
-        //Debugging::MeshDiagnostic::dumpVertices(dc.Vertices, dc.NumVertices);
+        Debugging::MeshDiagnostic::dumpVertices(dc.Vertices, dc.NumVertices);
         mMesh->attachVertices(dc.Vertices, dc.NumVertices * sizeof(RenderVert));
         mMesh->attachIndices(dc.Indices, dc.NumIndices * sizeof(ui16));
         prim = dc.PrimType;
+4 −3		CMakeLists.txt
+1 −1		code/Memory/MemUtils.cpp
+1 −1		code/Random/RandomGenerator.cpp
+1 −1		code/cppcore.cpp
+33 −0		contrib/googletest-1.10.x/googletest/generated/GTestConfig.cmake
+48 −0		contrib/googletest-1.10.x/googletest/generated/GTestConfigVersion.cmake
+10 −0		contrib/googletest-1.10.x/googletest/generated/gmock.pc
+10 −0		contrib/googletest-1.10.x/googletest/generated/gmock_main.pc
+9 −0		contrib/googletest-1.10.x/googletest/generated/gtest.pc
+10 −0		contrib/googletest-1.10.x/googletest/generated/gtest_main.pc
+0 −1		include/cppcore/CPPCoreCommon.h
+1 −1		include/cppcore/Common/Hash.h
+1 −1		include/cppcore/Common/TBitField.h
+2 −17		include/cppcore/Common/TOptional.h
+1 −1		include/cppcore/Common/TSharedPtr.h
+1 −1		include/cppcore/Common/TStringBase.h
+16 −17		include/cppcore/Common/Variant.h
+1 −1		include/cppcore/Container/TArray.h
+1 −1		include/cppcore/Container/THashMap.h
+1 −1		include/cppcore/Container/TList.h
+1 −1		include/cppcore/Container/TQueue.h
+1 −1		include/cppcore/Container/TStaticArray.h
+5 −21		include/cppcore/Memory/MemUtils.h
+1 −1		include/cppcore/Memory/TDefaultAllocator.h
+1 −1		include/cppcore/Memory/TPoolAllocator.h
+2 −2		include/cppcore/Memory/TStackAllocator.h
+1 −1		include/cppcore/Random/RandomGenerator.h
+1 −1		test/CPPCoreCommonTest.cpp
+1 −1		test/Random/RandomGeneratorTest.cpp
+1 −1		test/common/HashTest.cpp
+1 −1		test/common/TBitFieldTest.cpp
+10 −16		test/common/TOptionalTest.cpp
+1 −1		test/common/TSharedPtrTest.cpp
+1 −1		test/common/VariantTest.cpp
+1 −1		test/container/TArrayTest.cpp
+1 −1		test/container/THashMapTest.cpp
+37 −37		test/container/TListTest.cpp
+1 −1		test/container/TQueueTest.cpp
+1 −1		test/container/TStaticArrayTest.cpp
+1 −1		test/memory/TPoolAllocatorTest.cpp
+1 −1		test/memory/TStackAllocatorTest.cpp