Removed ISerializable

CamelotRenderer/Include/CmResource.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CmPrerequisites.h"
-#include "CmISerializable.h"
+#include "CmIReflectable.h"
 #include "CmUUID.h"
 
 namespace CamelotEngine
@@ -9,7 +9,7 @@ namespace CamelotEngine
 	/**
 	 * @brief	Base class for all resources used in the engine.
 	 */
-	class CM_EXPORT Resource : public ISerializable
+	class CM_EXPORT Resource : public IReflectable
 	{
 	public:
 		Resource(/*const UUID& sourceUUID*/) // TODO - Temporarily don't initialize UUID, because I want texture to inherit from resource and UUIDs arent set up yet
@@ -35,30 +35,30 @@ namespace CamelotEngine
 	public:
 		friend class ResourceST;
 
-		virtual SerializableType* getSerializable() const;
+		virtual RTTITypeBase* getRTTI() const;
 		static Resource* newObject();
 
-	protected:
-		struct RTTIInitOnStart
-		{
-			RTTIInitOnStart()
-			{
-				static RTTIMetaType<Resource> myClassMetaType;
-				ISerializable::registerRTTIDerivedClass(&myClassMetaType);
-			}
-		};
+	//protected:
+	//	struct RTTIInitOnStart
+	//	{
+	//		RTTIInitOnStart()
+	//		{
+	//			static RTTIMetaType<Resource> myClassMetaType;
+	//			ISerializable::registerRTTIDerivedClass(&myClassMetaType);
+	//		}
+	//	};
 
-		static RTTIInitOnStart initOnStart;
+	//	static RTTIInitOnStart initOnStart;
 
-		static vector<RTTIMetaTypeBase*>::type& getRTTIDerivedClasses()
-		{
-			static vector<RTTIMetaTypeBase*>::type mRTTIDerivedClasses;
-			return mRTTIDerivedClasses;
-		}
+	//	static vector<RTTIMetaTypeBase*>::type& getRTTIDerivedClasses()
+	//	{
+	//		static vector<RTTIMetaTypeBase*>::type mRTTIDerivedClasses;
+	//		return mRTTIDerivedClasses;
+	//	}
 
-		static void registerRTTIDerivedClass(RTTIMetaTypeBase* derivedClass)
-		{
-			getRTTIDerivedClasses().push_back(derivedClass);
-		}
+	//	static void registerRTTIDerivedClass(RTTIMetaTypeBase* derivedClass)
+	//	{
+	//		getRTTIDerivedClasses().push_back(derivedClass);
+	//	}
 	};
 }

