Moved Camera/Renderable/Overlay/OverlayManager to Banshee

BansheeEngine/BansheeEngine.vcxproj

@@ -162,6 +162,12 @@
     <ClInclude Include="Include\BsSprite.h" />
     <ClInclude Include="Include\BsSpriteTexture.h" />
     <ClInclude Include="Include\BsTextSprite.h" />
+    <ClInclude Include="Include\BsCamera.h" />
+    <ClInclude Include="Include\BsCameraRTTI.h" />
+    <ClInclude Include="Include\BsOverlay.h" />
+    <ClInclude Include="Include\BsOverlayManager.h" />
+    <ClInclude Include="Include\BsRenderable.h" />
+    <ClInclude Include="Include\BsRenderableRTTI.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Source\BsApplication.cpp" />
@@ -176,6 +182,10 @@
     <ClCompile Include="Source\BsSprite.cpp" />
     <ClCompile Include="Source\BsSpriteTexture.cpp" />
     <ClCompile Include="Source\BsTextSprite.cpp" />
+    <ClCompile Include="Source\BsCamera.cpp" />
+    <ClCompile Include="Source\BsOverlay.cpp" />
+    <ClCompile Include="Source\BsOverlayManager.cpp" />
+    <ClCompile Include="Source\BsRenderable.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

BansheeEngine/BansheeEngine.vcxproj.filters

@@ -25,6 +25,15 @@
     <Filter Include="Source Files\2D">
       <UniqueIdentifier>{95b6f738-cc0a-4dde-81f8-b0246ab32938}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Components">
