Refactoring

EldarMuradov · Jul 25, 2024 · 31d6ace · 31d6ace
1 parent c10629b
commit 31d6ace
Show file tree

Hide file tree

Showing 78 changed files with 31 additions and 35,288 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,10 +9,10 @@ era_begin(EraEngine)
     add_subdirectory(modules/EraScriptingCPPDecls)
 
     # programs
-    add_subdirectory(programs/EraEditor)
-    add_subdirectory(programs/EraRuntime)
-    add_subdirectory(programs/EraUnitTests)
-    add_subdirectory(programs/EraLauncher)
+    add_subdirectory(apps/EraEditor)
+    add_subdirectory(apps/EraRuntime)
+    add_subdirectory(apps/EraUnitTests)
+    add_subdirectory(apps/EraLauncher)
 era_end(EraEngine)
 
 

diff --git a/programs/EraEditor/CMakeLists.txt → apps/EraEditor/CMakeLists.txt b/programs/EraEditor/CMakeLists.txt → apps/EraEditor/CMakeLists.txt
diff --git a/programs/EraEditor/src/main.cpp → apps/EraEditor/src/main.cpp b/programs/EraEditor/src/main.cpp → apps/EraEditor/src/main.cpp
diff --git a/programs/EraLauncher/CMakeLists.txt → apps/EraLauncher/CMakeLists.txt b/programs/EraLauncher/CMakeLists.txt → apps/EraLauncher/CMakeLists.txt
diff --git a/programs/EraLauncher/src/launcher_main.cpp → apps/EraLauncher/src/launcher_main.cpp b/programs/EraLauncher/src/launcher_main.cpp → apps/EraLauncher/src/launcher_main.cpp
diff --git a/programs/EraRuntime/CMakeLists.txt → apps/EraRuntime/CMakeLists.txt b/programs/EraRuntime/CMakeLists.txt → apps/EraRuntime/CMakeLists.txt
diff --git a/programs/EraRuntime/src/core/runtime.cpp → apps/EraRuntime/src/core/runtime.cpp b/programs/EraRuntime/src/core/runtime.cpp → apps/EraRuntime/src/core/runtime.cpp
diff --git a/programs/EraRuntime/src/core/runtime.h → apps/EraRuntime/src/core/runtime.h b/programs/EraRuntime/src/core/runtime.h → apps/EraRuntime/src/core/runtime.h
diff --git a/programs/EraRuntime/src/emain.cpp → apps/EraRuntime/src/emain.cpp b/programs/EraRuntime/src/emain.cpp → apps/EraRuntime/src/emain.cpp
diff --git a/programs/EraUnitTests/CMakeLists.txt → apps/EraUnitTests/CMakeLists.txt b/programs/EraUnitTests/CMakeLists.txt → apps/EraUnitTests/CMakeLists.txt
diff --git a/programs/EraUnitTests/src/main.cpp → apps/EraUnitTests/src/main.cpp b/programs/EraUnitTests/src/main.cpp → apps/EraUnitTests/src/main.cpp
diff --git a/build.bat b/build.bat
@@ -31,8 +31,8 @@ mkdir _build
 
 echo Copiyng external resources...
 
-xcopy resources\imgui.ini _build\programs\EraEditor\ /Q
-xcopy resources\imgui.ini _build\programs\EraRuntime\ /Q
+xcopy resources\imgui.ini _build\apps\EraEditor\ /Q
+xcopy resources\imgui.ini _build\apps\EraRuntime\ /Q
 xcopy resources\imgui.ini _build\ /Q
 
 xcopy /s /i resources\bin\Debug _build\Debug /Q

diff --git a/cmake/era_engine_common.cmake b/cmake/era_engine_common.cmake
@@ -24,12 +24,9 @@ ${ERA_ENGINE_PATH}/resources/lib/Release/libxml2.lib
 ${ERA_ENGINE_PATH}/resources/lib/Release/yaml-cpp.lib
 ${ERA_ENGINE_PATH}/resources/lib/Release/DirectXTex.lib
 ${ERA_ENGINE_PATH}/resources/lib/Release/nvsdk_ngx_d.lib
-${ERA_ENGINE_PATH}/resources/lib/Release/nvsdk_ngx_d_dbg.lib
-${ERA_ENGINE_PATH}/resources/lib/Release/nvsdk_ngx_s.lib
-${ERA_ENGINE_PATH}/resources/lib/Release/nvsdk_ngx_s_dbg.lib
 ${ERA_ENGINE_PATH}/resources/lib/Release/nethost.lib
 ${ERA_ENGINE_PATH}/resources/lib/Release/libnethost.lib
