GameObjectHandle now uses a raw pointer instead of a shared one

CamelotCore/Include/CmComponent.h

@@ -23,11 +23,11 @@ namespace CamelotEngine
 		 */
 		virtual void update() = 0;
 
-		virtual ~Component();
 	protected:
 		friend class SceneObject;
 
 		Component(const HSceneObject& parent);
+		virtual ~Component();
 
 		HSceneObject mParent;
 

CamelotCore/Include/CmGameObject.h

@@ -19,4 +19,16 @@ namespace CamelotEngine
 		static RTTITypeBase* getRTTIStatic();
 		virtual RTTITypeBase* getRTTI() const;
 	};
+}
+
+#include "CmGameObjectHandle.h"
+
+namespace CamelotEngine
+{
+	// Game object handles
+	typedef GameObjectHandle<GameObject> HGameObject;
+	typedef GameObjectHandle<SceneObject> HSceneObject;
+	typedef GameObjectHandle<Component> HComponent;
+	typedef GameObjectHandle<Camera> HCamera;
+	typedef GameObjectHandle<Renderable> HRenderable;
 }

CamelotCore/Include/CmGameObjectHandle.h

@@ -1,23 +1,23 @@
 #pragma once
 
-#include "CmGameObject.h"
-
 namespace CamelotEngine
 {
 	struct CM_EXPORT GameObjectHandleData
 	{
 		GameObjectHandleData()
+			:mPtr(nullptr), mDeleter(nullptr)
 		{ }
 
 		GameObjectHandleData(GameObject* ptr, void(*deleter)(GameObject*))
 		{
-			if(deleter != nullptr)
-				mPtr = std::shared_ptr<GameObject>(ptr, deleter);
-			else
-				mPtr = std::shared_ptr<GameObject>(ptr);
+			mPtr = ptr;
+			mDeleter = deleter;
 		}
 
-		std::shared_ptr<GameObject> mPtr;
+		typedef void(*HandleDeleter)(GameObject*);
+
+		GameObject* mPtr;
+		HandleDeleter mDeleter;
 	};
 
 	/**
@@ -52,7 +52,17 @@ namespace CamelotEngine
 		
 		void destroy()
 		{
-			mData->mPtr = nullptr;
+			if(mData->mPtr != nullptr)
+			{
+				GameObject* toDelete = mData->mPtr;
+				mData->mPtr = nullptr; // Need to set this to null before deleting, otherwise destructor thinks object isn't destroyed
+				// and we end up here again
+
+				if(mData->mDeleter != nullptr)
+					mData->mDeleter(toDelete);
+				else
+					delete toDelete;
+			}
 		}
 
 		std::shared_ptr<GameObjectHandleData> mData;
@@ -80,7 +90,7 @@ namespace CamelotEngine
 		{ 
 			throwIfDestroyed();
 
-			return reinterpret_cast<T*>(mData->mPtr.get()); 
+			return reinterpret_cast<T*>(mData->mPtr); 
 		}
 		T* operator->() const { return get(); }
 		T& operator*() const { return *get(); }

CamelotCore/Include/CmPrerequisites.h

@@ -326,7 +326,6 @@ namespace CamelotEngine
 /************************************************************************/
 
 #include "CmResourceHandle.h"
-#include "CmGameObjectHandle.h"
 
 namespace CamelotEngine
 {
@@ -343,13 +342,6 @@ namespace CamelotEngine
 	typedef ResourceHandle<BlendState> HBlendState;
 	typedef ResourceHandle<GpuProgInclude> HGpuProgInclude;
 	typedef ResourceHandle<Font> HFont;
-
-	// Game object handles
-	typedef GameObjectHandle<GameObject> HGameObject;
-	typedef GameObjectHandle<SceneObject> HSceneObject;
-	typedef GameObjectHandle<Component> HComponent;
-	typedef GameObjectHandle<Camera> HCamera;
-	typedef GameObjectHandle<Renderable> HRenderable;
 }
 
 #endif

CamelotCore/Include/CmRenderer.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "CmPrerequisites.h"
+#include "CmGameObject.h"
 
 namespace CamelotEngine
 {

CamelotCore/Include/CmSceneManager.h

@@ -2,6 +2,7 @@
 
 #include "CmPrerequisites.h"
 #include "CmModule.h"
+#include "CmGameObject.h"
 
 namespace CamelotEngine
 {

CamelotCore/Source/CmGameObjectHandle.cpp

@@ -1,4 +1,5 @@
 #include "CmPrerequisites.h"
+#include "CmGameObject.h"
 #include "CmGameObjectHandle.h"
 #include "CmException.h"