+      <UniqueIdentifier>{99e50dfa-7d20-4416-9616-5de20a1067db}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Components">
+      <UniqueIdentifier>{e9931182-3579-4d89-993e-da67c1fcd4c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\RTTI">
+      <UniqueIdentifier>{8d0002f5-5505-4292-9043-a8fbb489362e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Include\BsPrerequisites.h">
@@ -75,6 +84,24 @@
     <ClInclude Include="Include\BsSceneManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Include\BsOverlay.h">
+      <Filter>Header Files\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\BsCamera.h">
+      <Filter>Header Files\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\BsRenderable.h">
+      <Filter>Header Files\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\BsCameraRTTI.h">
+      <Filter>Header Files\RTTI</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\BsRenderableRTTI.h">
+      <Filter>Header Files\RTTI</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\BsOverlayManager.h">
+      <Filter>Header Files\2D</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Source\BsGUIElement.cpp">
@@ -113,5 +140,17 @@
     <ClCompile Include="Source\BsSceneManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Source\BsOverlayManager.cpp">
+      <Filter>Source Files\2D</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\BsCamera.cpp">
+      <Filter>Source Files\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\BsOverlay.cpp">
+      <Filter>Source Files\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="Source\BsRenderable.cpp">
+      <Filter>Source Files\Components</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

CamelotCore/Include/CmCamera.h → BansheeEngine/Include/BsCamera.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __Camera_H__
 
 // Default options
-#include "CmPrerequisites.h"
+#include "BsPrerequisites.h"
 
 #include "CmString.h"
 
@@ -46,7 +46,7 @@ THE SOFTWARE.
 #include "CmRay.h"
 #include "CmComponent.h"
 
-namespace CamelotFramework {
+namespace BansheeEngine {
 
 	/** Specifies perspective (realistic) or orthographic (architectural) projection.
     */
@@ -103,14 +103,14 @@ namespace CamelotFramework {
             This is useful for implementing more complex Camera / object
             relationships i.e. having a camera attached to a world object.
     */
-    class CM_EXPORT Camera : public Component
+    class BS_EXPORT Camera : public CM::Component
     {
 	protected:
         /// Orthographic or perspective?
         ProjectionType mProjType;
 
         /// y-direction field-of-view (default 45)
-        Radian mFOVy;
+        CM::Radian mFOVy;
         /// Far clip distance - default 10000
         float mFarDist;
         /// Near clip distance - default 100
@@ -120,25 +120,25 @@ namespace CamelotFramework {
 		/// Ortho height size (world units)
 		float mOrthoHeight;
         /// Off-axis frustum center offset - default (0.0, 0.0)
-        Vector2 mFrustumOffset;
+        CM::Vector2 mFrustumOffset;
         /// Focal length of frustum (for stereo rendering, defaults to 1.0)
         float mFocalLength;
 
         /// The 6 main clipping planes
-        mutable Plane mFrustumPlanes[6];
+        mutable CM::Plane mFrustumPlanes[6];
 
         /// Stored versions of parent orientation / position
-        mutable Quaternion mLastParentOrientation;
-        mutable Vector3 mLastParentPosition;
+        mutable CM::Quaternion mLastParentOrientation;
+        mutable CM::Vector3 mLastParentPosition;
 
         /// Pre-calced projection matrix for the specific render system
-        mutable Matrix4 mProjMatrixRS;
+        mutable CM::Matrix4 mProjMatrixRS;
         /// Pre-calced standard projection matrix but with render system depth range
-        mutable Matrix4 mProjMatrixRSDepth;
+        mutable CM::Matrix4 mProjMatrixRSDepth;
         /// Pre-calced standard projection matrix
-        mutable Matrix4 mProjMatrix;
+        mutable CM::Matrix4 mProjMatrix;
         /// Pre-calced view matrix
-        mutable Matrix4 mViewMatrix;
+        mutable CM::Matrix4 mViewMatrix;
         /// Something's changed in the frustum shape?
         mutable bool mRecalcFrustum;
         /// Something re the frustum planes has changed
@@ -173,9 +173,9 @@ namespace CamelotFramework {
         /// Signal to update frustum information.
         virtual void invalidateFrustum(void) const;
 
-        mutable AxisAlignedBox mBoundingBox;
+        mutable CM::AxisAlignedBox mBoundingBox;
 
-        mutable Vector3 mWorldSpaceCorners[8];
+        mutable CM::Vector3 mWorldSpaceCorners[8];
 
     public:
         /** Sets the Y-dimension Field Of View (FOV) of the frustum.
@@ -190,11 +190,11 @@ namespace CamelotFramework {
             @note
                 Setting the FOV overrides the value supplied for frustum::setNearClipPlane.
          */
-        virtual void setFOVy(const Radian& fovy);
+        virtual void setFOVy(const CM::Radian& fovy);
 
         /** Retrieves the frustums Y-dimension Field Of View (FOV).
         */
-        virtual const Radian& getFOVy(void) const;
+        virtual const CM::Radian& getFOVy(void) const;
 
         /** Sets the position of the near clipping plane.
             @remarks
@@ -264,7 +264,7 @@ namespace CamelotFramework {
             @param
                 offset The horizontal and vertical plane offsets.
         */
-        virtual void setFrustumOffset(const Vector2& offset);
+        virtual void setFrustumOffset(const CM::Vector2& offset);
 
         /** Sets frustum offsets, used in stereo rendering.
             @remarks
@@ -283,7 +283,7 @@ namespace CamelotFramework {
 
         /** Retrieves the frustum offsets.
         */
-        virtual const Vector2& getFrustumOffset() const;
+        virtual const CM::Vector2& getFrustumOffset() const;
 
         /** Sets frustum focal length (used in stereo rendering).
             @param
@@ -315,7 +315,7 @@ namespace CamelotFramework {
             getProjectionMatrix.
 
         */
-        virtual const Matrix4& getProjectionMatrixRS(void) const;
+        virtual const CM::Matrix4& getProjectionMatrixRS(void) const;
         /** Gets the depth-adjusted projection matrix for the current rendersystem,
 			but one which still conforms to right-hand rules.
         @remarks
@@ -327,7 +327,7 @@ namespace CamelotFramework {
             GL uses [-1,1], and the range must be kept the same between programmable
             and fixed-function pipelines.
         */
-        virtual const Matrix4& getProjectionMatrixWithRSDepth(void) const;
+        virtual const CM::Matrix4& getProjectionMatrixWithRSDepth(void) const;
         /** Gets the normal projection matrix for this frustum, ie the 
         projection matrix which conforms to standard right-handed rules and
         uses depth range [-1,+1].
@@ -337,11 +337,11 @@ namespace CamelotFramework {
             range [-1,+1], result no matter what rendering API is being used - this
             is required for some uniform algebra for example.
         */
-        virtual const Matrix4& getProjectionMatrix(void) const;
+        virtual const CM::Matrix4& getProjectionMatrix(void) const;
 
         /** Gets the view matrix for this frustum. Mainly for use by OGRE internally.
         */
-        virtual const Matrix4& getViewMatrix(void) const;
+        virtual const CM::Matrix4& getViewMatrix(void) const;
 
 		/** Set whether to use a custom view matrix on this frustum.
 		@remarks
@@ -361,7 +361,7 @@ namespace CamelotFramework {
 		@see Frustum::setCustomProjectionMatrix, Matrix4::isAffine
 		*/
 		virtual void setCustomViewMatrix(bool enable, 
-			const Matrix4& viewMatrix = Matrix4::IDENTITY);
+			const CM::Matrix4& viewMatrix = CM::Matrix4::IDENTITY);
 		/// Returns whether a custom view matrix is in use
 		virtual bool isCustomViewMatrixEnabled(void) const 
 		{ return mCustomViewMatrix; }
@@ -386,7 +386,7 @@ namespace CamelotFramework {
 		@see Frustum::setCustomViewMatrix
 		*/
 		virtual void setCustomProjectionMatrix(bool enable, 
-			const Matrix4& projectionMatrix = Matrix4::IDENTITY);
+			const CM::Matrix4& projectionMatrix = CM::Matrix4::IDENTITY);
 		/// Returns whether a custom projection matrix is in use
 		virtual bool isCustomProjectionMatrixEnabled(void) const
 		{ return mCustomProjMatrix; }
@@ -395,13 +395,13 @@ namespace CamelotFramework {
         @remarks
             The clipping planes are ordered as declared in enumerate constants FrustumPlane.
         */
-        virtual const Plane* getFrustumPlanes(void) const;
+        virtual const CM::Plane* getFrustumPlanes(void) const;
 
         /** Retrieves a specified plane of the frustum (world space).
             @remarks
                 Gets a reference to one of the planes which make up the frustum frustum, e.g. for clipping purposes.
         */
-        virtual const Plane& getFrustumPlane( unsigned short plane ) const;
+        virtual const CM::Plane& getFrustumPlane( unsigned short plane ) const;
 
         /** Tests whether the given container is visible in the Frustum.
             @param
@@ -414,7 +414,7 @@ namespace CamelotFramework {
             @par
                 Otherwise, false is returned.
         */
-        virtual bool isVisible(const AxisAlignedBox& bound, FrustumPlane* culledBy = 0) const;
+        virtual bool isVisible(const CM::AxisAlignedBox& bound, FrustumPlane* culledBy = 0) const;
 
         /** Tests whether the given container is visible in the Frustum.
             @param
@@ -427,7 +427,7 @@ namespace CamelotFramework {
             @par
                 Otherwise, false is returned.
         */
-        virtual bool isVisible(const Sphere& bound, FrustumPlane* culledBy = 0) const;
+        virtual bool isVisible(const CM::Sphere& bound, FrustumPlane* culledBy = 0) const;
 
         /** Tests whether the given vertex is visible in the Frustum.
             @param
@@ -440,10 +440,10 @@ namespace CamelotFramework {
             @par
                 Otherwise, false is returned.
         */
-        virtual bool isVisible(const Vector3& vert, FrustumPlane* culledBy = 0) const;
+        virtual bool isVisible(const CM::Vector3& vert, FrustumPlane* culledBy = 0) const;
 
         /** Overridden from MovableObject */
-        const AxisAlignedBox& getBoundingBox(void) const;
+        const CM::AxisAlignedBox& getBoundingBox(void) const;
 
         /** Overridden from MovableObject */
 		float getBoundingRadius(void) const;
@@ -454,7 +454,7 @@ namespace CamelotFramework {
             top-left near, bottom-left near, bottom-right near, 
             top-right far, top-left far, bottom-left far, bottom-right far.
         */
-        virtual const Vector3* getWorldSpaceCorners(void) const;
+        virtual const CM::Vector3* getWorldSpaceCorners(void) const;
 
         /** Sets the type of projection to use (orthographic or perspective). Default is perspective.
         */
@@ -499,35 +499,35 @@ namespace CamelotFramework {
         @returns true if the sphere was projected to a subset of the near plane,
             false if the entire near plane was contained
         */
-        virtual bool projectSphere(const Sphere& sphere, 
+        virtual bool projectSphere(const CM::Sphere& sphere, 
             float* left, float* top, float* right, float* bottom) const;
 
         /// Small constant used to reduce far plane projection to avoid inaccuracies
         static const float INFINITE_FAR_PLANE_ADJUST;
     protected:
-		ViewportPtr mViewport;
+		CM::ViewportPtr mViewport;
 
     public:
         /** Standard destructor.
         */
         virtual ~Camera();
 
-		void init(RenderTargetPtr target = nullptr,
+		void init(CM::RenderTargetPtr target = nullptr,
 			float left = 0.0f, float top = 0.0f,
 			float width = 1.0f, float height = 1.0f,
 			int ZOrder = 0);
 
-		ViewportPtr getViewport() const { return mViewport; }
+		CM::ViewportPtr getViewport() const { return mViewport; }
 
 		/************************************************************************/
 		/* 						COMPONENT OVERRIDES                      		*/
 		/************************************************************************/
 	protected:
-		friend class SceneObject;
+		friend class CM::SceneObject;
 
 		/** Standard constructor.
         */
-		Camera(const HSceneObject& parent);
+		Camera(const CM::HSceneObject& parent);
 
 	public:
 		virtual void update() {}
@@ -537,8 +537,8 @@ namespace CamelotFramework {
 		/************************************************************************/
 	public:
 		friend class CameraRTTI;
-		static RTTITypeBase* getRTTIStatic();
-		virtual RTTITypeBase* getRTTI() const;
+		static CM::RTTITypeBase* getRTTIStatic();
+		virtual CM::RTTITypeBase* getRTTI() const;
 
 	protected:
 		Camera() {} // Serialization only

BansheeEngine/Include/BsCameraRTTI.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "BsPrerequisites.h"
+#include "CmRTTIType.h"
+#include "BsCamera.h"
+
+namespace BansheeEngine
+{
+	class BS_EXPORT CameraRTTI : public CM::RTTIType<Camera, CM::Component, CameraRTTI>
+	{
+	private:
+
+	public:
+		CameraRTTI()
+		{
+
+		}
+
+		virtual const CM::String& getRTTIName()
+		{
+			static CM::String name = "Camera";
+			return name;
+		}
+
+		virtual UINT32 getRTTIId()
+		{
+			return TID_Camera;
+		}
+
+		virtual std::shared_ptr<CM::IReflectable> newRTTIObject()
+		{
+			return std::shared_ptr<Camera>(CM_NEW(Camera, CM::PoolAlloc) Camera(), &CM::MemAllocDeleter<Camera, CM::PoolAlloc>::deleter);
+		}
+	};
+}

BansheeEngine/Include/BsGUIWidget.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "BsPrerequisites.h"
-#include "CmOverlay.h"
+#include "BsOverlay.h"
 #include "BsTextSprite.h"
 #include "CmORect.h"
 
 namespace BansheeEngine
 {
-	class BS_EXPORT GUIWidget : public CM::Overlay
+	class BS_EXPORT GUIWidget : public Overlay
 	{
 	public:
 		virtual ~GUIWidget();
@@ -15,7 +15,7 @@ namespace BansheeEngine
 		void setSkin(const GUISkin* skin);
 		const GUISkin* getGUISkin() const;
 
-		virtual void render(const CM::Camera* camera, CM::DeferredRenderContextPtr& renderContext) const;
+		virtual void render(const Camera* camera, CM::DeferredRenderContextPtr& renderContext) const;
 	protected:
 		friend class CM::SceneObject;
 		friend class GUIElement;

CamelotCore/Include/CmOverlay.h → BansheeEngine/Include/BsOverlay.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "CmPrerequisites.h"
+#include "BsPrerequisites.h"
 #include "CmComponent.h"
 
-namespace CamelotFramework
+namespace BansheeEngine
 {
 	/**
 	 * @brief	Overlay components are a special type of components that can be attached directly
@@ -11,17 +11,17 @@ namespace CamelotFramework
 	 * 			components after it has rendered the rest of the scene, so these components are usually 
 	 * 			used for GUI elements and full screen effects.
 	 */
-	class CM_EXPORT Overlay : public Component
+	class BS_EXPORT Overlay : public CM::Component
 	{
 	public:
 		virtual ~Overlay();
 
-		virtual void render(const Camera* camera, DeferredRenderContextPtr& renderContext) const = 0;
+		virtual void render(const Camera* camera, CM::DeferredRenderContextPtr& renderContext) const = 0;
 		virtual void update() {}
 
 	protected:
-		friend class CamelotFramework::SceneObject;
+		friend class CM::SceneObject;
 
-		Overlay(const HSceneObject& parent);
+		Overlay(const CM::HSceneObject& parent);
 	};
 }

CamelotCore/Include/CmOverlayManager.h → BansheeEngine/Include/BsOverlayManager.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "CmPrerequisites.h"
+#include "BsPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotFramework
+namespace BansheeEngine
 {
 	/**
 	 * @brief	Takes care which overlay gets rendered on which camera.
@@ -13,15 +13,15 @@ namespace CamelotFramework
 	 * 
 	 * @see Overlay
 	 */
-	class CM_EXPORT OverlayManager : public Module<OverlayManager>
+	class BS_EXPORT OverlayManager : public CM::Module<OverlayManager>
 	{
 	public:
-		void render(const Camera* camera, DeferredRenderContextPtr& renderContext) const;
+		void render(const Camera* camera, CM::DeferredRenderContextPtr& renderContext) const;
 
 		void attachOverlay(const Camera* camera, const Overlay* overlay);
 		void detachOverlay(const Camera* camera, const Overlay* overlay);
 		void detachOverlayFromAll(const Overlay* overlay);
 	private:
-		unordered_map<const Camera*, unordered_set<const Overlay*>::type>::type mOverlaysPerCamera;
+		std::unordered_map<const Camera*, std::unordered_set<const Overlay*>> mOverlaysPerCamera;
 	};
 }

BansheeEngine/Include/BsPrerequisites.h

@@ -53,11 +53,28 @@ namespace BansheeEngine
 	// 2D
 	class TextSprite;
 	class SpriteTexture;
+	class OverlayManager;
+
+	// Components
+	class Overlay;
+	class Renderable;
+	class Camera;
 
 	typedef std::shared_ptr<TextSprite> TextSpritePtr;
 	typedef std::shared_ptr<SpriteTexture> SpriteTexturePtr;
+	typedef std::shared_ptr<Overlay> OverlayPtr;
+	typedef std::shared_ptr<Camera> CameraPtr;
+	typedef std::shared_ptr<Renderable> RenderablePtr;
 
 	typedef CM::GameObjectHandle<GUIWidget> HGUIWidget;
+	typedef CM::GameObjectHandle<Camera> HCamera;
+	typedef CM::GameObjectHandle<Renderable> HRenderable;
+
+	enum TypeID_Banshe
+	{
+		TID_Camera = 30000,
+		TID_Renderable = 30001
+	};
 }
 
 namespace BS = BansheeEngine;

CamelotCore/Include/CmRenderable.h → BansheeEngine/Include/BsRenderable.h

@@ -1,32 +1,32 @@
 #pragma once
 
-#include "CmPrerequisites.h"
+#include "BsPrerequisites.h"
 #include "CmComponent.h"
 
-namespace CamelotFramework
+namespace BansheeEngine
 {
-	class CM_EXPORT Renderable : public Component
+	class BS_EXPORT Renderable : public CM::Component
 	{
 	public:
-		void setMesh(HMesh mesh) { mMesh = mesh; }
-		void setMaterial(HMaterial material) { mMaterial = material; }
+		void setMesh(CM::HMesh mesh) { mMesh = mesh; }
+		void setMaterial(CM::HMaterial material) { mMaterial = material; }
 
-		HMesh getMesh() const { return mMesh; }
-		HMaterial getMaterial() const { return mMaterial; }
+		CM::HMesh getMesh() const { return mMesh; }
+		CM::HMaterial getMaterial() const { return mMaterial; }
 	private:
-		HMesh mMesh;
-		HMaterial mMaterial;
+		CM::HMesh mMesh;
+		CM::HMaterial mMaterial;
 
 		/************************************************************************/
 		/* 							COMPONENT OVERRIDES                    		*/
 		/************************************************************************/
 
 	protected:
-		friend class SceneObject;
+		friend class CM::SceneObject;
 
 		/** Standard constructor.
         */
-		Renderable(const HSceneObject& parent);
+		Renderable(const CM::HSceneObject& parent);
 
 	public:
 		virtual void update() {}
@@ -36,8 +36,8 @@ namespace CamelotFramework
 		/************************************************************************/
 	public:
 		friend class RenderableRTTI;
-		static RTTITypeBase* getRTTIStatic();
-		virtual RTTITypeBase* getRTTI() const;
+		static CM::RTTITypeBase* getRTTIStatic();
+		virtual CM::RTTITypeBase* getRTTI() const;
 
 	protected:
 		Renderable() {} // Serialization only

BansheeEngine/Include/BsRenderableRTTI.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include "BsPrerequisites.h"
+#include "CmRTTIType.h"
+#include "BsRenderable.h"
+
+namespace BansheeEngine
+{
+	class BS_EXPORT RenderableRTTI : public CM::RTTIType<Renderable, CM::Component, RenderableRTTI>
+	{
+	private:
+
+	public:
+		RenderableRTTI()
+		{
+
+		}
+
+		virtual const CM::String& getRTTIName()
+		{
+			static CM::String name = "Renderable";
+			return name;
+		}
+
+		virtual UINT32 getRTTIId()
+		{
+			return TID_Renderable;
+		}
+
+		virtual std::shared_ptr<CM::IReflectable> newRTTIObject()
+		{
+			return std::shared_ptr<Renderable>(CM_NEW(Renderable, CM::PoolAlloc) Renderable(),
+				&CM::MemAllocDeleter<Renderable, CM::PoolAlloc>::deleter);
+		}
+	};
+}

BansheeEngine/Include/BsSceneManager.h

@@ -14,12 +14,12 @@ namespace BansheeEngine
 		/**
 		 * @brief	Returns all cameras in the scene.
 		 */
-		virtual const std::vector<CM::HCamera>& getAllCameras() const = 0;
+		virtual const std::vector<HCamera>& getAllCameras() const = 0;
 
 		/**
 		 * @brief	Returns all renderables visible to the specified camera.
 		 */
-		virtual std::vector<CM::HRenderable> getVisibleRenderables(const CM::HCamera& camera) const = 0;
+		virtual std::vector<HRenderable> getVisibleRenderables(const HCamera& camera) const = 0;
 	};
 
 	BS_EXPORT SceneManager& gSceneManager();

BansheeEngine/Source/BsApplication.cpp

@@ -1,6 +1,7 @@
 #include "BsApplication.h"
 #include "BsGUIMaterialManager.h"
 #include "BsGUIManager.h"
+#include "BsOverlayManager.h"
 #include "CmApplication.h"
 
 using namespace CamelotFramework;
@@ -27,6 +28,7 @@ namespace BansheeEngine
 
 		CM::gApplication().startUp(desc);
 
+		OverlayManager::startUp(CM_NEW(OverlayManager, GenAlloc) OverlayManager());
 		GUIManager::startUp(CM_NEW(GUIManager, GenAlloc) GUIManager());
 		GUIMaterialManager::startUp(CM_NEW(GUIMaterialManager, GenAlloc) GUIMaterialManager());
 	}
@@ -44,6 +46,7 @@ namespace BansheeEngine
 
 		GUIMaterialManager::shutDown();
 		GUIManager::shutDown();
+		OverlayManager::shutDown();
 	}
 
 	Application& gBansheeApp()

CamelotCore/Source/CmCamera.cpp → BansheeEngine/Source/BsCamera.cpp

@@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "CmCamera.h"
-#include "CmCameraRTTI.h"
+#include "BsCamera.h"
+#include "BsCameraRTTI.h"
 
 #include "CmMath.h"
 #include "CmMatrix3.h"
@@ -40,7 +40,10 @@ THE SOFTWARE.
 #include "CmRenderSystem.h"
 #include "CmSceneObject.h"
 
-namespace CamelotFramework {
+using namespace CamelotFramework;
+
+namespace BansheeEngine 
+{
 	const float Camera::INFINITE_FAR_PLANE_ADJUST = 0.00001f;
 
     //-----------------------------------------------------------------------

BansheeEngine/Source/BsGUIWidget.cpp

@@ -6,7 +6,7 @@
 #include "CmMaterial.h"
 #include "CmPass.h"
 #include "CmMesh.h"
-#include "CmCamera.h"
+#include "BsCamera.h"
 #include "CmViewport.h"
 #include "CmSceneObject.h"
 

CamelotCore/Source/CmOverlay.cpp → BansheeEngine/Source/BsOverlay.cpp

@@ -1,7 +1,9 @@
-#include "CmOverlay.h"
-#include "CmOverlayManager.h"
+#include "BsOverlay.h"
+#include "BsOverlayManager.h"
 
-namespace CamelotFramework
+using namespace CamelotFramework;
+
+namespace BansheeEngine
 {
 	Overlay::Overlay(const HSceneObject& parent)
 		:Component(parent)

CamelotCore/Source/CmOverlayManager.cpp → BansheeEngine/Source/BsOverlayManager.cpp

@@ -1,8 +1,10 @@
-#include "CmOverlayManager.h"
-#include "CmCamera.h"
-#include "CmOverlay.h"
+#include "BsOverlayManager.h"
+#include "BsCamera.h"
+#include "BsOverlay.h"
 
-namespace CamelotFramework
+using namespace CamelotFramework;
+
+namespace BansheeEngine
 {
 	void OverlayManager::render(const Camera* camera, DeferredRenderContextPtr& renderContext) const
 	{

CamelotCore/Source/CmRenderable.cpp → BansheeEngine/Source/BsRenderable.cpp

@@ -1,7 +1,9 @@
-#include "CmRenderable.h"
-#include "CmRenderableRTTI.h"
+#include "BsRenderable.h"
+#include "BsRenderableRTTI.h"
 
-namespace CamelotFramework
+using namespace CamelotFramework;
+
+namespace BansheeEngine
 {
 	Renderable::Renderable(const HSceneObject& parent)
 		:Component(parent)

BansheeForwardRenderer/Include/BsForwardRenderer.h

@@ -14,7 +14,7 @@ namespace BansheeEngine
 		virtual const CM::String& getName() const;
 
 		virtual void renderAll();
-		virtual void render(const CM::HCamera& camera);
+		virtual void render(const HCamera& camera);
 
 	protected:
 		CM::RenderCommandBuffer* mCommandBuffer;

BansheeForwardRenderer/Source/BsForwardRenderer.cpp

@@ -1,8 +1,8 @@
 #include "BsForwardRenderer.h"
-#include "CmCamera.h"
+#include "BsCamera.h"
 #include "BsSceneManager.h"
 #include "CmDeferredRenderContext.h"
-#include "CmRenderable.h"
+#include "BsRenderable.h"
 #include "CmMaterial.h"
 #include "CmMesh.h"
 #include "CmPass.h"
@@ -12,7 +12,7 @@
 #include "CmApplication.h"
 #include "CmViewport.h"
 #include "CmRenderTarget.h"
-#include "CmOverlayManager.h"
+#include "BsOverlayManager.h"
 
 using namespace CamelotFramework;
 

BansheeOctreeSM/Include/BsOctreeSceneManager.h

@@ -11,13 +11,13 @@ namespace BansheeEngine
 		OctreeSceneManager() {}
 		~OctreeSceneManager() {}
 
-		const std::vector<CM::HCamera>& getAllCameras() const { return mCachedCameras; }
+		const std::vector<HCamera>& getAllCameras() const { return mCachedCameras; }
 
-		std::vector<CM::HRenderable> getVisibleRenderables(const CM::HCamera& camera) const;
+		std::vector<HRenderable> getVisibleRenderables(const HCamera& camera) const;
 	private:
 		void notifyComponentAdded(const CM::HComponent& component);
 		void notifyComponentRemoved(const CM::HComponent& component);
 
-		std::vector<CM::HCamera> mCachedCameras;
+		std::vector<HCamera> mCachedCameras;
 	};
 }

BansheeOctreeSM/Source/BsOctreeSceneManager.cpp

@@ -2,8 +2,8 @@
 #include "CmComponent.h"
 #include "CmException.h"
 #include "CmSceneObject.h"
-#include "CmRenderable.h"
-#include "CmCamera.h"
+#include "BsRenderable.h"
+#include "BsCamera.h"
 
 using namespace CamelotFramework;
 

CamelotClient/CamelotClient.cpp

@@ -6,12 +6,12 @@
 #include "CmDynLibManager.h"
 
 #include "CmSceneObject.h"
-#include "CmCamera.h"
+#include "BsCamera.h"
 #include "CmHighLevelGpuProgramManager.h"
 #include "CmRenderSystem.h"
 #include "CmRenderWindow.h"
 #include "CmResources.h"
-#include "CmRenderable.h"
+#include "BsRenderable.h"
 #include "CmMaterial.h"
 #include "CmShader.h"
 #include "CmTechnique.h"

CamelotClient/CmDebugCamera.cpp

@@ -4,9 +4,11 @@
 #include "CmTime.h"
 #include "CmMath.h"
 #include "CmSceneObject.h"
-#include "CmCamera.h"
+#include "BsCamera.h"
 #include "CmOSCursor.h"
 
+using namespace BansheeEngine;
+
 namespace CamelotFramework
 {
 	const float DebugCamera::START_SPEED = 40.0f;

CamelotClient/CmDebugCamera.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CmPrerequisites.h"
+#include "BsPrerequisites.h"
 #include "CmComponent.h"
 #include "CmInputHandler.h"
 #include "CmMath.h"
@@ -22,7 +22,7 @@ namespace CamelotFramework
 		Degree mPitch;
 		Degree mYaw;
 
-		HCamera mCamera;
+		BS::HCamera mCamera;
 
 		void keyDown(CamelotFramework::KeyCode keyCode);
 		void keyUp(CamelotFramework::KeyCode keyCode);

CamelotClient/CmEditorWindow.cpp

@@ -5,14 +5,15 @@
 #include "BsGUIWidget.h"
 #include "BsGUILabel.h"
 #include "BsGUISkin.h"
-#include "CmOverlayManager.h"
-#include "CmCamera.h"
+#include "BsOverlayManager.h"
+#include "BsCamera.h"
 
 using namespace CamelotFramework;
+using namespace BansheeEngine;
 
 namespace CamelotEditor
 {
-	EditorWindow::EditorWindow(const String& name, const HFont& dbgFont, UINT32 dbgFontSize)
+	EditorWindow::EditorWindow(const String& name, const HFont& dbgFont, CM::UINT32 dbgFontSize)
 	{
 		RENDER_WINDOW_DESC renderWindowDesc;
 		renderWindowDesc.width = 200;

CamelotClient/CmTestTextSprite.cpp

@@ -1,6 +1,6 @@
 #include "CmTestTextSprite.h"
 #include "CmSceneObject.h"
-#include "CmRenderable.h"
+#include "BsRenderable.h"
 #include "CmMesh.h"
 #include "CmVector2.h"
 #include "BsTextSprite.h"
@@ -8,7 +8,7 @@
 #include "CmMaterial.h"
 #include "BsGUILabel.h"
 #include "BsGUISkin.h"
-#include "CmOverlayManager.h"
+#include "BsOverlayManager.h"
 
 using namespace BansheeEngine;
 

CamelotClient/CmTestTextSprite.h

@@ -16,6 +16,6 @@ namespace CamelotFramework
 
 		virtual void update();
 
-		void setText(const HCamera& camera, const String& text, HFont font, UINT32 fontSize);
+		void setText(const BS::HCamera& camera, const String& text, HFont font, UINT32 fontSize);
 	};
 }

CamelotCore/CamelotCore.vcxproj

@@ -181,12 +181,9 @@
     <ClInclude Include="Include\CmGameObjectRTTI.h" />
     <ClInclude Include="Include\CmSceneObjectRTTI.h" />
     <ClInclude Include="Include\CmMemAllocCategories.h" />
-    <ClInclude Include="Include\CmOverlay.h" />
     <ClInclude Include="Include\CmApplication.h" />
     <ClInclude Include="Include\CmBlendStateRTTI.h" />
     <ClInclude Include="Include\CmBuiltinMaterialManager.h" />
-    <ClInclude Include="Include\CmCamera.h" />
-    <ClInclude Include="Include\CmCameraRTTI.h" />
     <ClInclude Include="Include\CmCgProgram.h" />
     <ClInclude Include="Include\CmCgProgramFactory.h" />
     <ClInclude Include="Include\CmCgProgramRTTI.h" />
@@ -225,7 +222,6 @@
     <ClInclude Include="Include\CmMaterialManager.h" />
     <ClInclude Include="Include\CmMeshManager.h" />
     <ClInclude Include="Include\CmOcclusionQuery.h" />
-    <ClInclude Include="Include\CmOverlayManager.h" />
     <ClInclude Include="Include\CmPixelBuffer.h" />
     <ClInclude Include="Include\CmGpuProgIncludeImporter.h" />
     <ClInclude Include="Include\CmTextureView.h" />
@@ -247,8 +243,6 @@
     <ClInclude Include="Include\CmPrerequisites.h" />
     <ClInclude Include="Include\CmRasterizerState.h" />
     <ClInclude Include="Include\CmRasterizerStateRTTI.h" />
-    <ClInclude Include="Include\CmRenderable.h" />
-    <ClInclude Include="Include\CmRenderableRTTI.h" />
     <ClInclude Include="Include\CmRenderer.h" />
     <ClInclude Include="Include\CmRendererFactory.h" />
     <ClInclude Include="Include\CmRendererManager.h" />
@@ -298,10 +292,8 @@
     <ClCompile Include="Source\CmBuiltinMaterialManager.cpp" />
     <ClCompile Include="Source\CmGameObjectHandle.cpp" />
     <ClCompile Include="Source\CmGameObject.cpp" />
-    <ClCompile Include="Source\CmOverlay.cpp" />
     <ClCompile Include="Source\CmApplication.cpp" />
     <ClCompile Include="Source\CmBlendState.cpp" />
-    <ClCompile Include="Source\CmCamera.cpp" />
     <ClCompile Include="Source\CmCgProgram.cpp" />
     <ClCompile Include="Source\CmCgProgramFactory.cpp" />
     <ClCompile Include="Source\CmCommandQueue.cpp" />
@@ -329,7 +321,6 @@
     <ClCompile Include="Source\CmMeshDataRTTI.cpp" />
     <ClCompile Include="Source\CmMeshManager.cpp" />
     <ClCompile Include="Source\CmOcclusionQuery.cpp" />
-    <ClCompile Include="Source\CmOverlayManager.cpp" />
     <ClCompile Include="Source\CmPixelBuffer.cpp" />
     <ClCompile Include="Source\CmGpuProgIncludeImporter.cpp" />
     <ClCompile Include="Source\CmTextureView.cpp" />
@@ -345,7 +336,6 @@
     <ClCompile Include="Source\CmMultiRenderTexture.cpp" />
     <ClCompile Include="Source\CmPass.cpp" />
     <ClCompile Include="Source\CmRasterizerState.cpp" />
-    <ClCompile Include="Source\CmRenderable.cpp" />
     <ClCompile Include="Source\CmRendererManager.cpp" />
     <ClCompile Include="Source\CmRenderSystem.cpp" />
     <ClCompile Include="Source\CmRenderSystemCapabilities.cpp" />

CamelotCore/CamelotCore.vcxproj.filters

@@ -85,12 +85,6 @@
     <Filter Include="Source Files\Text">
       <UniqueIdentifier>{96b913ee-4ffb-4c60-9aa9-a51e0faf8060}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\2D">
-      <UniqueIdentifier>{2d09c863-07a9-4226-a55d-6c5c03d70ac8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\2D">
-      <UniqueIdentifier>{500c1648-85c9-4410-86e3-c16d102b4347}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Include\CmWindowEventUtilities.h">
@@ -99,9 +93,6 @@
     <ClInclude Include="Include\CmApplication.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmCamera.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Include\CmViewport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -216,15 +207,6 @@
     <ClInclude Include="Include\CmComponentRTTI.h">
       <Filter>Header Files\RTTI</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmCameraRTTI.h">
-      <Filter>Header Files\RTTI</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmRenderable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmRenderableRTTI.h">
-      <Filter>Header Files\RTTI</Filter>
-    </ClInclude>
     <ClInclude Include="Include\CmTechnique.h">
       <Filter>Header Files\Material</Filter>
     </ClInclude>
@@ -414,12 +396,6 @@
     <ClInclude Include="Include\CmFontImportOptionsRTTI.h">
       <Filter>Header Files\RTTI</Filter>
     </ClInclude>
-    <ClInclude Include="Include\CmOverlay.h">
-      <Filter>Header Files\2D</Filter>
-    </ClInclude>
-    <ClInclude Include="Include\CmOverlayManager.h">
-      <Filter>Header Files\2D</Filter>
-    </ClInclude>
     <ClInclude Include="Include\CmMemAllocCategories.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -446,9 +422,6 @@
     <ClCompile Include="Source\CmApplication.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\CmCamera.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Source\CmViewport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -530,9 +503,6 @@
     <ClCompile Include="Source\CmInput.cpp">
       <Filter>Source Files\Input</Filter>
     </ClCompile>
-    <ClCompile Include="Source\CmRenderable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Source\CmPass.cpp">
       <Filter>Source Files\Material</Filter>
     </ClCompile>
@@ -662,12 +632,6 @@
     <ClCompile Include="Source\CmMeshDataRTTI.cpp">
       <Filter>Source Files\RTTI</Filter>
     </ClCompile>
-    <ClCompile Include="Source\CmOverlay.cpp">
-      <Filter>Source Files\2D</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CmOverlayManager.cpp">
-      <Filter>Source Files\2D</Filter>
-    </ClCompile>
     <ClCompile Include="Source\CmGameObjectHandle.cpp">
       <Filter>Source Files\Scene</Filter>
     </ClCompile>

CamelotCore/Include/CmApplication.h

@@ -7,7 +7,6 @@ namespace CamelotFramework
 {
 	class RenderWindow;
 	class Viewport;
-	class Camera;
 	class HighLevelGpuProgramManager;
 }
 

CamelotCore/Include/CmCameraRTTI.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include "CmPrerequisites.h"
-#include "CmRTTIType.h"
-#include "CmComponent.h"
-
-namespace CamelotFramework
-{
-	class CM_EXPORT CameraRTTI : public RTTIType<Camera, Component, CameraRTTI>
-	{
-	private:
-
-	public:
-		CameraRTTI()
-		{
-
-		}
-
-		virtual const String& getRTTIName()
-		{
-			static String name = "Camera";
-			return name;
-		}
-
-		virtual UINT32 getRTTIId()
-		{
-			return TID_Camera;
-		}
-
-		virtual std::shared_ptr<IReflectable> newRTTIObject()
-		{
-			return std::shared_ptr<Camera>(CM_NEW(Camera, PoolAlloc) Camera(), &MemAllocDeleter<Camera, PoolAlloc>::deleter);
-		}
-	};
-}

CamelotCore/Include/CmGameObject.h

@@ -29,6 +29,4 @@ namespace CamelotFramework
 	typedef GameObjectHandle<GameObject> HGameObject;
 	typedef GameObjectHandle<SceneObject> HSceneObject;
 	typedef GameObjectHandle<Component> HComponent;
-	typedef GameObjectHandle<Camera> HCamera;
-	typedef GameObjectHandle<Renderable> HRenderable;
 }

CamelotCore/Include/CmPrerequisites.h

@@ -91,7 +91,6 @@ namespace CamelotFramework {
 // Pre-declare classes
 // Allows use of pointers in header files without including individual .h
 // so decreases dependencies between files
-    class Camera;
     class Color;
     class GpuProgram;
     class GpuProgramManager;
@@ -123,7 +122,6 @@ namespace CamelotFramework {
     class VertexDeclaration;
 	class Input;
 	class InputHandler;
-	class Renderable;
 	class Renderer;
 	class RendererFactory;
 	class RenderCommandBuffer;
@@ -163,9 +161,6 @@ namespace CamelotFramework {
 	class SceneObject;
 	class Component;
 	class SceneManager;
-	// 2D
-	class Overlay;
-	class OverlayManager;
 	// RTTI
 	class MeshRTTI;
 	// Desc structs
@@ -194,8 +189,6 @@ namespace CamelotFramework
 	typedef std::shared_ptr<Mesh> MeshPtr;
 	typedef std::shared_ptr<Texture> TexturePtr;
 	typedef std::shared_ptr<Resource> ResourcePtr;
-	typedef std::shared_ptr<Camera> CameraPtr;
-	typedef std::shared_ptr<Renderable> RenderablePtr;
 	typedef std::shared_ptr<Technique> TechniquePtr;
 	typedef std::shared_ptr<Pass> PassPtr;
 	typedef std::shared_ptr<Shader> ShaderPtr;
@@ -223,7 +216,6 @@ namespace CamelotFramework
 	typedef std::shared_ptr<ImportOptions> ImportOptionsPtr;
 	typedef std::shared_ptr<const ImportOptions> ConstImportOptionsPtr;
 	typedef std::shared_ptr<Font> FontPtr;
-	typedef std::shared_ptr<Overlay> OverlayPtr;
 	typedef std::shared_ptr<InputHandler> InputHandlerPtr;
 }
 
@@ -240,8 +232,6 @@ namespace CamelotFramework
 		TID_VertexDeclaration = 1004,
 		TID_VertexElementData = 1005,
 		TID_Component = 1006,
-		TID_Camera = 1007,
-		TID_Renderable = 1008,
 		TID_ResourceHandle = 1009,
 		TID_GpuProgram = 1010,
 		TID_ResourceHandleData = 1011,

CamelotCore/Include/CmRenderableRTTI.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#include "CmPrerequisites.h"
-#include "CmRTTIType.h"
-#include "CmRenderable.h"
-
-namespace CamelotFramework
-{
-	class CM_EXPORT RenderableRTTI : public RTTIType<Renderable, Component, RenderableRTTI>
-	{
-	private:
-
-	public:
-		RenderableRTTI()
-		{
-
-		}
-
-		virtual const String& getRTTIName()
-		{
-			static String name = "Renderable";
-			return name;
-		}
-
-		virtual UINT32 getRTTIId()
-		{
-			return TID_Renderable;
-		}
-
-		virtual std::shared_ptr<IReflectable> newRTTIObject()
-		{
-			return std::shared_ptr<Renderable>(CM_NEW(Renderable, PoolAlloc) Renderable(),
-				&MemAllocDeleter<Renderable, PoolAlloc>::deleter);
-		}
-	};
-}

CamelotCore/Include/CmRenderer.h

@@ -17,7 +17,8 @@ namespace CamelotFramework
 
 		/**
 		 * @brief	 Renders the scene from the perspective of a single camera
+		 * 			 // TODO - Temporarily disabled since I moved Camera out of Camelot
 		 */
-		virtual void render(const HCamera& camera) = 0;
+		//virtual void render(const HCamera& camera) = 0;
 	};
 }

CamelotCore/Source/CmApplication.cpp

@@ -6,7 +6,6 @@
 #include "CmWindowEventUtilities.h"
 #include "CmHardwareBufferManager.h"
 #include "CmRenderWindow.h"
-#include "CmCamera.h"
 #include "CmViewport.h"
 #include "CmVector2.h"
 #include "CmHighLevelGpuProgram.h"
@@ -27,7 +26,6 @@
 #include "CmFontManager.h"
 #include "CmRenderer.h"
 #include "CmDeferredRenderContext.h"
-#include "CmOverlayManager.h"
 
 #include "CmMaterial.h"
 #include "CmShader.h"
@@ -81,9 +79,6 @@ namespace CamelotFramework
 		MaterialManager::startUp(CM_NEW(MaterialManager, GenAlloc) MaterialManager());
 		FontManager::startUp(CM_NEW(FontManager, GenAlloc) FontManager());
 
-		OverlayManager::startUp(CM_NEW(OverlayManager, GenAlloc) OverlayManager());
-
-
 		Importer::startUp(CM_NEW(Importer, GenAlloc) Importer());
 
 		for(auto& importerName : desc.importers)
@@ -159,7 +154,6 @@ namespace CamelotFramework
 		MeshManager::shutDown();
 
 		SceneManager::shutDown();
-		OverlayManager::shutDown();
 
 		RendererManager::shutDown();
 		RenderSystem::shutDown();

CamelotCore/Source/CmSceneManager.cpp

@@ -1,8 +1,6 @@
 #include "CmSceneManager.h"
 #include "CmSceneObject.h"
 #include "CmComponent.h"
-#include "CmCamera.h"
-#include "CmRenderable.h"
 
 namespace CamelotFramework
 {

CamelotD3D9Renderer/Source/CmD3D9RenderSystem.cpp

@@ -35,7 +35,6 @@ THE SOFTWARE.
 #include "CmD3D9TextureManager.h"
 #include "CmD3D9Texture.h"
 #include "CmMath.h"
-#include "CmCamera.h"
 #include "CmD3D9HardwareBufferManager.h"
 #include "CmD3D9IndexBuffer.h"
 #include "CmD3D9VertexBuffer.h"

CamelotGLRenderer/Source/CmGLRenderSystem.cpp

@@ -29,7 +29,6 @@ THE SOFTWARE.s
 
 #include "CmGLRenderSystem.h"
 #include "CmRenderSystem.h"
-#include "CmCamera.h"
 #include "CmGLTextureManager.h"
 #include "CmGLVertexBuffer.h"
 #include "CmGLIndexBuffer.h"

CamelotGLRenderer/Source/CmGLTexture.cpp

@@ -31,8 +31,6 @@ THE SOFTWARE.
 #include "CmGLPixelFormat.h"
 #include "CmGLPixelBuffer.h"
 
-//#include "CmTextureManager.h"
-#include "CmCamera.h"
 #include "CmException.h"
 #include "CmBitwise.h"
 #include "CmTextureManager.h"

CamelotUtility/Include/CmMemoryAllocator.h

@@ -95,11 +95,11 @@ namespace CamelotFramework
 	{ };
 }
 
-#define CM_NEW(T, category) new (MemoryAllocator<category>::allocate(sizeof(T)))
-#define CM_NEW_BYTES(count, category) (UINT8*)MemoryAllocator<category>::allocate(count)
-#define CM_NEW_ARRAY(T, count, category) __cm_construct_array<T, category>(count)
-#define CM_DELETE(ptr, T, category) {(ptr)->~T(); MemoryAllocator<category>::free(ptr);}
-#define CM_DELETE_BYTES(ptr, category) MemoryAllocator<category>::free(ptr)
-#define CM_DELETE_ARRAY(ptr, T, count, category) __cm_destruct_array<T, category>(ptr, count)
+#define CM_NEW(T, category) new (CamelotFramework::MemoryAllocator<category>::allocate(sizeof(T)))
+#define CM_NEW_BYTES(count, category) (UINT8*)CamelotFramework::MemoryAllocator<category>::allocate(count)
+#define CM_NEW_ARRAY(T, count, category) CamelotFramework::__cm_construct_array<T, category>(count)
+#define CM_DELETE(ptr, T, category) {(ptr)->~T(); CamelotFramework::MemoryAllocator<category>::free(ptr);}
+#define CM_DELETE_BYTES(ptr, category) CamelotFramework::MemoryAllocator<category>::free(ptr)
+#define CM_DELETE_ARRAY(ptr, T, count, category) CamelotFramework::__cm_destruct_array<T, category>(ptr, count)
 
 

TODO.txt

@@ -4,11 +4,6 @@
 
 BansheeEngine refactor:
  - Move built-in materials and their managers to BansheeEngine
- - Move Camera class
- - Move Overlay & OverlayManager
- - Move Renderable
- - Extend SceneManager so it works without knowing about Camera/Renderable
- - Remove all mentioned classes from CmPrerequisites (including Ptrs, and handles from GameObject.h)
 
 Immediate TODO:
  - Issue with rendering same object from multiple cameras: