Refactoring

modules/core/src/application.cpp

@@ -322,6 +322,8 @@ namespace era_engine
 			//	addRaytracingComponentAsync(en, mesh);
 			//}
 
+#if PX_BLAST_ENABLE
+
 			{
 				if (auto mesh = loadMeshFromFileAsync(getAssetPath("/resources/assets/obj/untitled.obj")))
 				{
@@ -339,6 +341,8 @@ namespace era_engine
 				}
 			}
 
+#endif
+
 			/*{
 				model_asset ass = load3DModelFromFile(getAssetPath("/resources/assets/box.fbx"));
 				auto px_sphere_entt1 = scene.createEntity("SpherePXTest", (entity_handle)60)

modules/core/src/editor/editor.cpp

@@ -31,7 +31,9 @@
 #include "application.h"
 
 #include "imgui/imgui_internal.h"
+
 #include "scripting/script.h"
+#include "scripting/native_scripting_linker.h"
 
 #include "px/blast/px_blast_destructions.h"
 #include "px/physics/px_soft_body.h"

modules/core/src/px/blast/px_blast_destructions.cpp

@@ -2,7 +2,8 @@
 
 #include "px/blast/px_blast_destructions.h"
 
-#if !_DEBUG
+#if PX_BLAST_ENABLE
+
 namespace era_engine::physics
 {
     eentity buildChunk(const trs& transform, ref<pbr_material> insideMaterial, ref<pbr_material> outsideMaterial, std::pair<ref<submesh_asset>, ref<nvmesh>> mesh, float mass, uint32 generation)

modules/core/src/px/blast/px_blast_destructions.h

@@ -3,6 +3,9 @@
 #pragma once
 
 #include "px/core/px_physics_engine.h"
+
+#if PX_BLAST_ENABLE
+
 #include "px/core/px_extensions.h"
 #include "px/physics/px_joint.h"
 #include "px/blast/px_blast_utils.h"
@@ -19,8 +22,6 @@
 
 #include "application.h"
 
-#if !_DEBUG
-
 #include <NvBlast.h>
 
 namespace era_engine::physics

modules/core/src/px/blast/px_blast_fracture.cpp

@@ -1,6 +1,9 @@
 // Copyright (c) 2023-present Eldar Muradov. All rights reserved.
 
 #include "px/blast/px_blast_fracture.h"
+
+#if PX_BLAST_ENABLE
+
 #include "px/blast/px_nvmesh.h"
 #include "px/blast/px_blast_destructions.h"
 #include "px/core/px_extensions.h"
@@ -403,4 +406,6 @@ namespace era_engine::physics
             }
         }
     }
-}
+}
+
+#endif

modules/core/src/px/blast/px_blast_fracture.h

@@ -6,6 +6,8 @@
 
 #include "px/blast/px_blast_utils.h"
 
+#if PX_BLAST_ENABLE
+
 #include <NvBlastExtAuthoringFractureTool.h>
 
 namespace era_engine
@@ -62,5 +64,6 @@ namespace era_engine::physics
 
         std::unordered_set<chunkPair> jointPairs;
     };
-
-}
+}
+
+#endif

modules/core/src/px/blast/px_blast_utils.cpp

@@ -1,5 +1,7 @@
-
 #include "px/blast/px_blast_utils.h"
+
+#if PX_BLAST_ENABLE
+
 #include "px/blast/px_nvmesh.h"
 
 #include "asset/mesh_postprocessing.h"
@@ -214,4 +216,6 @@ namespace era_engine::physics
 
         return indices;
     }
-}
+}
+
+#endif

modules/core/src/px/blast/px_blast_utils.h

@@ -1,10 +1,13 @@
 #pragma once
 
-#include "scene/scene.h"
-
 #include "px/core/px_physics_engine.h"
+
+#if PX_BLAST_ENABLE
+
 #include "px/core/px_extensions.h"
 
+#include "scene/scene.h"
+
 namespace era_engine::physics
 {
     struct chunkPair
@@ -94,4 +97,6 @@ namespace era_engine::physics
     {
         return (static_cast<char>(lhs) & static_cast<char>(rhs));
     }
-}
+}
+
+#endif

modules/core/src/px/blast/px_nvmesh.cpp

@@ -1,6 +1,7 @@
-
 #include "px/blast/px_nvmesh.h"
 
+#if PX_BLAST_ENABLE
+
 namespace era_engine::physics
 {
     nvmesh::nvmesh(std::vector<physx::PxVec3> verts, std::vector<physx::PxVec3> norms, std::vector<physx::PxVec2> uvis, std::vector<uint32_t> inds)
@@ -61,5 +62,6 @@ namespace era_engine::physics
             cleaner->release();
         }
     }
+}
 
-}
+#endif

modules/core/src/px/blast/px_nvmesh.h

@@ -2,6 +2,8 @@
 
 #include "px/core/px_physics_engine.h"
 
+#if PX_BLAST_ENABLE
+
 #include <NvBlast.h>
 
 #include <NvBlastExtAuthoring.h>
@@ -45,4 +47,6 @@ namespace era_engine::physics
 
         ref<nvmesh> mesh = nullptr;
     };
-}
+}
+
+#endif

modules/core/src/px/core/px_physics_engine.cpp

@@ -273,7 +273,7 @@ namespace era_engine
 			ASSERT(omniPvd->startSampling());
 		}
 
-		PxPvdSceneClient* client = scene->getScenePvdClient();
+		/*PxPvdSceneClient* client = scene->getScenePvdClient();
 
 		if (client)
 		{
@@ -283,7 +283,7 @@ namespace era_engine
 		}
 
 		if (pvd->isConnected())
-			std::cout << "Physics> PVD Connection enabled.\n";
+			std::cout << "Physics> PVD Connection enabled.\n";*/
 #endif
 
 		dispatcher = PxDefaultCpuDispatcherCreate(nbCPUDispatcherThreads);
@@ -425,7 +425,7 @@ namespace era_engine
 
 	void physics::px_physics_engine::endSimulation()
 	{
-#if PX_GPU_BROAD_PHASE
+#if !PX_GPU_BROAD_PHASE
 		stepper.wait(scene);
 #endif
 		{

modules/core/src/px/core/px_physics_engine.h

@@ -25,6 +25,14 @@
 
 #define PX_VEHICLE 0
 
+#if DEBUG
+#define PX_BLAST_ENABLE 0
+#elif _DEBUG
+#define PX_BLAST_ENABLE 0
+#else
+#define PX_BLAST_ENABLE 1
+#endif
+
 #ifndef PX_RELEASE
 #define PX_RELEASE(x)	if(x)	{ x->release(); x = nullptr;}
 #endif