Fixed AIs and crashes

src/physics/physics.cpp

@@ -573,14 +573,13 @@ public:
 			     std::thread::hardware_concurrency() - 1)
 		, mDebugRenderer(new DebugRenderer(scnMgr, cameraNode))
         , object_vs_broadphase_layer_filter{}
-	, object_vs_object_layer_filter{}
+        , object_vs_object_layer_filter{}
 		, debugDraw(false)
 	{
         static int instanceCount = 0;
         OgreAssert(instanceCount == 0, "Bad initialisation");
         instanceCount++;
 
-
 		// This is the max amount of rigid bodies that you can add to the physics system. If you try to add more you'll get an error.
 		// Note: This value is low because this is a simple test. For a real project use something in the order of 65536.
 		const uint cMaxBodies = 65536;
@@ -1510,14 +1509,14 @@ public:
     {
         return characterBodies.find(id) != characterBodies.end();
     }
-    void destroyCharacter(JPH::Character *ch)
+    void destroyCharacter(std::shared_ptr<JPH::Character> ch)
     {
         characterBodies.erase(characterBodies.find(ch->GetBodyID()));
-        characters.erase(ch);
+        characters.erase(ch.get());
         Ogre::SceneNode *node = id2node[ch->GetBodyID()];
         id2node.erase(ch->GetBodyID());
         node2id.erase(node);
-        OGRE_DELETE ch;
+        ch = nullptr;
     }
 };
 
@@ -1539,17 +1538,17 @@ JoltPhysicsWrapper::JoltPhysicsWrapper(Ogre::SceneManager *scnMgr,
     // Install trace and assert callbacks
 	JPH::Trace = TraceImpl;
 	JPH_IF_ENABLE_ASSERTS(JPH::AssertFailed = AssertFailedImpl;)
-	
 
     // Create a factory, this class is responsible for creating instances of classes based on their name or hash and is mainly used for deserialization of saved data.
     // It is not directly used in this example but still required.
 	JPH::Factory::sInstance = new JPH::Factory();
-		// Register all physics types with the factory and install their collision handlers with the CollisionDispatch class.
-		// If you have your own custom shape types you probably need to register their handlers with the CollisionDispatch before calling this function.
-		// If you implement your own default material (PhysicsMaterial::sDefault) make sure to initialize it before this function or else this function will create one for you.
+    // Register all physics types with the factory and install their collision handlers with the CollisionDispatch class.
+    // If you have your own custom shape types you probably need to register their handlers with the CollisionDispatch before calling this function.
+    // If you implement your own default material (PhysicsMaterial::sDefault) make sure to initialize it before this function or else this function will create one for you.
 	JPH::RegisterTypes();
 
-	phys = std::make_unique<Physics>(scnMgr, cameraNode, nullptr, &contacts);
+    phys = std::make_unique<Physics>(scnMgr, cameraNode, nullptr,
+                     &contacts);
 }
 
 JoltPhysicsWrapper::~JoltPhysicsWrapper()
@@ -1824,7 +1823,7 @@ bool JoltPhysicsWrapper::bodyIsCharacter(JPH::BodyID id) const
     return phys->bodyIsCharacter(id);
 }
 
-void JoltPhysicsWrapper::destroyCharacter(JPH::Character *ch)
+void JoltPhysicsWrapper::destroyCharacter(std::shared_ptr<JPH::Character> ch)
 {
     phys->destroyCharacter(ch);
 }

src/physics/physics.h

@@ -219,6 +219,6 @@ public:
 	bool raycastQuery(Ogre::Vector3 startPoint, Ogre::Vector3 endPoint,
               Ogre::Vector3 &position, JPH::BodyID &id);
     bool bodyIsCharacter(JPH::BodyID id) const;
-    void destroyCharacter(JPH::Character *ch);
+    void destroyCharacter(std::shared_ptr<JPH::Character> ch);
 };
 #endif