CamelotRenderer/Include/CmResourceST.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include "CmPrerequisites.h"
-#include "CmSerializableType.h"
+#include "CmRTTIType.h"
 #include "CmResource.h"
 
 namespace CamelotEngine
 {
-	class CM_EXPORT ResourceST : public SerializableType
+	class CM_EXPORT ResourceST : public RTTIType
 	{
 	private:
 		UINT32& getSize(Resource* obj) { return obj->mSize; }

CamelotRenderer/Include/CmTexture.h

@@ -408,7 +408,7 @@ namespace CamelotEngine {
 		/************************************************************************/
 	public:
 		friend class TextureST;
-		virtual SerializableType* getSerializable() const;
+		virtual RTTITypeBase* getRTTI() const;
 		static Texture* newObject();
     };
 

CamelotRenderer/Include/CmTextureST.h

@@ -1,14 +1,14 @@
 #pragma once
 
 #include "CmPrerequisites.h"
-#include "CmSerializableType.h"
+#include "CmRTTIType.h"
 #include "CmTexture.h"
 #include "CmTextureData.h"
 #include "CmManagedDataBlock.h"
 
 namespace CamelotEngine
 {
-	class CM_EXPORT TextureST : public SerializableType
+	class CM_EXPORT TextureST : public RTTIType
 	{
 	private:
 		CM_SETGET_MEMBER(mSize, UINT32, Texture)

CamelotRenderer/Source/CmResource.cpp

@@ -47,10 +47,10 @@ namespace CamelotEngine
 	//		}
 	//}
 	
-	SerializableType* Resource::getSerializable() const
+	RTTITypeBase* Resource::getRTTI() const
 	{
-		static ResourceST serializableType;
-		return &serializableType;
+		static ResourceST rttiType;
+		return &rttiType;
 	}
 
 

CamelotRenderer/Source/CmTexture.cpp

@@ -309,7 +309,7 @@ namespace CamelotEngine {
 	/* 								SERIALIZATION                      		*/
 	/************************************************************************/
 
-	SerializableType* Texture::getSerializable() const
+	RTTITypeBase* Texture::getRTTI() const
 	{
 		static TextureST serializableType;
 		return &serializableType;

CamelotUtility/CamelotUtility.vcxproj

@@ -99,7 +99,6 @@
     <ClInclude Include="Include\CmRTTIReflectableField.h" />
     <ClInclude Include="Include\CmRTTIReflectablePtrField.h" />
     <ClInclude Include="Include\CmRTTIType.h" />
-    <ClInclude Include="Include\CmSerializableType.h" />
     <ClInclude Include="Include\CmString.h" />
     <ClInclude Include="Include\CmTextureDataST.h" />
     <ClInclude Include="Include\CmThreadDefines.h" />
@@ -127,14 +126,11 @@
     <ClCompile Include="Source\CmFileSerializer.cpp" />
     <ClCompile Include="Source\CmFileSystem.cpp" />
     <ClCompile Include="Source\CmIReflectable.cpp" />
-    <ClCompile Include="Source\CmISerializable.cpp" />
     <ClCompile Include="Source\CmRTTIField.cpp" />
     <ClCompile Include="Source\CmRTTIType.cpp" />
-    <ClCompile Include="Source\CmSerializableType.cpp" />
     <ClCompile Include="Source\CmTextureData.cpp">
       <FileType>CppHeader</FileType>
     </ClCompile>
-    <ClInclude Include="Include\CmISerializable.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Include\CmAxisAlignedBox.cpp" />

CamelotUtility/CamelotUtility.vcxproj.filters

@@ -171,12 +171,6 @@
     <ClInclude Include="Include\CmManagedDataBlock.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmISerializable.h">
-      <Filter>Header Files\Serialization</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmSerializableType.h">
-      <Filter>Header Files\Serialization</Filter>
-    </ClInclude>
     <ClInclude Include="Include\CmTextureDataST.h">
       <Filter>Header Files\SerializationTypes</Filter>
     </ClInclude>
@@ -257,12 +251,6 @@
     <ClCompile Include="Source\CmIReflectable.cpp">
       <Filter>Source Files\RTTI</Filter>
     </ClCompile>
-    <ClCompile Include="Source\CmSerializableType.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmISerializable.cpp">
-      <Filter>Source Files\Serialization</Filter>
-    </ClCompile>
     <ClCompile Include="Source\CmFileSystem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

CamelotUtility/Include/CmISerializable.h

@@ -1,51 +0,0 @@
-#pragma once
-
-#include "CmPrerequisitesUtil.h"
-#include "CmIReflectable.h"
-#include "CmSerializableType.h"
-
-namespace CamelotEngine
-{
-	// TODO - Move these classes up to IReflectable, and remove ISerializable because it's not used
-	class CM_UTILITY_EXPORT RTTIMetaTypeBase
-	{
-	public:
-		//virtual String getRTTIName() = 0;
-		//virtual UINT32 getRTTITypeId() = 0;
-		//virtual RTTITypeBase* getRTTI() = 0;
-		virtual IReflectable* newObject() = 0;
-	};
-
-	template <class T>
-	class CM_UTILITY_EXPORT RTTIMetaType : public RTTIMetaTypeBase
-	{
-	public:
-		//virtual String getRTTIName()
-		//{ return T::getRTTIName(); } // TODO - Maybe add static asserts to add a better error message if method doesn't exist
-		//virtual UINT32 getRTTITypeId() 
-		//{ return T::getRTTITypeId(); }
-		//virtual RTTITypeBase* getRTTI()
-		//{ return T::getRTTI(); }
-		virtual IReflectable* newObject()
-		{ return T::newObject(); }
-	};
-
-	class CM_UTILITY_EXPORT ISerializable : public IReflectable
-	{
-	public:
-		virtual RTTITypeBase* getRTTI() const { return getSerializable(); }
-		virtual SerializableType* getSerializable() const = 0;
-
-	protected:
-		static vector<RTTIMetaTypeBase*>::type& getRTTIDerivedClasses()
-		{
-			static vector<RTTIMetaTypeBase*>::type mRTTIDerivedClasses;
-			return mRTTIDerivedClasses;
-		}
-
-		static void registerRTTIDerivedClass(RTTIMetaTypeBase* derivedClass)
-		{
-			getRTTIDerivedClasses().push_back(derivedClass);
-		}
-	};
-}

CamelotUtility/Include/CmSerializableType.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include "CmPrerequisitesUtil.h"
-#include "CmRTTIType.h"
-
-namespace CamelotEngine
-{
-	class CM_UTILITY_EXPORT SerializableType : public RTTIType
-	{
-	public:
-		virtual void beginSerialization() {}
-		virtual void endSerialization() {}
-	};
-}

CamelotUtility/Include/CmTextureData.h

@@ -2,7 +2,7 @@
 
 #include "CmPrerequisitesUtil.h"
 #include "CmPixelUtil.h"
-#include "CmISerializable.h"
+#include "CmIReflectable.h"
 
 namespace CamelotEngine
 {
@@ -13,7 +13,7 @@ namespace CamelotEngine
 		TDF_3D_TEXTURE = 0x00000004
 	};
 
-	class CM_UTILITY_EXPORT TextureData : public ISerializable
+	class CM_UTILITY_EXPORT TextureData : public IReflectable
 	{
 	public:
 		TextureData(UINT32 width, UINT32 height, UINT32 size, 
@@ -90,7 +90,7 @@ namespace CamelotEngine
 	/************************************************************************/
 	public:
 		friend class TextureDataST;
-		virtual SerializableType* getSerializable() const;
+		virtual RTTITypeBase* getRTTI() const;
 		static TextureData* newObject();
 	private:
 		TextureData() {} // Only for serialization

CamelotUtility/Include/CmTextureDataST.h

@@ -2,12 +2,12 @@
 
 #include "CmPrerequisitesUtil.h"
 #include "CmTextureData.h"
-#include "CmSerializableType.h"
+#include "CmRTTIType.h"
 #include "CmManagedDataBlock.h"
 
 namespace CamelotEngine
 {
-	class TextureDataST : public SerializableType
+	class TextureDataST : public RTTIType
 	{
 		CM_SETGET_MEMBER(mNumMipmaps, UINT32, TextureData)
 		CM_SETGET_MEMBER(mWidth, UINT32, TextureData)

CamelotUtility/Source/CmISerializable.cpp

@@ -1,3 +0,0 @@
-#include "CmISerializable.h"
-
-// Need a source file to make sure implementation is compiled

CamelotUtility/Source/CmSerializableType.cpp

@@ -1,3 +0,0 @@
-#include "CmSerializableType.h"
-
-// Need a source file to make sure implementation is compiled

CamelotUtility/Source/CmTextureData.cpp

@@ -59,10 +59,10 @@ namespace CamelotEngine
 	/************************************************************************/
 	/* 								SERIALIZATION                      		*/
 	/************************************************************************/
-	SerializableType* TextureData::getSerializable() const
+	RTTITypeBase* TextureData::getRTTI() const
 	{
-		static TextureDataST serializableType;
-		return &serializableType;
+		static TextureDataST rttiType;
+		return &rttiType;
 	}
 
 	TextureData* TextureData::newObject()