Adding Editor executable

2022-09-24 21:06:25 +02:00
parent d7566c5825
commit 05bc31a2b4
24 changed files with 42 additions and 46 deletions
@@ -30,14 +30,14 @@
            ]
        },
        {
-            "name": "Engine Debug",
+            "name": "Editor Debug",
            "type": "cppvsdbg",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/Engine.exe",
+            "program": "${workspaceRoot}/bin/Debug/Editor.exe",
            "args": [],
            "stopAtEntry": false,
            "cwd": "${workspaceRoot}/bin/Debug",
-            "console": "integratedTerminal",
+            "console": "internalConsole",
            "environment": [],
            "symbolSearchPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.25.28610\\lib\\x64",
            "requireExactSource": false,
@@ -50,10 +50,10 @@
            }
        },
        {
-            "name": "Engine Release",
+            "name": "Editor Release",
            "type": "cppvsdbg",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Release/Engine.exe",
+            "program": "${workspaceRoot}/bin/Release/Editor.exe",
            "args": [],
            "stopAtEntry": false,
            "cwd": "${workspaceRoot}/bin/Release",
@@ -53,7 +53,8 @@ if(CMAKE_DEBUG_POSTFIX)
  add_compile_definitions(ENABLE_VALIDATION)
  add_compile_definitions(SEELE_DEBUG)
 endif()
-add_executable(Engine "")
+add_library(Engine "")
+add_executable(Editor "")
 target_compile_definitions(Engine PUBLIC GLFW_WINDOWS)
 target_include_directories(Engine PUBLIC src/Engine)
 target_link_libraries(Engine PUBLIC Vulkan::Vulkan)
@@ -70,11 +71,11 @@ target_link_libraries(Engine PUBLIC ktx)
 target_link_libraries(Engine PUBLIC stb)
 target_link_libraries(Engine PUBLIC nlohmann_json::nlohmann_json)
 if(UNIX)
-  target_link_libraries(Engine Threads::Threads)
-  target_link_libraries(Engine dl)
+target_link_libraries(Engine Threads::Threads)
+target_link_libraries(Engine dl)
 endif()
 target_precompile_headers(Engine 
-  PRIVATE    
+  PUBLIC    
    <assert.h>
    <atomic>
    <condition_variable>
@@ -91,13 +92,15 @@ target_precompile_headers(Engine
    <boost/serialization/serialization.hpp>
    <boost/crc.hpp>)

+target_link_libraries(Editor PRIVATE Engine)
+
 add_subdirectory(src/)

 if(MSVC)
  set(_CRT_SECURE_NO_WARNINGS)
-  target_compile_options(Engine PRIVATE -Zi -MP -DEBUG)
+  target_compile_options(Engine PUBLIC -Zi -MP -DEBUG)
 else()
-  target_compile_options(Engine PRIVATE -g -Wall -Wextra -Wno-delete-incomplete -pedantic -fcoroutines)
+  target_compile_options(Engine PUBLIC -g -Wall -Wextra -Wno-delete-incomplete -pedantic -fcoroutines)
 endif()

 add_executable(Seele_unit_tests "")
@@ -111,5 +114,5 @@ add_custom_target(SeeleEngine ALL
  COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:nsam,NSAM_BINARY> $<TARGET_FILE_DIR:Engine>
  COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:nsam,LLVM_BINARY> $<TARGET_FILE_DIR:Engine>
  COMMAND_EXPAND_LISTS
-	DEPENDS Engine slang-build)
+	DEPENDS Editor slang-build)

@@ -18,7 +18,6 @@ endif()
 add_subdirectory(${BOOST_ROOT})

 #-----------------KTX----------------------------
-find_program(BASH_EXECUTABLE git-bash)
 set(KTX_FEATURE_TESTS off)

 add_subdirectory(${KTX_ROOT} ${KTX_ROOT})
@@ -1,2 +1,2 @@
-
+add_subdirectory(Editor/)
 add_subdirectory(Engine/)
@@ -0,0 +1,3 @@
+target_sources(Editor
+    PRIVATE
+        main.cpp)
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        Asset.h
        Asset.cpp
        AssetRegistry.h
@@ -1,9 +1,8 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        EngineTypes.h
        MinimalEngine.h
-        MinimalEngine.cpp
-        main.cpp)
+        MinimalEngine.cpp)

 add_subdirectory(Asset/)
 add_subdirectory(Containers/)
@@ -1,5 +1,5 @@
 target_sources(Engine
-	PRIVATE
+	PUBLIC
 		Array.h
 		Map.h
 		List.h)
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        GraphicsResources.h
        GraphicsResources.cpp
        GraphicsInitializer.h
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        BasePass.h
        BasePass.cpp
        DepthPrepass.h
@@ -1,5 +1,5 @@
 target_sources(Engine
-	PRIVATE
+	PUBLIC
 		NsightAftermathGpuCrashTracker.h
 		NsightAftermathGpuCrashTracker.cpp
 		NsightAftermathHelpers.h
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        BRDF.h
        BRDF.cpp
        MaterialAsset.h
@@ -1,5 +1,5 @@
 target_sources(Engine
-	PRIVATE
+	PUBLIC
 		Math.h
 		Matrix.h
 		Vector.h
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        Actor.cpp
        Actor.h
        CameraActor.cpp
@@ -1,5 +1,5 @@
 target_sources(Engine
-	PRIVATE
+	PUBLIC
        Util.h
        Scene.cpp
        Scene.h)
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        CameraComponent.h
        CameraComponent.cpp
        Component.h
@@ -9,5 +9,4 @@ target_sources(Engine
        MyOtherComponent.h
        MyOtherComponent.cpp
        PrimitiveComponent.cpp
-        PrimitiveComponent.h
-        PrimitiveUniformBufferLayout.h)
+        PrimitiveComponent.h)
@@ -27,4 +27,10 @@ private:
    friend class Scene;
 };
 DEFINE_REF(PrimitiveComponent)
+struct PrimitiveUniformBuffer
+{
+    Matrix4 localToWorld;
+    Matrix4 worldToLocal;
+    Vector4 actorWorldPosition;
+};
 } // namespace Seele
@@ -1,12 +0,0 @@
-#pragma once
-#include "Graphics/GraphicsResources.h"
-
-namespace Seele
-{
-struct PrimitiveUniformBuffer
-{
-    Matrix4 localToWorld;
-    Matrix4 worldToLocal;
-    Vector4 actorWorldPosition;
-};
-} // namespace Seele
@@ -1,6 +1,5 @@
 #include "Scene.h"
 #include "Components/PrimitiveComponent.h"
-#include "Components/PrimitiveUniformBufferLayout.h"
 #include "Material/MaterialAsset.h"
 #include "Graphics/Graphics.h"

@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        HorizontalLayout.h
        HorizontalLayout.cpp
        Layout.h
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        Button.h
        Button.cpp
        Element.h
@@ -1,5 +1,5 @@
 target_sources(Engine
-    PRIVATE
+    PUBLIC
        InspectorView.h
        InspectorView.cpp
        SceneView.h