Renamed CamelotEngine -> CamelotFramework namespace

Renamed some folders

BansheeEngine/Include/BsPrerequisites.h

@@ -21,7 +21,7 @@
 #include "CmGameObject.h"
 
 // To avoid a lot of typing
-namespace CM = CamelotEngine;
+namespace CM = CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsApplication.cpp

@@ -3,7 +3,7 @@
 #include "BsGUIManager.h"
 #include "CmApplication.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsGUIElement.cpp

@@ -3,7 +3,7 @@
 #include "BsGUISkin.h"
 #include "CmException.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsGUILabel.cpp

@@ -4,7 +4,7 @@
 #include "BsGUISkin.h"
 #include "BsGUIWidget.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsGUIMaterialManager.cpp

@@ -3,7 +3,7 @@
 #include "CmDebug.h"
 #include "CmBuiltinMaterialManager.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsGUISkin.cpp

@@ -2,7 +2,7 @@
 #include "BsGUIElementStyle.h"
 #include "CmDebug.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsGUIWidget.cpp

@@ -10,7 +10,7 @@
 #include "CmViewport.h"
 #include "CmSceneObject.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsImageSprite.cpp

@@ -2,7 +2,7 @@
 #include "BsSpriteTexture.h"
 #include "BsGUIMaterialManager.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsSprite.cpp

@@ -2,7 +2,7 @@
 #include "BsGUIMaterialManager.h"
 #include "CmVector2.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsSpriteTexture.cpp

@@ -1,6 +1,6 @@
 #include "BsSpriteTexture.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeEngine/Source/BsTextSprite.cpp

@@ -6,7 +6,7 @@
 #include "CmVector2.h"
 #include "CmMath.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeForwardRenderer/Source/BsForwardRenderer.cpp

@@ -14,7 +14,7 @@
 #include "CmRenderTarget.h"
 #include "CmOverlayManager.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeForwardRenderer/Source/BsForwardRendererFactory.cpp

@@ -2,7 +2,7 @@
 #include "CmRenderer.h"
 #include "BsForwardRenderer.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeForwardRenderer/Source/BsForwardRendererPlugin.cpp

@@ -2,7 +2,7 @@
 #include "BsForwardRendererFactory.h"
 #include "CmRendererManager.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeOctreeSM/Source/BsOctreeSceneManager.cpp

@@ -5,7 +5,7 @@
 #include "CmRenderable.h"
 #include "CmCamera.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

BansheeOctreeSM/Source/BsSceneManagerPlugin.cpp

