- Changed COGLCore files/classes prefix to COpenGLCore.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5247 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/COpenGLCacheHandler.cpp

@@ -16,7 +16,7 @@ namespace video
 /* COpenGLCacheHandler */
 
 COpenGLCacheHandler::COpenGLCacheHandler(COpenGLDriver* driver) :
-	COGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>(driver), AlphaMode(GL_ALWAYS), AlphaRef(0.f), AlphaTest(false),
+	COpenGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>(driver), AlphaMode(GL_ALWAYS), AlphaRef(0.f), AlphaTest(false),
 	MatrixMode(GL_MODELVIEW), ClientActiveTexture(GL_TEXTURE0), ClientStateVertex(false),
 	ClientStateNormal(false), ClientStateColor(false), ClientStateTexCoord0(false)
 {

source/Irrlicht/COpenGLCacheHandler.h

@@ -11,16 +11,16 @@
 
 #include "COpenGLCommon.h"
 
-#include "COGLCoreFeature.h"
-#include "COGLCoreTexture.h"
-#include "COGLCoreCacheHandler.h"
+#include "COpenGLCoreFeature.h"
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreCacheHandler.h"
 
 namespace irr
 {
 namespace video
 {
 
-	class COpenGLCacheHandler : public COGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>
+	class COpenGLCacheHandler : public COpenGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>
 	{
 	public:
 		COpenGLCacheHandler(COpenGLDriver* driver);

source/Irrlicht/COpenGLCommon.h

@@ -180,20 +180,20 @@ namespace video
 
 	// Forward declarations.
 
-	class COGLCoreFeature;
+	class COpenGLCoreFeature;
 
-	template <class TOGLDriver>
-	class COGLCoreTexture;
+	template <class TOpenGLDriver>
+	class COpenGLCoreTexture;
 
-	template <class TOGLDriver, class TOGLTexture>
-	class COGLCoreRenderTarget;
+	template <class TOpenGLDriver, class TOpenGLTexture>
+	class COpenGLCoreRenderTarget;
 
-	template <class TOGLDriver, class TOGLTexture>
-	class COGLCoreCacheHandler;
+	template <class TOpenGLDriver, class TOpenGLTexture>
+	class COpenGLCoreCacheHandler;
 
 	class COpenGLDriver;
-	typedef COGLCoreTexture<COpenGLDriver> COpenGLTexture;
-	typedef COGLCoreRenderTarget<COpenGLDriver, COpenGLTexture> COpenGLRenderTarget;
+	typedef COpenGLCoreTexture<COpenGLDriver> COpenGLTexture;
+	typedef COpenGLCoreRenderTarget<COpenGLDriver, COpenGLTexture> COpenGLRenderTarget;
 	class COpenGLCacheHandler;
 
 }

source/Irrlicht/COGLCoreCacheHandler.h → source/Irrlicht/COpenGLCoreCacheHandler.h

@@ -17,13 +17,13 @@ namespace irr
 namespace video
 {
 
-template <class TOGLDriver, class TOGLTexture>
-class COGLCoreCacheHandler
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreCacheHandler
 {
 	class STextureCache
 	{
 	public:
-		STextureCache(COGLCoreCacheHandler* cacheHandler, u32 textureCount) :
+		STextureCache(COpenGLCoreCacheHandler* cacheHandler, u32 textureCount) :
 			CacheHandler(cacheHandler), DriverType(cacheHandler->getDriverType()), TextureCount(textureCount)
 		{
 			for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i)
@@ -37,7 +37,7 @@ class COGLCoreCacheHandler
 			clear();
 		}
 
-		const TOGLTexture* operator[](int index) const
+		const TOpenGLTexture* operator[](int index) const
 		{
 			if (static_cast<u32>(index) < MATERIAL_MAX_TEXTURES)
 				return Texture[static_cast<u32>(index)];
@@ -45,7 +45,7 @@ class COGLCoreCacheHandler
 			return 0;
 		}
 
-		const TOGLTexture* get(u32 index) const
+		const TOpenGLTexture* get(u32 index) const
 		{
 			if (index < MATERIAL_MAX_TEXTURES)
 				return Texture[index];
@@ -63,7 +63,7 @@ class COGLCoreCacheHandler
 			{
 				CacheHandler->setActiveTexture(GL_TEXTURE0 + index);
 
-				const TOGLTexture* prevTexture = Texture[index];
+				const TOpenGLTexture* prevTexture = Texture[index];
 
 				if (texture != prevTexture)
 				{
@@ -75,7 +75,7 @@ class COGLCoreCacheHandler
 						{
 							texture->grab();
 
-							const TOGLTexture* curTexture = static_cast<const TOGLTexture*>(texture);
+							const TOpenGLTexture* curTexture = static_cast<const TOpenGLTexture*>(texture);
 							const GLenum curTextureType = curTexture->getOpenGLTextureType();
 							const GLenum prevTextureType = (prevTexture) ? prevTexture->getOpenGLTextureType() : curTextureType;
 
@@ -93,7 +93,7 @@ class COGLCoreCacheHandler
 								glEnable(curTextureType);
 #endif
 
-							glBindTexture(curTextureType, static_cast<const TOGLTexture*>(texture)->getOpenGLTextureName());
+							glBindTexture(curTextureType, static_cast<const TOpenGLTexture*>(texture)->getOpenGLTextureName());
 						}
 						else
 						{
@@ -114,7 +114,7 @@ class COGLCoreCacheHandler
 #endif
 					}
 
-					Texture[index] = static_cast<const TOGLTexture*>(texture);
+					Texture[index] = static_cast<const TOpenGLTexture*>(texture);
 
 					if (prevTexture)
 						prevTexture->drop();
@@ -148,7 +148,7 @@ class COGLCoreCacheHandler
 			{
 				if (Texture[i])
 				{
-					const TOGLTexture* prevTexture = Texture[i];
+					const TOpenGLTexture* prevTexture = Texture[i];
 
 					Texture[i] = 0;
 
@@ -158,22 +158,22 @@ class COGLCoreCacheHandler
 		}
 
 	private:
-		COGLCoreCacheHandler* CacheHandler;
+		COpenGLCoreCacheHandler* CacheHandler;
 
 		E_DRIVER_TYPE DriverType;
 
-		const TOGLTexture* Texture[MATERIAL_MAX_TEXTURES];
+		const TOpenGLTexture* Texture[MATERIAL_MAX_TEXTURES];
 		u32 TextureCount;
 	};
 
 public:
-	COGLCoreCacheHandler(TOGLDriver* driver) :
+	COpenGLCoreCacheHandler(TOpenGLDriver* driver) :
 		Driver(driver), TextureCache(STextureCache(this, Driver->getFeature().TextureUnit)), FrameBufferCount(0),
 		BlendEquation(0), BlendSourceRGB(0), BlendDestinationRGB(0), BlendSourceAlpha(0), BlendDestinationAlpha(0),
 		Blend(0), ColorMask(0), CullFaceMode(GL_BACK), CullFace(false), DepthFunc(GL_LESS), DepthMask(true),
 		DepthTest(false), FrameBufferID(0), ProgramID(0), ActiveTexture(GL_TEXTURE0), ViewportX(0), ViewportY(0)
 	{
-		const COGLCoreFeature& feature = Driver->getFeature();
+		const COpenGLCoreFeature& feature = Driver->getFeature();
 
 		FrameBufferCount = core::max_(static_cast<GLuint>(1), static_cast<GLuint>(feature.MultipleRenderTarget));
 
@@ -232,7 +232,7 @@ public:
 		glViewport(ViewportX, ViewportY, ViewportWidth, ViewportHeight);
 	}
 
-	virtual ~COGLCoreCacheHandler()
+	virtual ~COpenGLCoreCacheHandler()
 	{
 		delete[] BlendEquation;
 		delete[] BlendSourceRGB;
@@ -540,7 +540,7 @@ public:
 	}
 
 protected:
-	TOGLDriver* Driver;
+	TOpenGLDriver* Driver;
 
 	STextureCache TextureCache;
 

source/Irrlicht/COGLCoreFeature.h → source/Irrlicht/COpenGLCoreFeature.h

@@ -16,14 +16,14 @@ namespace irr
 namespace video
 {
 
-class COGLCoreFeature
+class COpenGLCoreFeature
 {
 public:
-	COGLCoreFeature() : BlendOperation(false), ColorAttachment(0), MultipleRenderTarget(0), TextureUnit(1)
+	COpenGLCoreFeature() : BlendOperation(false), ColorAttachment(0), MultipleRenderTarget(0), TextureUnit(1)
 	{
 	}
 
-	virtual ~COGLCoreFeature()
+	virtual ~COpenGLCoreFeature()
 	{
 	}
 

source/Irrlicht/COGLCoreRenderTarget.h → source/Irrlicht/COpenGLCoreRenderTarget.h

@@ -16,15 +16,15 @@ namespace irr
 namespace video
 {
 
-template <class TOGLDriver, class TOGLTexture>
-class COGLCoreRenderTarget : public IRenderTarget
+template <class TOpenGLDriver, class TOpenGLTexture>
+class COpenGLCoreRenderTarget : public IRenderTarget
 {
 public:
-	COGLCoreRenderTarget(TOGLDriver* driver) : AssignedDepth(false), AssignedStencil(false), RequestTextureUpdate(false), RequestDepthStencilUpdate(false),
+	COpenGLCoreRenderTarget(TOpenGLDriver* driver) : AssignedDepth(false), AssignedStencil(false), RequestTextureUpdate(false), RequestDepthStencilUpdate(false),
 		BufferID(0), ColorAttachment(0), MultipleRenderTarget(0), Driver(driver)
 	{
 #ifdef _DEBUG
-		setDebugName("COGLCoreRenderTarget");
+		setDebugName("COpenGLCoreRenderTarget");
 #endif
 
 		DriverType = Driver->getDriverType();
@@ -43,7 +43,7 @@ public:
 			AssignedTexture[i] = GL_NONE;
 	}
 
-	virtual ~COGLCoreRenderTarget()
+	virtual ~COpenGLCoreRenderTarget()
 	{
 		if (ColorAttachment > 0 && BufferID != 0)
 			Driver->irrGlDeleteFramebuffers(1, &BufferID);
@@ -88,7 +88,7 @@ public:
 
 				for (u32 i = 0; i < Texture.size(); ++i)
 				{
-					TOGLTexture* currentTexture = (texture[i] && texture[i]->getDriverType() == DriverType) ? static_cast<TOGLTexture*>(texture[i]) : 0;
+					TOpenGLTexture* currentTexture = (texture[i] && texture[i]->getDriverType() == DriverType) ? static_cast<TOpenGLTexture*>(texture[i]) : 0;
 
 					GLuint textureID = 0;
 
@@ -118,7 +118,7 @@ public:
 
 			if (depthStencilUpdate)
 			{
-				TOGLTexture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast<TOGLTexture*>(depthStencil) : 0;
+				TOpenGLTexture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast<TOpenGLTexture*>(depthStencil) : 0;
 
 				GLuint textureID = 0;
 
@@ -178,7 +178,7 @@ public:
 
 				for (u32 i = 0; i < textureSize; ++i)
 				{
-					GLuint textureID = (Texture[i]) ? static_cast<TOGLTexture*>(Texture[i])->getOpenGLTextureName() : 0;
+					GLuint textureID = (Texture[i]) ? static_cast<TOpenGLTexture*>(Texture[i])->getOpenGLTextureName() : 0;
 
 					if (textureID != 0)
 					{
@@ -216,7 +216,7 @@ public:
 
 				if (IImage::isDepthFormat(textureFormat))
 				{
-					GLuint textureID = static_cast<TOGLTexture*>(DepthStencil)->getOpenGLTextureName();
+					GLuint textureID = static_cast<TOpenGLTexture*>(DepthStencil)->getOpenGLTextureName();
 
 					Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, textureID, 0);
 
@@ -297,7 +297,7 @@ public:
 	}
 
 protected:
-	bool checkFBO(TOGLDriver* driver)
+	bool checkFBO(TOpenGLDriver* driver)
 	{
 		if (ColorAttachment == 0)
 			return true;
@@ -351,7 +351,7 @@ protected:
 	u32 ColorAttachment;
 	u32 MultipleRenderTarget;
 
-	TOGLDriver* Driver;
+	TOpenGLDriver* Driver;
 };
 
 }

source/Irrlicht/COGLCoreTexture.h → source/Irrlicht/COpenGLCoreTexture.h

@@ -22,8 +22,8 @@ namespace irr
 namespace video
 {
 
-template <class TOGLDriver>
-class COGLCoreTexture : public ITexture
+template <class TOpenGLDriver>
+class COpenGLCoreTexture : public ITexture
 {
 public:
 	struct SStatesCache
@@ -45,7 +45,7 @@ public:
 		bool IsCached;
 	};
 
-	COGLCoreTexture(const io::path& name, const core::array<IImage*>& image, E_TEXTURE_TYPE type, TOGLDriver* driver) : ITexture(name, type), Driver(driver), TextureType(GL_TEXTURE_2D),
+	COpenGLCoreTexture(const io::path& name, const core::array<IImage*>& image, E_TEXTURE_TYPE type, TOpenGLDriver* driver) : ITexture(name, type), Driver(driver), TextureType(GL_TEXTURE_2D),
 		TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA), PixelType(GL_UNSIGNED_BYTE), Converter(0), LockReadOnly(false), LockImage(0), LockLevel(0),
 		KeepImage(false), AutoGenerateMipMaps(false)
 	{
@@ -85,7 +85,7 @@ public:
 
 		glGenTextures(1, &TextureName);
 
-		const COGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+		const COpenGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
 		Driver->getCacheHandler()->getTextureCache().set(0, this);
 
 		glTexParameteri(TextureType, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -133,7 +133,7 @@ public:
 		}
 	}
 
-	COGLCoreTexture(const io::path& name, const core::dimension2d<u32>& size, ECOLOR_FORMAT format, TOGLDriver* driver) : ITexture(name, ETT_2D), Driver(driver), TextureType(GL_TEXTURE_2D),
+	COpenGLCoreTexture(const io::path& name, const core::dimension2d<u32>& size, ECOLOR_FORMAT format, TOpenGLDriver* driver) : ITexture(name, ETT_2D), Driver(driver), TextureType(GL_TEXTURE_2D),
 		TextureName(0), InternalFormat(GL_RGBA), PixelFormat(GL_RGBA), PixelType(GL_UNSIGNED_BYTE), Converter(0), LockReadOnly(false), LockImage(0), LockLevel(0), KeepImage(false),
 		AutoGenerateMipMaps(false)
 	{
@@ -157,7 +157,7 @@ public:
 
 		glGenTextures(1, &TextureName);
 
-		const COGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+		const COpenGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
 		Driver->getCacheHandler()->getTextureCache().set(0, this);
 
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -175,7 +175,7 @@ public:
 		Driver->getCacheHandler()->getTextureCache().set(0, prevTexture);
 	}
 
-	virtual ~COGLCoreTexture()
+	virtual ~COpenGLCoreTexture()
 	{
 		Driver->getCacheHandler()->getTextureCache().remove(this);
 
@@ -214,7 +214,7 @@ public:
 
 			if (LockImage && mode != ETLM_WRITE_ONLY)
 			{
-				COGLCoreTexture* tmpTexture = new COGLCoreTexture("OGL_CORE_LOCK_TEXTURE", lockImageSize, ColorFormat, Driver);
+				COpenGLCoreTexture* tmpTexture = new COpenGLCoreTexture("OGL_CORE_LOCK_TEXTURE", lockImageSize, ColorFormat, Driver);
 
 				GLuint tmpFBO = 0;
 				Driver->irrGlGenFramebuffers(1, &tmpFBO);
@@ -288,7 +288,7 @@ public:
 
 		if (!LockReadOnly)
 		{
-			const COGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+			const COpenGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
 			Driver->getCacheHandler()->getTextureCache().set(0, this);
 
 			uploadTexture(false, 0, LockLevel, LockImage->getData());
@@ -311,7 +311,7 @@ public:
 		if (!HasMipMaps || (!data && !AutoGenerateMipMaps) || (Size.Width <= 1 && Size.Height <= 1))
 			return;
 
-		const COGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
+		const COpenGLCoreTexture* prevTexture = Driver->getCacheHandler()->getTextureCache().get(0);
 		Driver->getCacheHandler()->getTextureCache().set(0, this);
 
 		if (data)
@@ -519,7 +519,7 @@ protected:
 		}
 	}
 
-	TOGLDriver* Driver;
+	TOpenGLDriver* Driver;
 
 	GLenum TextureType;
 	GLuint TextureName;

source/Irrlicht/COpenGLDriver.cpp

@@ -17,8 +17,8 @@
 #include "COpenGLNormalMapRenderer.h"
 #include "COpenGLParallaxMapRenderer.h"
 
-#include "COGLCoreTexture.h"
-#include "COGLCoreRenderTarget.h"
+#include "COpenGLCoreTexture.h"
+#include "COpenGLCoreRenderTarget.h"
 
 #ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
 #include <SDL/SDL.h>

source/Irrlicht/COpenGLExtensionHandler.cpp

@@ -750,7 +750,7 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
 #endif
 }
 
-const COGLCoreFeature& COpenGLExtensionHandler::getFeature() const
+const COpenGLCoreFeature& COpenGLExtensionHandler::getFeature() const
 {
 	return Feature;
 }

source/Irrlicht/COpenGLExtensionHandler.h

@@ -15,7 +15,7 @@
 
 #include "COpenGLCommon.h"
 
-#include "COGLCoreFeature.h"
+#include "COpenGLCoreFeature.h"
 
 namespace irr
 {
@@ -997,7 +997,7 @@ class COpenGLExtensionHandler
 	// deferred initialization
 	void initExtensions(bool stencilBuffer);
 
-	const COGLCoreFeature& getFeature() const;
+	const COpenGLCoreFeature& getFeature() const;
 
 	//! queries the features of the driver, returns true if feature is available
 	bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const;
@@ -1187,7 +1187,7 @@ class COpenGLExtensionHandler
 	bool FeatureAvailable[IRR_OpenGL_Feature_Count];
 
 	protected:
-		COGLCoreFeature Feature;
+		COpenGLCoreFeature Feature;
 
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 		PFNGLACTIVETEXTUREARBPROC pGlActiveTextureARB;

source/Irrlicht/COpenGLSLMaterialRenderer.cpp

@@ -24,7 +24,7 @@
 #include "COpenGLCacheHandler.h"
 #include "COpenGLMaterialRenderer.h"
 
-#include "COGLCoreFeature.h"
+#include "COpenGLCoreFeature.h"
 
 namespace irr
 {

source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj

@@ -1022,10 +1022,10 @@
 		5E34C9EE1B7F6CCC00F212E8 /* CNSOGLManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CNSOGLManager.mm; sourceTree = "<group>"; };
 		5E34C9F31B7F6E3400F212E8 /* libIrrlicht.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIrrlicht.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		5E79088A1C10EC6C00DFE7FE /* IRenderTarget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IRenderTarget.h; path = ../../include/IRenderTarget.h; sourceTree = "<group>"; };
-		5E79088D1C10EE6700DFE7FE /* COGLCoreCacheHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreCacheHandler.h; sourceTree = "<group>"; };
-		5E79088E1C10EE6700DFE7FE /* COGLCoreFeature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreFeature.h; sourceTree = "<group>"; };
-		5E79088F1C10EE6700DFE7FE /* COGLCoreRenderTarget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreRenderTarget.h; sourceTree = "<group>"; };
-		5E7908901C10EE6700DFE7FE /* COGLCoreTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreTexture.h; sourceTree = "<group>"; };
+		5E79088D1C10EE6700DFE7FE /* COpenGLCoreCacheHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreCacheHandler.h; sourceTree = "<group>"; };
+		5E79088E1C10EE6700DFE7FE /* COpenGLCoreFeature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreFeature.h; sourceTree = "<group>"; };
+		5E79088F1C10EE6700DFE7FE /* COpenGLCoreRenderTarget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreRenderTarget.h; sourceTree = "<group>"; };
+		5E7908901C10EE6700DFE7FE /* COpenGLCoreTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreTexture.h; sourceTree = "<group>"; };
 		5E7908911C10EEC000DFE7FE /* COpenGLCacheHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COpenGLCacheHandler.cpp; sourceTree = "<group>"; };
 		5E7908921C10EEC000DFE7FE /* COpenGLCacheHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COpenGLCacheHandler.h; sourceTree = "<group>"; };
 		5E7908931C10EEC000DFE7FE /* COpenGLCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COpenGLCommon.h; sourceTree = "<group>"; };
@@ -2039,10 +2039,10 @@
 		5E79088B1C10ED5000DFE7FE /* OpenGL Core */ = {
 			isa = PBXGroup;
 			children = (
-				5E79088D1C10EE6700DFE7FE /* COGLCoreCacheHandler.h */,
-				5E79088E1C10EE6700DFE7FE /* COGLCoreFeature.h */,
-				5E79088F1C10EE6700DFE7FE /* COGLCoreRenderTarget.h */,
-				5E7908901C10EE6700DFE7FE /* COGLCoreTexture.h */,
+				5E79088D1C10EE6700DFE7FE /* COpenGLCoreCacheHandler.h */,
+				5E79088E1C10EE6700DFE7FE /* COpenGLCoreFeature.h */,
+				5E79088F1C10EE6700DFE7FE /* COpenGLCoreRenderTarget.h */,
+				5E7908901C10EE6700DFE7FE /* COpenGLCoreTexture.h */,
 			);
 			name = "OpenGL Core";
 			sourceTree = "<group>";

source/Irrlicht/Irrlicht10.0.vcxproj

@@ -1010,10 +1010,10 @@
     <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
-    <ClInclude Include="COGLCoreCacheHandler.h" />
-    <ClInclude Include="COGLCoreFeature.h" />
-    <ClInclude Include="COGLCoreRenderTarget.h" />
-    <ClInclude Include="COGLCoreTexture.h" />
+    <ClInclude Include="COpenGLCoreCacheHandler.h" />
+    <ClInclude Include="COpenGLCoreFeature.h" />
+    <ClInclude Include="COpenGLCoreRenderTarget.h" />
+    <ClInclude Include="COpenGLCoreTexture.h" />
     <ClInclude Include="COpenGLCacheHandler.h" />
     <ClInclude Include="COpenGLCommon.h" />
     <ClInclude Include="COpenGLDriver.h" />

source/Irrlicht/Irrlicht10.0.vcxproj.filters

@@ -1321,16 +1321,16 @@
     <ClInclude Include="COpenGLSLMaterialRenderer.h">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreCacheHandler.h">
+    <ClInclude Include="COpenGLCoreCacheHandler.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreFeature.h">
+    <ClInclude Include="COpenGLCoreFeature.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreRenderTarget.h">
+    <ClInclude Include="COpenGLCoreRenderTarget.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreTexture.h">
+    <ClInclude Include="COpenGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
     <ClInclude Include="CGLXManager.h">

source/Irrlicht/Irrlicht11.0.vcxproj

@@ -1010,10 +1010,10 @@
     <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
-    <ClInclude Include="COGLCoreCacheHandler.h" />
-    <ClInclude Include="COGLCoreFeature.h" />
-    <ClInclude Include="COGLCoreRenderTarget.h" />
-    <ClInclude Include="COGLCoreTexture.h" />
+    <ClInclude Include="COpenGLCoreCacheHandler.h" />
+    <ClInclude Include="COpenGLCoreFeature.h" />
+    <ClInclude Include="COpenGLCoreRenderTarget.h" />
+    <ClInclude Include="COpenGLCoreTexture.h" />
     <ClInclude Include="COpenGLCacheHandler.h" />
     <ClInclude Include="COpenGLCommon.h" />
     <ClInclude Include="COpenGLDriver.h" />

source/Irrlicht/Irrlicht11.0.vcxproj.filters

@@ -1321,16 +1321,16 @@
     <ClInclude Include="COpenGLSLMaterialRenderer.h">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreCacheHandler.h">
+    <ClInclude Include="COpenGLCoreCacheHandler.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreFeature.h">
+    <ClInclude Include="COpenGLCoreFeature.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreRenderTarget.h">
+    <ClInclude Include="COpenGLCoreRenderTarget.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreTexture.h">
+    <ClInclude Include="COpenGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
     <ClInclude Include="CGLXManager.h">

source/Irrlicht/Irrlicht12.0.vcxproj

@@ -1010,10 +1010,10 @@
     <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
-    <ClInclude Include="COGLCoreCacheHandler.h" />
-    <ClInclude Include="COGLCoreFeature.h" />
-    <ClInclude Include="COGLCoreRenderTarget.h" />
-    <ClInclude Include="COGLCoreTexture.h" />
+    <ClInclude Include="COpenGLCoreCacheHandler.h" />
+    <ClInclude Include="COpenGLCoreFeature.h" />
+    <ClInclude Include="COpenGLCoreRenderTarget.h" />
+    <ClInclude Include="COpenGLCoreTexture.h" />
     <ClInclude Include="COpenGLCacheHandler.h" />
     <ClInclude Include="COpenGLCommon.h" />
     <ClInclude Include="COpenGLDriver.h" />

source/Irrlicht/Irrlicht12.0.vcxproj.filters

@@ -1321,16 +1321,16 @@
     <ClInclude Include="COpenGLSLMaterialRenderer.h">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreCacheHandler.h">
+    <ClInclude Include="COpenGLCoreCacheHandler.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreFeature.h">
+    <ClInclude Include="COpenGLCoreFeature.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreRenderTarget.h">
+    <ClInclude Include="COpenGLCoreRenderTarget.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreTexture.h">
+    <ClInclude Include="COpenGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
     <ClInclude Include="CGLXManager.h">

source/Irrlicht/Irrlicht14.0.vcxproj

@@ -1020,10 +1020,10 @@
     <ClInclude Include="CGLXManager.h" />
     <ClInclude Include="CMeshCache.h" />
     <ClInclude Include="CMeshManipulator.h" />
-    <ClInclude Include="COGLCoreCacheHandler.h" />
-    <ClInclude Include="COGLCoreFeature.h" />
-    <ClInclude Include="COGLCoreRenderTarget.h" />
-    <ClInclude Include="COGLCoreTexture.h" />
+    <ClInclude Include="COpenGLCoreCacheHandler.h" />
+    <ClInclude Include="COpenGLCoreFeature.h" />
+    <ClInclude Include="COpenGLCoreRenderTarget.h" />
+    <ClInclude Include="COpenGLCoreTexture.h" />
     <ClInclude Include="COpenGLCacheHandler.h" />
     <ClInclude Include="COpenGLCommon.h" />
     <ClInclude Include="COpenGLDriver.h" />

source/Irrlicht/Irrlicht14.0.vcxproj.filters

@@ -1321,16 +1321,16 @@
     <ClInclude Include="COpenGLSLMaterialRenderer.h">
       <Filter>Irrlicht\video\OpenGL</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreCacheHandler.h">
+    <ClInclude Include="COpenGLCoreCacheHandler.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreFeature.h">
+    <ClInclude Include="COpenGLCoreFeature.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreRenderTarget.h">
+    <ClInclude Include="COpenGLCoreRenderTarget.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
-    <ClInclude Include="COGLCoreTexture.h">
+    <ClInclude Include="COpenGLCoreTexture.h">
       <Filter>Irrlicht\video\OpenGL Core</Filter>
     </ClInclude>
     <ClInclude Include="CGLXManager.h">