-${ERA_ENGINE_PATH}/modules/thirdparty_ext/CUDA/lib/x64/cuda.lib)
+${ERA_ENGINE_PATH}/resources/lib/Release/cuda.lib)
 
 function(assign_source_group)
     foreach(_source IN ITEMS ${ARGN})
@@ -189,15 +186,15 @@ function(declare_module module_name)
 endfunction()
 
 function(declare_engine_program program_name)
-    file(GLOB_RECURSE SOURCES_${program_name} ${ERA_ENGINE_PATH}/programs/${program_name}/src/*.cpp ${ERA_ENGINE_PATH}/modules/core/src/*.cpp)
+    file(GLOB_RECURSE SOURCES_${program_name} ${ERA_ENGINE_PATH}/apps/${program_name}/src/*.cpp ${ERA_ENGINE_PATH}/modules/core/src/*.cpp)
 
-    file(GLOB_RECURSE HEADERS_${program_name} ${ERA_ENGINE_PATH}/programs/${program_name}/src/*.h ${ERA_ENGINE_PATH}/modules/core/src/*.h)
+    file(GLOB_RECURSE HEADERS_${program_name} ${ERA_ENGINE_PATH}/apps/${program_name}/src/*.h ${ERA_ENGINE_PATH}/modules/core/src/*.h)
 
     set(sources_${program_name} ${SOURCES_${program_name}})
     set(headers_${program_name} ${HEADERS_${program_name}})
     set_source_files_properties(${SOURCES_${program_name}} ${HEADERS_${program_name}} PROPERTIES COMPILE_FLAGS -Od)
     add_executable(${program_name} ${SOURCES_${program_name}} ${HEADERS_${program_name}})
-    target_include_directories(${program_name} PRIVATE ${ERA_ENGINE_PATH}/programs/${program_name}/src)
+    target_include_directories(${program_name} PRIVATE ${ERA_ENGINE_PATH}/apps/${program_name}/src)
     target_include_directories(${program_name} PRIVATE ${ERA_ENGINE_PATH}/modules/core/src)
     target_link_directories(${program_name} PUBLIC ${ERA_ENGINE_PATH}/_build/Release)
 
@@ -223,15 +220,15 @@ function(declare_engine_program program_name)
 endfunction()
 
 function(declare_support_program program_name)
-    file(GLOB_RECURSE SOURCES_${program_name} ${ERA_ENGINE_PATH}/programs/${program_name}/src/*.cpp)
+    file(GLOB_RECURSE SOURCES_${program_name} ${ERA_ENGINE_PATH}/apps/${program_name}/src/*.cpp)
 
-    file(GLOB_RECURSE HEADERS_${program_name} ${ERA_ENGINE_PATH}/programs/${program_name}/src/*.h)
+    file(GLOB_RECURSE HEADERS_${program_name} ${ERA_ENGINE_PATH}/apps/${program_name}/src/*.h)
 
     set(sources_${program_name} ${SOURCES_${program_name}})
     set(headers_${program_name} ${HEADERS_${program_name}})
     set_source_files_properties(${SOURCES_${program_name}} ${HEADERS_${program_name}} PROPERTIES COMPILE_FLAGS -Od)
     add_executable(${program_name} ${SOURCES_${program_name}} ${HEADERS_${program_name}})
-    target_include_directories(${program_name} PRIVATE ${ERA_ENGINE_PATH}/programs/${program_name}/src)
+    target_include_directories(${program_name} PRIVATE ${ERA_ENGINE_PATH}/apps/${program_name}/src)
     target_link_directories(${program_name} PUBLIC ${ERA_ENGINE_PATH}/_build/Release)
     set_target_properties(${program_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ERA_ENGINE_PATH}/_build)
     set_target_properties(${program_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${ERA_ENGINE_PATH}/_build)

diff --git a/modules/core/src/px/core/px_physics_engine.cpp b/modules/core/src/px/core/px_physics_engine.cpp
@@ -226,8 +226,10 @@ namespace era_engine
 		if (!foundation)
 			throw std::exception("Failed to create {PxFoundation}. Error in {PhysicsEngine} ctor.");
 
+#if PX_GPU_BROAD_PHASE
 		if (PxGetSuggestedCudaDeviceOrdinal(foundation->getErrorCallback()) < 0)
 			throw std::exception("Failed to create {PxFoundation}. Error in {PhysicsEngine} ctor.");
+#endif
 
 		pvd = PxCreatePvd(*foundation);
 
@@ -254,13 +256,6 @@ namespace era_engine
 		fStream->setFileName(omniPvdPath);
 		omniWriter->setWriteStream(static_cast<OmniPvdWriteStream&>(*fStream));
 
-		//PxPvdTransport* transport = PxDefaultPvdSocketTransportCreate(PVD_HOST, 5425, 10);
-		//if (transport == NULL)
-		//	throw std::exception("Failed to create {PxPvdTransport}. Error in {PhysicsEngine} ctor.");
-
-		//if (pvd->connect(*transport, PxPvdInstrumentationFlag::eALL))
-		//	std::cout << "Physics> PVD Connected.\n";
-
 #endif
 
 		toleranceScale.length = 1.0f;
@@ -278,35 +273,35 @@ namespace era_engine
 			ASSERT(omniPvd->startSampling());
 		}
 
-		//PxPvdSceneClient* client = scene->getScenePvdClient();
+		PxPvdSceneClient* client = scene->getScenePvdClient();
 
-		//if (client)
-		//{
-		//	client->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONSTRAINTS, true);
-		//	client->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONTACTS, true);
-		//	client->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_SCENEQUERIES, true);
-		//}
+		if (client)
+		{
+			client->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONSTRAINTS, true);
+			client->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONTACTS, true);
+			client->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_SCENEQUERIES, true);
+		}
 
-		//if (pvd->isConnected())
-			//std::cout << "Physics> PVD Connection enabled.\n";
+		if (pvd->isConnected())
+			std::cout << "Physics> PVD Connection enabled.\n";
 #endif
 
-		PxCudaContextManagerDesc cudaContextManagerDesc;
-		cudaContextManagerDesc.graphicsDevice = dxContext.device.Get();
-		cudaContextManager = PxCreateCudaContextManager(*foundation, cudaContextManagerDesc, &profilerCallback);
+		dispatcher = PxDefaultCpuDispatcherCreate(nbCPUDispatcherThreads);
 
 		PxSceneDesc sceneDesc(physics->getTolerancesScale());
 		sceneDesc.gravity = gravity;
-		dispatcher = PxDefaultCpuDispatcherCreate(nbCPUDispatcherThreads);
 		sceneDesc.cpuDispatcher = dispatcher;
 		sceneDesc.solverType = PxSolverType::eTGS;
-		sceneDesc.cudaContextManager = cudaContextManager;
 		sceneDesc.flags |= PxSceneFlag::eENABLE_CCD;
 		sceneDesc.flags |= PxSceneFlag::eENABLE_ACTIVE_ACTORS;
 		sceneDesc.flags |= PxSceneFlag::eENABLE_ENHANCED_DETERMINISM;
 		sceneDesc.flags |= PxSceneFlag::eENABLE_STABILIZATION;
 		sceneDesc.flags |= PxSceneFlag::eENABLE_PCM;
 #if PX_GPU_BROAD_PHASE
+		PxCudaContextManagerDesc cudaContextManagerDesc;
+		cudaContextManagerDesc.graphicsDevice = dxContext.device.Get();
+		cudaContextManager = PxCreateCudaContextManager(*foundation, cudaContextManagerDesc, &profilerCallback);
+		sceneDesc.cudaContextManager = cudaContextManager;
 		sceneDesc.broadPhaseType = physx::PxBroadPhaseType::eGPU;
 		sceneDesc.flags |= PxSceneFlag::eENABLE_GPU_DYNAMICS;
 		sceneDesc.gpuMaxNumPartitions = 8;
@@ -430,8 +425,9 @@ namespace era_engine
 
 	void physics::px_physics_engine::endSimulation()
 	{
+#if PX_GPU_BROAD_PHASE
 		stepper.wait(scene);
-
+#endif
 		{
 			CPU_PROFILE_BLOCK("PhysX process simulation event callbacks steps");
 			processSimulationEventCallbacks();

diff --git a/resources/bin/Debug/apphost.exe b/resources/bin/Debug/apphost.exe
diff --git a/resources/bin/Debug/libhostfxr.pdb b/resources/bin/Debug/libhostfxr.pdb
diff --git a/resources/bin/Debug/libnethost.pdb b/resources/bin/Debug/libnethost.pdb
diff --git a/resources/bin/Debug/singlefilehost.exe b/resources/bin/Debug/singlefilehost.exe
diff --git a/resources/bin/Release/ApexImporter_x64.exe b/resources/bin/Release/ApexImporter_x64.exe
diff --git a/resources/bin/Release/AuthoringTool_x64.exe b/resources/bin/Release/AuthoringTool_x64.exe
diff --git a/resources/bin/Release/LegacyConverter_x64.exe b/resources/bin/Release/LegacyConverter_x64.exe
diff --git a/resources/bin/Release/LowLevelAABB_static_64.pdb b/resources/bin/Release/LowLevelAABB_static_64.pdb
diff --git a/resources/bin/Release/LowLevelDynamics_static_64.pdb b/resources/bin/Release/LowLevelDynamics_static_64.pdb
diff --git a/resources/bin/Release/LowLevel_static_64.pdb b/resources/bin/Release/LowLevel_static_64.pdb
diff --git a/resources/bin/Release/NvBlastExtUnity_x64.dll b/resources/bin/Release/NvBlastExtUnity_x64.dll
diff --git a/resources/bin/Release/PVDRuntime_64.pdb b/resources/bin/Release/PVDRuntime_64.pdb
diff --git a/resources/bin/Release/PhysXCharacterKinematic_static_64.pdb b/resources/bin/Release/PhysXCharacterKinematic_static_64.pdb
diff --git a/resources/bin/Release/PhysXCommon_64.pdb b/resources/bin/Release/PhysXCommon_64.pdb
diff --git a/resources/bin/Release/PhysXCooking_64.pdb b/resources/bin/Release/PhysXCooking_64.pdb
diff --git a/resources/bin/Release/PhysXExtensions_static_64.pdb b/resources/bin/Release/PhysXExtensions_static_64.pdb
diff --git a/resources/bin/Release/PhysXFoundation_64.pdb b/resources/bin/Release/PhysXFoundation_64.pdb
diff --git a/resources/bin/Release/PhysXPvdSDK_static_64.pdb b/resources/bin/Release/PhysXPvdSDK_static_64.pdb
diff --git a/resources/bin/Release/PhysXTask_static_64.pdb b/resources/bin/Release/PhysXTask_static_64.pdb
diff --git a/resources/bin/Release/PhysXVehicle2_static_64.pdb b/resources/bin/Release/PhysXVehicle2_static_64.pdb
diff --git a/resources/bin/Release/PhysXVehicle_static_64.pdb b/resources/bin/Release/PhysXVehicle_static_64.pdb
diff --git a/resources/bin/Release/PhysX_64.pdb b/resources/bin/Release/PhysX_64.pdb
diff --git a/resources/bin/Release/SceneQuery_static_64.pdb b/resources/bin/Release/SceneQuery_static_64.pdb
diff --git a/resources/bin/Release/SimulationController_static_64.pdb b/resources/bin/Release/SimulationController_static_64.pdb
diff --git a/resources/bin/Release/apphost.exe b/resources/bin/Release/apphost.exe
diff --git a/resources/bin/Release/capnp.exe b/resources/bin/Release/capnp.exe
diff --git a/resources/bin/Release/capnpc-c++.exe b/resources/bin/Release/capnpc-c++.exe
diff --git a/resources/bin/Release/capnpc-capnp.exe b/resources/bin/Release/capnpc-capnp.exe
diff --git a/resources/bin/Release/libhostfxr.pdb b/resources/bin/Release/libhostfxr.pdb
diff --git a/resources/bin/Release/libnethost.pdb b/resources/bin/Release/libnethost.pdb
diff --git a/resources/bin/Release/singlefilehost.exe b/resources/bin/Release/singlefilehost.exe
diff --git a/resources/lib/Debug/EraEngineDomain.lib b/resources/lib/Debug/EraEngineDomain.lib
diff --git a/resources/lib/Debug/EraScriptingCPPDecls.lib b/resources/lib/Debug/EraScriptingCPPDecls.lib
diff --git a/resources/lib/Debug/EraScriptingCore.lib b/resources/lib/Debug/EraScriptingCore.lib
diff --git a/resources/lib/Debug/EraScriptingProjectTemplate.lib b/resources/lib/Debug/EraScriptingProjectTemplate.lib
diff --git a/resources/lib/Release/DirectXTex.pdb b/resources/lib/Release/DirectXTex.pdb
diff --git a/resources/lib/Release/EraEngineDomain.lib b/resources/lib/Release/EraEngineDomain.lib
diff --git a/resources/lib/Release/EraScriptingCPPDecls.lib b/resources/lib/Release/EraScriptingCPPDecls.lib
diff --git a/resources/lib/Release/EraScriptingCore.lib b/resources/lib/Release/EraScriptingCore.lib
diff --git a/resources/lib/Release/EraScriptingProjectTemplate.lib b/resources/lib/Release/EraScriptingProjectTemplate.lib
diff --git a/resources/lib/Release/PVDRuntime_64.exp b/resources/lib/Release/PVDRuntime_64.exp
diff --git a/resources/lib/Release/PhysXCommon_64.exp b/resources/lib/Release/PhysXCommon_64.exp