@@ -1,7 +1,7 @@
 #include "BsOctreeSMPrerequisites.h"
 #include "BsOctreeSceneManager.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace BansheeEngine
 {

CamelotClient/CamelotClient.cpp

@@ -32,7 +32,7 @@
 //#define DX9
 //#define GL
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 using namespace CamelotEditor;
 using namespace BansheeEngine;
 
@@ -81,7 +81,7 @@ int CALLBACK WinMain(
 		{
 			FontImportOptions* importOptions = static_cast<FontImportOptions*>(fontImportOptions.get());
 
-			vector<CamelotEngine::UINT32>::type fontSizes;
+			vector<CamelotFramework::UINT32>::type fontSizes;
 			fontSizes.push_back(12);
 			importOptions->setFontSizes(fontSizes);
 		}
@@ -93,8 +93,8 @@ int CALLBACK WinMain(
 
 #if defined DX9
 	///////////////// HLSL 9 SHADERS //////////////////////////
-	String dx9psLoc = "C:\\Projects\\CamelotEngine\\Data\\hlsl9_ps.gpuprog";
-	String dx9vsLoc = "C:\\Projects\\CamelotEngine\\Data\\hlsl9_vs.gpuprog";
+	String dx9psLoc = "C:\\Projects\\BansheeEngine\\Data\\hlsl9_ps.gpuprog";
+	String dx9vsLoc = "C:\\Projects\\BansheeEngine\\Data\\hlsl9_vs.gpuprog";
 
 	ImportOptionsPtr gpuProgImportOptions = Importer::instance().createImportOptions(dx9psLoc);
 	if(rtti_is_of_type<GpuProgramImportOptions>(gpuProgImportOptions))
@@ -128,8 +128,8 @@ int CALLBACK WinMain(
 	const String& debugString = gpuProgInclude->getString();
 	
 	/////////////////// HLSL 11 SHADERS //////////////////////////
-	String dx11psLoc = "C:\\Projects\\CamelotEngine\\Data\\hlsl11_ps.gpuprog";
-	String dx11vsLoc = "C:\\Projects\\CamelotEngine\\Data\\hlsl11_vs.gpuprog";
+	String dx11psLoc = "C:\\Projects\\BansheeEngine\\Data\\hlsl11_ps.gpuprog";
+	String dx11vsLoc = "C:\\Projects\\BansheeEngine\\Data\\hlsl11_vs.gpuprog";
 
 	ImportOptionsPtr gpuProgImportOptions = Importer::instance().createImportOptions(dx11psLoc);
 	if(rtti_is_of_type<GpuProgramImportOptions>(gpuProgImportOptions))
@@ -159,8 +159,8 @@ int CALLBACK WinMain(
 	
 #else
 	///////////////// GLSL SHADERS ////////////////////////////
-	String glslpsLoc = "C:\\Projects\\CamelotEngine\\Data\\glsl_ps.gpuprog";
-	String glslvsLoc = "C:\\Projects\\CamelotEngine\\Data\\glsl_vs.gpuprog";
+	String glslpsLoc = "C:\\Projects\\BansheeEngine\\Data\\glsl_ps.gpuprog";
+	String glslvsLoc = "C:\\Projects\\BansheeEngine\\Data\\glsl_vs.gpuprog";
 
 	ImportOptionsPtr gpuProgImportOptions = Importer::instance().createImportOptions(glslpsLoc);
 	if(rtti_is_of_type<GpuProgramImportOptions>(gpuProgImportOptions))

CamelotClient/CmDebugCamera.cpp

@@ -7,7 +7,7 @@
 #include "CmCamera.h"
 #include "CmOSCursor.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	const float DebugCamera::START_SPEED = 40.0f;
 	const float DebugCamera::TOP_SPEED = 130.0f;

CamelotClient/CmDebugCamera.h

@@ -5,7 +5,7 @@
 #include "CmInputHandler.h"
 #include "CmMath.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class DebugCamera : public Component
 	{
@@ -24,11 +24,11 @@ namespace CamelotEngine
 
 		HCamera mCamera;
 
-		void keyDown(CamelotEngine::KeyCode keyCode);
-		void keyUp(CamelotEngine::KeyCode keyCode);
+		void keyDown(CamelotFramework::KeyCode keyCode);
+		void keyUp(CamelotFramework::KeyCode keyCode);
 
-		void mouseDown(const CamelotEngine::MouseEvent& event, CamelotEngine::MouseButton buttonID);
-		void mouseUp(const CamelotEngine::MouseEvent& event, CamelotEngine::MouseButton buttonID);
+		void mouseDown(const CamelotFramework::MouseEvent& event, CamelotFramework::MouseButton buttonID);
+		void mouseUp(const CamelotFramework::MouseEvent& event, CamelotFramework::MouseButton buttonID);
 
 		static const float START_SPEED;
 		static const float TOP_SPEED;

CamelotClient/CmEditorWindow.cpp

@@ -8,7 +8,7 @@
 #include "CmOverlayManager.h"
 #include "CmCamera.h"
 
-using namespace CamelotEngine;
+using namespace CamelotFramework;
 
 namespace CamelotEditor
 {

CamelotClient/CmEditorWindow.h

@@ -7,7 +7,7 @@ namespace CamelotEditor
 	class EditorWindow
 	{
 	public:
-		EditorWindow(const CM::String& name, const CM::HFont& dbgFont, CamelotEngine::UINT32 dbgFontSize);
+		EditorWindow(const CM::String& name, const CM::HFont& dbgFont, CamelotFramework::UINT32 dbgFontSize);
 		virtual ~EditorWindow();
 
 	private:

CamelotClient/CmTestTextSprite.cpp

@@ -12,7 +12,7 @@
 
 using namespace BansheeEngine;
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	TestTextSprite::TestTextSprite(const HSceneObject& parent)
 		:GUIWidget(parent), mSkin(nullptr)

CamelotClient/CmTestTextSprite.h

@@ -1,7 +1,7 @@
 #include "BsPrerequisites.h"
 #include "BsGUIWidget.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class TestTextSprite : public BansheeEngine::GUIWidget
 	{

CamelotCore/Include/CmApplication.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmHighLevelGpuProgram.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class RenderWindow;
 	class Viewport;
@@ -11,7 +11,7 @@ namespace CamelotEngine
 	class HighLevelGpuProgramManager;
 }
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct START_UP_DESC
 	{

CamelotCore/Include/CmBlendState.h

@@ -4,7 +4,7 @@
 #include "CmResource.h"
 #include "CmCommonEnums.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT RENDER_TARGET_BLEND_STATE_DESC
 	{

CamelotCore/Include/CmBlendStateRTTI.h

@@ -5,7 +5,7 @@
 #include "CmBlendState.h"
 #include "CmRenderStateManager.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	template<> struct RTTIPlainType<BLEND_STATE_DESC>
 	{	

CamelotCore/Include/CmBuiltinMaterialManager.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Provides access to various materials that are required for core engine systems. 

CamelotCore/Include/CmCamera.h

@@ -46,7 +46,7 @@ THE SOFTWARE.
 #include "CmRay.h"
 #include "CmComponent.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 	/** Specifies perspective (realistic) or orthographic (architectural) projection.
     */
@@ -546,5 +546,5 @@ namespace CamelotEngine {
 	 /** @} */
 	 /** @} */
 
-} // namespace CamelotEngine
+} // namespace CamelotFramework
 #endif

CamelotCore/Include/CmCameraRTTI.h

@@ -4,7 +4,7 @@
 #include "CmRTTIType.h"
 #include "CmComponent.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT CameraRTTI : public RTTIType<Camera, Component, CameraRTTI>
 	{

CamelotCore/Include/CmCgProgram.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <Cg/cg.h>
 #include "CmHighLevelGpuProgram.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
     /** Specialisation of HighLevelGpuProgram to provide support for nVidia's CG language.
     @remarks
         In its current state Cg only acts as a translator and internally creates either a HLSL

CamelotCore/Include/CmCgProgramFactory.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <Cg/cg.h>
 #include "CmHighLevelGpuProgramManager.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
     /** Factory class for Cg programs. */
     class CM_EXPORT CgProgramFactory : public HighLevelGpuProgramFactory

CamelotCore/Include/CmCgProgramRTTI.h

@@ -6,7 +6,7 @@
 #include "CmHighLevelGpuProgram.h"
 #include "CmCgProgram.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT CgProgramRTTI : public RTTIType<CgProgram, HighLevelGpuProgram, CgProgramRTTI>
 	{

CamelotCore/Include/CmCommandQueue.h

@@ -6,7 +6,7 @@
 #include "boost/function.hpp"
 #include <functional>
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Contains a list of commands that can be queued by one thread,

CamelotCore/Include/CmCommonEnums.h

@@ -42,7 +42,7 @@ THE SOFTWARE.
 #   pragma GCC visibility pop
 #endif
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 	/** \addtogroup Core
 	*  @{
 	*/

CamelotCore/Include/CmComponent.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmGameObject.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT Component : public GameObject
 	{

CamelotCore/Include/CmComponentRTTI.h

@@ -4,7 +4,7 @@
 #include "CmRTTIType.h"
 #include "CmComponent.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT ComponentRTTI : public RTTIType<Component, GameObject, ComponentRTTI>
 	{

CamelotCore/Include/CmCoreObject.h

@@ -4,7 +4,7 @@
 #include "CmAsyncOp.h"
 #include "boost/function.hpp"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	This class provides some common functionality that all low-level GPU-related objects

CamelotCore/Include/CmCoreObjectManager.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	// TODO - Add debug option that would remember a call stack for each resource initialization,
 	// so when we fail to release one we know which one it is.

CamelotCore/Include/CmDeferredRenderContext.h

@@ -6,7 +6,7 @@
 #include "CmGpuProgram.h"
 #include "CmColor.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Deferred render context allows you to execute RenderSystem commands outside of the render thread.

CamelotCore/Include/CmDepthStencilState.h

@@ -4,7 +4,7 @@
 #include "CmCommonEnums.h"
 #include "CmResource.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT DEPTH_STENCIL_STATE_DESC
 	{

CamelotCore/Include/CmDepthStencilStateRTTI.h

@@ -5,7 +5,7 @@
 #include "CmDepthStencilState.h"
 #include "CmRenderStateManager.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT DepthStencilStateRTTI : public RTTIType<DepthStencilState, IReflectable, DepthStencilStateRTTI>
 	{

CamelotCore/Include/CmFont.h

@@ -4,7 +4,7 @@
 #include "CmResource.h"
 #include "CmFontDesc.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT FontData : public IReflectable
 	{

CamelotCore/Include/CmFontDesc.h

@@ -2,7 +2,7 @@
 
 #include "CmPrerequisites.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct KerningPair
 	{

CamelotCore/Include/CmFontImportOptions.h

@@ -4,7 +4,7 @@
 #include "CmImportOptions.h"
 #include "CmFont.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT FontImportOptions : public ImportOptions
 	{

CamelotCore/Include/CmFontImportOptionsRTTI.h

@@ -4,7 +4,7 @@
 #include "CmRTTIType.h"
 #include "CmFontImportOptions.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT FontImportOptionsRTTI : public RTTIType<FontImportOptions, IReflectable, FontImportOptionsRTTI>
 	{

CamelotCore/Include/CmFontManager.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT FontManager : public Module<FontManager>
 	{

CamelotCore/Include/CmFontRTTI.h

@@ -6,7 +6,7 @@
 #include "CmFontManager.h"
 #include "CmTexture.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT FontDataRTTI : public RTTIType<FontData, Resource, FontDataRTTI>
 	{

CamelotCore/Include/CmGameObject.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmIReflectable.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GameObject : public IReflectable
 	{
@@ -23,7 +23,7 @@ namespace CamelotEngine
 
 #include "CmGameObjectHandle.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	// Game object handles
 	typedef GameObjectHandle<GameObject> HGameObject;

CamelotCore/Include/CmGameObjectHandle.h

@@ -1,6 +1,6 @@
 #pragma once
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT GameObjectHandleData
 	{

CamelotCore/Include/CmGameObjectRTTI.h

@@ -4,7 +4,7 @@
 #include "CmRTTIType.h"
 #include "CmGameObject.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GameObjectRTTI : public RTTIType<GameObject, IReflectable, GameObjectRTTI>
 	{

CamelotCore/Include/CmGpuBuffer.h

@@ -5,7 +5,7 @@
 #include "CmGpuBufferView.h"
 #include "CmCoreObject.h"
 
-namespace CamelotEngine 
+namespace CamelotFramework 
 {
 	class CM_EXPORT GpuBuffer : public CoreObject
     {

CamelotCore/Include/CmGpuBufferView.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmCommonEnums.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT GPU_BUFFER_DESC
 	{

CamelotCore/Include/CmGpuParamBlock.h

@@ -4,7 +4,7 @@
 #include "CmCommonEnums.h"
 #include "CmCoreObject.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Represents an actual GPU buffer. 

CamelotCore/Include/CmGpuParamDesc.h

@@ -4,7 +4,7 @@
 #include "CmCommonEnums.h"
 #include "CmGpuProgramParams.h" // TODO - Only here because I need some type definitions (GpuConstantType) - Remove later
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct GpuParamDataDesc
 	{

CamelotCore/Include/CmGpuParams.h

@@ -2,7 +2,7 @@
 
 #include "CmPrerequisites.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GpuParams
 	{

CamelotCore/Include/CmGpuProgInclude.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmResource.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GpuProgInclude : public Resource
 	{

CamelotCore/Include/CmGpuProgIncludeImporter.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmSpecificImporter.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GpuProgIncludeImporter : public SpecificImporter
 	{

CamelotCore/Include/CmGpuProgram.h

@@ -35,7 +35,7 @@ THE SOFTWARE.
 #include "CmResource.h"
 #include "CmGpuParamDesc.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmGpuProgramImportOptions.h

@@ -4,7 +4,7 @@
 #include "CmImportOptions.h"
 #include "CmGpuProgram.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GpuProgramImportOptions : public ImportOptions
 	{

CamelotCore/Include/CmGpuProgramImportOptionsRTTI.h

@@ -4,7 +4,7 @@
 #include "CmRTTIType.h"
 #include "CmGpuProgramImportOptions.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GpuProgramImportOptionsRTTI : public RTTIType<GpuProgramImportOptions, IReflectable, GpuProgramImportOptionsRTTI>
 	{

CamelotCore/Include/CmGpuProgramImporter.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmSpecificImporter.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GpuProgramImporter : public SpecificImporter
 	{

CamelotCore/Include/CmGpuProgramManager.h

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include "CmGpuProgram.h"
 #include "CmModule.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmGpuProgramParams.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 #include "CmRenderOperation.h"
 #include "CmSamplerState.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmGpuProgramRTTI.h

@@ -4,7 +4,7 @@
 #include "CmRTTIType.h"
 #include "CmGpuProgram.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT GpuProgramRTTI : public RTTIType<GpuProgram, Resource, GpuProgramRTTI>
 	{

CamelotCore/Include/CmHardwareBuffer.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "CmPrerequisites.h"
 #include "CmCommonEnums.h"
 
-namespace CamelotEngine 
+namespace CamelotFramework 
 {
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmHardwareBufferManager.h

@@ -36,7 +36,7 @@ THE SOFTWARE.
 #include "CmIndexBuffer.h"
 #include "CmGpuParamBlock.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 	/** \addtogroup Core
 	*  @{
 	*/

CamelotCore/Include/CmHighLevelGpuProgram.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "CmPrerequisites.h"
 #include "CmGpuProgram.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmHighLevelGpuProgramManager.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 #include "CmException.h"
 #include "CmHighLevelGpuProgram.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmImportOptions.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmIReflectable.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT ImportOptions : public IReflectable
 	{

CamelotCore/Include/CmImportOptionsRTTI.h

@@ -4,7 +4,7 @@
 #include "CmImportOptions.h"
 #include "CmRTTIType.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT ImportOptionsRTTI : public RTTIType<ImportOptions, IReflectable, ImportOptionsRTTI>
 	{

CamelotCore/Include/CmImporter.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Module responsible for importing various asset types and converting

CamelotCore/Include/CmIndexBuffer.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 #include "CmHardwareBuffer.h"
 #include "CmCoreObject.h"
 
-namespace CamelotEngine 
+namespace CamelotFramework 
 {
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmIndexData.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmIndexBuffer.h"
 
-namespace CamelotEngine 
+namespace CamelotFramework 
 {
 	/** Summary class collecting together index data source information. */
 	class CM_EXPORT IndexData

CamelotCore/Include/CmInput.h

@@ -5,7 +5,7 @@
 #include "CmRect.h"
 #include "CmInputHandler.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT Input : public Module<Input>
 	{

CamelotCore/Include/CmInputHandler.h

@@ -4,7 +4,7 @@
 #include <boost/signal.hpp>
 #include "CmPoint.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	enum KeyCode
 	{

CamelotCore/Include/CmMaterial.h

@@ -9,7 +9,7 @@
 #include "CmMatrix4.h"
 #include "CmCommonEnums.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT PassParameters
 	{

CamelotCore/Include/CmMaterialManager.cpp

@@ -1,7 +1,7 @@
 #include "CmMaterialManager.h"
 #include "CmMaterial.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	MaterialPtr MaterialManager::create() const
 	{

CamelotCore/Include/CmMaterialManager.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT MaterialManager : public Module<MaterialManager>
 	{

CamelotCore/Include/CmMaterialRTTI.h

@@ -15,7 +15,7 @@
 #include "CmException.h"
 #include "CmKeyValuePair.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/************************************************************************/
 	/* 					HELPER STRUCTS TO HELP SERIALIZING                  */

CamelotCore/Include/CmMemAllocCategories.h

@@ -2,7 +2,7 @@
 
 #include "CmMemoryAllocator.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Allocator used for various GUI elements.

CamelotCore/Include/CmMesh.h

@@ -7,7 +7,7 @@
 #include "CmIndexData.h"
 #include "CmRenderOperation.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT SubMesh
 	{

CamelotCore/Include/CmMeshData.h

@@ -6,7 +6,7 @@
 #include "CmIndexBuffer.h"
 #include "CmVertexDeclaration.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT MeshData : public IReflectable
 	{

CamelotCore/Include/CmMeshDataRTTI.h

@@ -6,7 +6,7 @@
 #include "CmManagedDataBlock.h"
 #include "CmVertexDeclaration.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT VertexElementDataRTTI : public RTTIType<MeshData::VertexElementData, IReflectable, VertexElementDataRTTI>
 	{

CamelotCore/Include/CmMeshManager.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT MeshManager : public Module<MeshManager>
 	{

CamelotCore/Include/CmMultiRenderTexture.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmRenderTarget.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT MULTI_RENDER_TEXTURE_DESC
 	{

CamelotCore/Include/CmOcclusionQuery.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 // Precompiler options
 #include "CmPrerequisites.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 
 

CamelotCore/Include/CmOverlay.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmComponent.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Overlay components are a special type of components that can be attached directly
@@ -20,7 +20,7 @@ namespace CamelotEngine
 		virtual void update() {}
 
 	protected:
-		friend class CamelotEngine::SceneObject;
+		friend class CamelotFramework::SceneObject;
 
 		Overlay(const HSceneObject& parent);
 	};

CamelotCore/Include/CmOverlayManager.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/**
 	 * @brief	Takes care which overlay gets rendered on which camera.

CamelotCore/Include/CmPass.h

@@ -5,7 +5,7 @@
 #include "CmColor.h"
 #include "CmIReflectable.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/** Class defining a single pass of a Technique (of a Material), i.e.
         a single rendering call.

CamelotCore/Include/CmPassRTTI.h

@@ -4,7 +4,7 @@
 #include "CmRTTIType.h"
 #include "CmPass.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT PassRTTI : public RTTIType<Pass, IReflectable, PassRTTI>
 	{

CamelotCore/Include/CmPixelBuffer.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 #include "CmHardwareBuffer.h"
 #include "CmPixelUtil.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmPrerequisites.h

@@ -86,7 +86,7 @@ THE SOFTWARE
 
 #include "CmMemAllocCategories.h"
 
-namespace CamelotEngine {
+namespace CamelotFramework {
 
 // Pre-declare classes
 // Allows use of pointers in header files without including individual .h
@@ -182,7 +182,7 @@ namespace CamelotEngine {
 /* 						Shared pointer typedefs	                    	*/
 /************************************************************************/
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	typedef std::shared_ptr<GpuProgram> GpuProgramPtr;
 	typedef std::shared_ptr<HighLevelGpuProgram> HighLevelGpuProgramPtr;
@@ -230,7 +230,7 @@ namespace CamelotEngine
 /************************************************************************/
 /* 									RTTI                      			*/
 /************************************************************************/
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	enum TypeID_Core
 	{
@@ -292,8 +292,8 @@ namespace CamelotEngine
 	template<class T>
 	bool rtti_is_of_type(IReflectable* object)
 	{
-		BOOST_STATIC_ASSERT_MSG((boost::is_base_of<CamelotEngine::IReflectable, T>::value), 
-			"Invalid data type for type checking. It needs to derive from CamelotEngine::IReflectable.");
+		BOOST_STATIC_ASSERT_MSG((boost::is_base_of<CamelotFramework::IReflectable, T>::value), 
+			"Invalid data type for type checking. It needs to derive from CamelotFramework::IReflectable.");
 
 		return object->getTypeId() == T::getRTTIStatic()->getRTTIId();
 	}
@@ -304,8 +304,8 @@ namespace CamelotEngine
 	template<class T>
 	bool rtti_is_of_type(std::shared_ptr<IReflectable> object)
 	{
-		BOOST_STATIC_ASSERT_MSG((boost::is_base_of<CamelotEngine::IReflectable, T>::value), 
-			"Invalid data type for type checking. It needs to derive from CamelotEngine::IReflectable.");
+		BOOST_STATIC_ASSERT_MSG((boost::is_base_of<CamelotFramework::IReflectable, T>::value), 
+			"Invalid data type for type checking. It needs to derive from CamelotFramework::IReflectable.");
 
 		return object->getTypeId() == T::getRTTIStatic()->getRTTIId();
 	}
@@ -317,7 +317,7 @@ namespace CamelotEngine
 
 #include "CmResourceHandle.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	// Resource handles
 	typedef ResourceHandle<Resource> HResource;

CamelotCore/Include/CmRasterizerState.h

@@ -4,7 +4,7 @@
 #include "CmCommonEnums.h"
 #include "CmResource.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	struct CM_EXPORT RASTERIZER_STATE_DESC
 	{

CamelotCore/Include/CmRasterizerStateRTTI.h

@@ -5,7 +5,7 @@
 #include "CmRasterizerState.h"
 #include "CmRenderStateManager.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	CM_ALLOW_MEMCPY_SERIALIZATION(RASTERIZER_STATE_DESC);
 

CamelotCore/Include/CmRenderOperation.h

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "CmVertexData.h"
 #include "CmIndexData.h"
 
-namespace CamelotEngine 
+namespace CamelotFramework 
 {
 	/// The rendering operation type to perform
 	enum DrawOperationType {

CamelotCore/Include/CmRenderStateManager.h

@@ -3,7 +3,7 @@
 #include "CmPrerequisites.h"
 #include "CmModule.h"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class CM_EXPORT RenderStateManager : public Module<RenderStateManager>
 	{

CamelotCore/Include/CmRenderSystem.h

@@ -49,7 +49,7 @@ THE SOFTWARE.
 #include "boost/function.hpp"
 #include "boost/signal.hpp"
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	/** \addtogroup Core
 	*  @{

CamelotCore/Include/CmRenderSystemCapabilities.h

@@ -46,7 +46,7 @@ THE SOFTWARE.
 #define CAPS_CATEGORY_MASK (((1 << CAPS_CATEGORY_SIZE) - 1) << CM_CAPS_BITSHIFT)
 #define CM_CAPS_VALUE(cat, val) ((cat << CM_CAPS_BITSHIFT) | (1 << val))
 
-namespace CamelotEngine 
+namespace CamelotFramework 
 {
 	/** \addtogroup Core
 	*  @{
@@ -198,7 +198,7 @@ namespace CamelotEngine
 
 		void fromString(const String& versionString)
 		{
-			std::vector<CamelotEngine::String> tokens = StringUtil::split(versionString, ".");
+			std::vector<CamelotFramework::String> tokens = StringUtil::split(versionString, ".");
 			if(!tokens.empty())
 			{
 				major = parseInt(tokens[0]);
@@ -251,7 +251,7 @@ namespace CamelotEngine
 		/// GPU Vendor
 		GPUVendor mVendor;
 
-		static std::vector<CamelotEngine::String> msGPUVendorStrings;
+		static std::vector<CamelotFramework::String> msGPUVendorStrings;
 		static void initVendorStrings();
 
 		/// The number of world matrices available

CamelotCore/Include/CmRenderSystemFactory.h

@@ -3,12 +3,12 @@
 #include <string>
 #include <memory>
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	class RenderSystem;
 }
 
-namespace CamelotEngine
+namespace CamelotFramework
 {
 	typedef std::shared_ptr<RenderSystem> RenderSystemPtr;