From 216af56b049f1a770537a59d085e9e68c21012e1 Mon Sep 17 00:00:00 2001 From: nadro Date: Sun, 17 Jan 2016 13:38:01 +0000 Subject: [PATCH] - Merged rev 5247 from trunk. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5248 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/COGLES2Common.h | 20 ++++++------ source/Irrlicht/COGLES2Driver.cpp | 6 ++-- source/Irrlicht/COGLES2ExtensionHandler.cpp | 2 +- source/Irrlicht/COGLES2ExtensionHandler.h | 6 ++-- source/Irrlicht/COGLES2MaterialRenderer.cpp | 4 +-- source/Irrlicht/COGLES2Renderer2D.cpp | 6 ++-- source/Irrlicht/COGLESCommon.h | 20 ++++++------ source/Irrlicht/COGLESDriver.cpp | 6 ++-- source/Irrlicht/COGLESExtensionHandler.cpp | 2 +- source/Irrlicht/COGLESExtensionHandler.h | 6 ++-- source/Irrlicht/COpenGLCacheHandler.cpp | 2 +- source/Irrlicht/COpenGLCacheHandler.h | 8 ++--- source/Irrlicht/COpenGLCommon.h | 18 +++++------ ...cheHandler.h => COpenGLCoreCacheHandler.h} | 32 +++++++++---------- ...COGLCoreFeature.h => COpenGLCoreFeature.h} | 6 ++-- ...nderTarget.h => COpenGLCoreRenderTarget.h} | 22 ++++++------- ...COGLCoreTexture.h => COpenGLCoreTexture.h} | 22 ++++++------- source/Irrlicht/COpenGLDriver.cpp | 4 +-- source/Irrlicht/COpenGLExtensionHandler.cpp | 2 +- source/Irrlicht/COpenGLExtensionHandler.h | 6 ++-- source/Irrlicht/COpenGLSLMaterialRenderer.cpp | 2 +- .../Irrlicht.xcodeproj/project.pbxproj | 16 +++++----- source/Irrlicht/Irrlicht10.0.vcxproj | 8 ++--- source/Irrlicht/Irrlicht10.0.vcxproj.filters | 8 ++--- source/Irrlicht/Irrlicht11.0.vcxproj | 8 ++--- source/Irrlicht/Irrlicht11.0.vcxproj.filters | 8 ++--- source/Irrlicht/Irrlicht12.0.vcxproj | 8 ++--- source/Irrlicht/Irrlicht12.0.vcxproj.filters | 8 ++--- source/Irrlicht/Irrlicht14.0.vcxproj | 8 ++--- source/Irrlicht/Irrlicht14.0.vcxproj.filters | 8 ++--- 30 files changed, 141 insertions(+), 141 deletions(-) rename source/Irrlicht/{COGLCoreCacheHandler.h => COpenGLCoreCacheHandler.h} (89%) rename source/Irrlicht/{COGLCoreFeature.h => COpenGLCoreFeature.h} (74%) rename source/Irrlicht/{COGLCoreRenderTarget.h => COpenGLCoreRenderTarget.h} (86%) rename source/Irrlicht/{COGLCoreTexture.h => COpenGLCoreTexture.h} (89%) diff --git a/source/Irrlicht/COGLES2Common.h b/source/Irrlicht/COGLES2Common.h index ad14f0e0..35ba5107 100644 --- a/source/Irrlicht/COGLES2Common.h +++ b/source/Irrlicht/COGLES2Common.h @@ -46,21 +46,21 @@ namespace video // Forward declarations. - class COGLCoreFeature; + class COpenGLCoreFeature; - template - class COGLCoreTexture; + template + class COpenGLCoreTexture; - template - class COGLCoreRenderTarget; + template + class COpenGLCoreRenderTarget; - template - class COGLCoreCacheHandler; + template + class COpenGLCoreCacheHandler; class COGLES2Driver; - typedef COGLCoreTexture COGLES2Texture; - typedef COGLCoreRenderTarget COGLES2RenderTarget; - typedef COGLCoreCacheHandler COGLES2CacheHandler; + typedef COpenGLCoreTexture COGLES2Texture; + typedef COpenGLCoreRenderTarget COGLES2RenderTarget; + typedef COpenGLCoreCacheHandler COGLES2CacheHandler; } } diff --git a/source/Irrlicht/COGLES2Driver.cpp b/source/Irrlicht/COGLES2Driver.cpp index 88c21a62..4d9bba6e 100644 --- a/source/Irrlicht/COGLES2Driver.cpp +++ b/source/Irrlicht/COGLES2Driver.cpp @@ -9,9 +9,9 @@ #ifdef _IRR_COMPILE_WITH_OGLES2_ -#include "COGLCoreTexture.h" -#include "COGLCoreRenderTarget.h" -#include "COGLCoreCacheHandler.h" +#include "COpenGLCoreTexture.h" +#include "COpenGLCoreRenderTarget.h" +#include "COpenGLCoreCacheHandler.h" #include "COGLES2MaterialRenderer.h" #include "COGLES2FixedPipelineRenderer.h" diff --git a/source/Irrlicht/COGLES2ExtensionHandler.cpp b/source/Irrlicht/COGLES2ExtensionHandler.cpp index 1e2c983b..0b8f9b02 100644 --- a/source/Irrlicht/COGLES2ExtensionHandler.cpp +++ b/source/Irrlicht/COGLES2ExtensionHandler.cpp @@ -266,7 +266,7 @@ namespace video Feature.ColorAttachment = 1; } - const COGLCoreFeature& COGLES2ExtensionHandler::getFeature() const + const COpenGLCoreFeature& COGLES2ExtensionHandler::getFeature() const { return Feature; } diff --git a/source/Irrlicht/COGLES2ExtensionHandler.h b/source/Irrlicht/COGLES2ExtensionHandler.h index 902e6f4e..c68a6591 100644 --- a/source/Irrlicht/COGLES2ExtensionHandler.h +++ b/source/Irrlicht/COGLES2ExtensionHandler.h @@ -16,7 +16,7 @@ #include "COGLES2Common.h" -#include "COGLCoreFeature.h" +#include "COpenGLCoreFeature.h" namespace irr { @@ -174,7 +174,7 @@ namespace video void initExtensions(); - const COGLCoreFeature& getFeature() const; + const COpenGLCoreFeature& getFeature() const; bool queryFeature(video::E_VIDEO_DRIVER_FEATURE feature) const { @@ -338,7 +338,7 @@ namespace video } protected: - COGLCoreFeature Feature; + COpenGLCoreFeature Feature; u16 Version; u8 MaxAnisotropy; diff --git a/source/Irrlicht/COGLES2MaterialRenderer.cpp b/source/Irrlicht/COGLES2MaterialRenderer.cpp index c0a0ac2a..e7cdfb57 100644 --- a/source/Irrlicht/COGLES2MaterialRenderer.cpp +++ b/source/Irrlicht/COGLES2MaterialRenderer.cpp @@ -14,8 +14,8 @@ #include "COGLES2Driver.h" -#include "COGLCoreTexture.h" -#include "COGLCoreCacheHandler.h" +#include "COpenGLCoreTexture.h" +#include "COpenGLCoreCacheHandler.h" namespace irr { diff --git a/source/Irrlicht/COGLES2Renderer2D.cpp b/source/Irrlicht/COGLES2Renderer2D.cpp index e5a98c55..965611c1 100644 --- a/source/Irrlicht/COGLES2Renderer2D.cpp +++ b/source/Irrlicht/COGLES2Renderer2D.cpp @@ -11,9 +11,9 @@ #include "COGLES2Driver.h" -#include "COGLCoreFeature.h" -#include "COGLCoreTexture.h" -#include "COGLCoreCacheHandler.h" +#include "COpenGLCoreFeature.h" +#include "COpenGLCoreTexture.h" +#include "COpenGLCoreCacheHandler.h" namespace irr { diff --git a/source/Irrlicht/COGLESCommon.h b/source/Irrlicht/COGLESCommon.h index 68dd40e5..2fd79378 100644 --- a/source/Irrlicht/COGLESCommon.h +++ b/source/Irrlicht/COGLESCommon.h @@ -104,21 +104,21 @@ namespace video // Forward declarations. - class COGLCoreFeature; + class COpenGLCoreFeature; - template - class COGLCoreTexture; + template + class COpenGLCoreTexture; - template - class COGLCoreRenderTarget; + template + class COpenGLCoreRenderTarget; - template - class COGLCoreCacheHandler; + template + class COpenGLCoreCacheHandler; class COGLES1Driver; - typedef COGLCoreTexture COGLES1Texture; - typedef COGLCoreRenderTarget COGLES1RenderTarget; - typedef COGLCoreCacheHandler COGLES1CacheHandler; + typedef COpenGLCoreTexture COGLES1Texture; + typedef COpenGLCoreRenderTarget COGLES1RenderTarget; + typedef COpenGLCoreCacheHandler COGLES1CacheHandler; } } diff --git a/source/Irrlicht/COGLESDriver.cpp b/source/Irrlicht/COGLESDriver.cpp index dd7b3044..99cba66a 100644 --- a/source/Irrlicht/COGLESDriver.cpp +++ b/source/Irrlicht/COGLESDriver.cpp @@ -8,9 +8,9 @@ #ifdef _IRR_COMPILE_WITH_OGLES1_ -#include "COGLCoreTexture.h" -#include "COGLCoreRenderTarget.h" -#include "COGLCoreCacheHandler.h" +#include "COpenGLCoreTexture.h" +#include "COpenGLCoreRenderTarget.h" +#include "COpenGLCoreCacheHandler.h" #include "COGLESMaterialRenderer.h" diff --git a/source/Irrlicht/COGLESExtensionHandler.cpp b/source/Irrlicht/COGLESExtensionHandler.cpp index 45bf0d4b..2362062d 100644 --- a/source/Irrlicht/COGLESExtensionHandler.cpp +++ b/source/Irrlicht/COGLESExtensionHandler.cpp @@ -270,7 +270,7 @@ namespace irr #endif } - const COGLCoreFeature& COGLES1ExtensionHandler::getFeature() const + const COpenGLCoreFeature& COGLES1ExtensionHandler::getFeature() const { return Feature; } diff --git a/source/Irrlicht/COGLESExtensionHandler.h b/source/Irrlicht/COGLESExtensionHandler.h index d6e06292..ae4c42d4 100644 --- a/source/Irrlicht/COGLESExtensionHandler.h +++ b/source/Irrlicht/COGLESExtensionHandler.h @@ -16,7 +16,7 @@ #include "COGLESCommon.h" -#include "COGLCoreFeature.h" +#include "COpenGLCoreFeature.h" namespace irr { @@ -140,7 +140,7 @@ namespace video void initExtensions(); - const COGLCoreFeature& getFeature() const; + const COpenGLCoreFeature& getFeature() const; bool queryFeature(video::E_VIDEO_DRIVER_FEATURE feature) const { @@ -334,7 +334,7 @@ namespace video } protected: - COGLCoreFeature Feature; + COpenGLCoreFeature Feature; u16 Version; u8 MaxUserClipPlanes; diff --git a/source/Irrlicht/COpenGLCacheHandler.cpp b/source/Irrlicht/COpenGLCacheHandler.cpp index 5d257934..ed4831f2 100644 --- a/source/Irrlicht/COpenGLCacheHandler.cpp +++ b/source/Irrlicht/COpenGLCacheHandler.cpp @@ -16,7 +16,7 @@ namespace video /* COpenGLCacheHandler */ COpenGLCacheHandler::COpenGLCacheHandler(COpenGLDriver* driver) : - COGLCoreCacheHandler(driver), AlphaMode(GL_ALWAYS), AlphaRef(0.f), AlphaTest(false), + COpenGLCoreCacheHandler(driver), AlphaMode(GL_ALWAYS), AlphaRef(0.f), AlphaTest(false), MatrixMode(GL_MODELVIEW), ClientActiveTexture(GL_TEXTURE0), ClientStateVertex(false), ClientStateNormal(false), ClientStateColor(false), ClientStateTexCoord0(false) { diff --git a/source/Irrlicht/COpenGLCacheHandler.h b/source/Irrlicht/COpenGLCacheHandler.h index 703470f3..f7d14c03 100644 --- a/source/Irrlicht/COpenGLCacheHandler.h +++ b/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 + class COpenGLCacheHandler : public COpenGLCoreCacheHandler { public: COpenGLCacheHandler(COpenGLDriver* driver); diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h index f50bc43b..e08601f0 100644 --- a/source/Irrlicht/COpenGLCommon.h +++ b/source/Irrlicht/COpenGLCommon.h @@ -180,20 +180,20 @@ namespace video // Forward declarations. - class COGLCoreFeature; + class COpenGLCoreFeature; - template - class COGLCoreTexture; + template + class COpenGLCoreTexture; - template - class COGLCoreRenderTarget; + template + class COpenGLCoreRenderTarget; - template - class COGLCoreCacheHandler; + template + class COpenGLCoreCacheHandler; class COpenGLDriver; - typedef COGLCoreTexture COpenGLTexture; - typedef COGLCoreRenderTarget COpenGLRenderTarget; + typedef COpenGLCoreTexture COpenGLTexture; + typedef COpenGLCoreRenderTarget COpenGLRenderTarget; class COpenGLCacheHandler; } diff --git a/source/Irrlicht/COGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h similarity index 89% rename from source/Irrlicht/COGLCoreCacheHandler.h rename to source/Irrlicht/COpenGLCoreCacheHandler.h index 8c26f65e..e0e2d13c 100644 --- a/source/Irrlicht/COGLCoreCacheHandler.h +++ b/source/Irrlicht/COpenGLCoreCacheHandler.h @@ -17,13 +17,13 @@ namespace irr namespace video { -template -class COGLCoreCacheHandler +template +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(index) < MATERIAL_MAX_TEXTURES) return Texture[static_cast(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(texture); + const TOpenGLTexture* curTexture = static_cast(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(texture)->getOpenGLTextureName()); + glBindTexture(curTextureType, static_cast(texture)->getOpenGLTextureName()); } else { @@ -114,7 +114,7 @@ class COGLCoreCacheHandler #endif } - Texture[index] = static_cast(texture); + Texture[index] = static_cast(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(1), static_cast(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; diff --git a/source/Irrlicht/COGLCoreFeature.h b/source/Irrlicht/COpenGLCoreFeature.h similarity index 74% rename from source/Irrlicht/COGLCoreFeature.h rename to source/Irrlicht/COpenGLCoreFeature.h index 48415b30..400d8e8d 100644 --- a/source/Irrlicht/COGLCoreFeature.h +++ b/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() { } diff --git a/source/Irrlicht/COGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h similarity index 86% rename from source/Irrlicht/COGLCoreRenderTarget.h rename to source/Irrlicht/COpenGLCoreRenderTarget.h index 7149adf1..10ef958f 100644 --- a/source/Irrlicht/COGLCoreRenderTarget.h +++ b/source/Irrlicht/COpenGLCoreRenderTarget.h @@ -16,15 +16,15 @@ namespace irr namespace video { -template -class COGLCoreRenderTarget : public IRenderTarget +template +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(texture[i]) : 0; + TOpenGLTexture* currentTexture = (texture[i] && texture[i]->getDriverType() == DriverType) ? static_cast(texture[i]) : 0; GLuint textureID = 0; @@ -118,7 +118,7 @@ public: if (depthStencilUpdate) { - TOGLTexture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast(depthStencil) : 0; + TOpenGLTexture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast(depthStencil) : 0; GLuint textureID = 0; @@ -178,7 +178,7 @@ public: for (u32 i = 0; i < textureSize; ++i) { - GLuint textureID = (Texture[i]) ? static_cast(Texture[i])->getOpenGLTextureName() : 0; + GLuint textureID = (Texture[i]) ? static_cast(Texture[i])->getOpenGLTextureName() : 0; if (textureID != 0) { @@ -216,7 +216,7 @@ public: if (IImage::isDepthFormat(textureFormat)) { - GLuint textureID = static_cast(DepthStencil)->getOpenGLTextureName(); + GLuint textureID = static_cast(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; }; } diff --git a/source/Irrlicht/COGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h similarity index 89% rename from source/Irrlicht/COGLCoreTexture.h rename to source/Irrlicht/COpenGLCoreTexture.h index a334ea4f..35b4ec35 100644 --- a/source/Irrlicht/COGLCoreTexture.h +++ b/source/Irrlicht/COpenGLCoreTexture.h @@ -22,8 +22,8 @@ namespace irr namespace video { -template -class COGLCoreTexture : public ITexture +template +class COpenGLCoreTexture : public ITexture { public: struct SStatesCache @@ -45,7 +45,7 @@ public: bool IsCached; }; - COGLCoreTexture(const io::path& name, const core::array& image, E_TEXTURE_TYPE type, TOGLDriver* driver) : ITexture(name, type), Driver(driver), TextureType(GL_TEXTURE_2D), + COpenGLCoreTexture(const io::path& name, const core::array& 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& size, ECOLOR_FORMAT format, TOGLDriver* driver) : ITexture(name, ETT_2D), Driver(driver), TextureType(GL_TEXTURE_2D), + COpenGLCoreTexture(const io::path& name, const core::dimension2d& 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); @@ -178,7 +178,7 @@ public: Driver->getCacheHandler()->getTextureCache().set(0, prevTexture); } - virtual ~COGLCoreTexture() + virtual ~COpenGLCoreTexture() { Driver->getCacheHandler()->getTextureCache().remove(this); @@ -217,7 +217,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); @@ -291,7 +291,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()); @@ -314,7 +314,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) @@ -522,7 +522,7 @@ protected: } } - TOGLDriver* Driver; + TOpenGLDriver* Driver; GLenum TextureType; GLuint TextureName; diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp index c38694bc..9b16857b 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/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 diff --git a/source/Irrlicht/COpenGLExtensionHandler.cpp b/source/Irrlicht/COpenGLExtensionHandler.cpp index 82a96be0..66ad1142 100644 --- a/source/Irrlicht/COpenGLExtensionHandler.cpp +++ b/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; } diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h index 791695a0..379fbc34 100644 --- a/source/Irrlicht/COpenGLExtensionHandler.h +++ b/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; diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.cpp b/source/Irrlicht/COpenGLSLMaterialRenderer.cpp index c31fe730..6bb23ebe 100644 --- a/source/Irrlicht/COpenGLSLMaterialRenderer.cpp +++ b/source/Irrlicht/COpenGLSLMaterialRenderer.cpp @@ -24,7 +24,7 @@ #include "COpenGLCacheHandler.h" #include "COpenGLMaterialRenderer.h" -#include "COGLCoreFeature.h" +#include "COpenGLCoreFeature.h" namespace irr { diff --git a/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj b/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj index b74d8d10..a5cba058 100644 --- a/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj +++ b/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj @@ -1351,10 +1351,10 @@ 5E5734051C18E2E2003F664E /* COGLES2Renderer2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COGLES2Renderer2D.cpp; sourceTree = ""; }; 5E5734061C18E2E2003F664E /* COGLES2Renderer2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COGLES2Renderer2D.h; sourceTree = ""; }; 5E79088A1C10EC6C00DFE7FE /* IRenderTarget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IRenderTarget.h; path = ../../include/IRenderTarget.h; sourceTree = ""; }; - 5E79088D1C10EE6700DFE7FE /* COGLCoreCacheHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreCacheHandler.h; sourceTree = ""; }; - 5E79088E1C10EE6700DFE7FE /* COGLCoreFeature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreFeature.h; sourceTree = ""; }; - 5E79088F1C10EE6700DFE7FE /* COGLCoreRenderTarget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreRenderTarget.h; sourceTree = ""; }; - 5E7908901C10EE6700DFE7FE /* COGLCoreTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COGLCoreTexture.h; sourceTree = ""; }; + 5E79088D1C10EE6700DFE7FE /* COpenGLCoreCacheHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreCacheHandler.h; sourceTree = ""; }; + 5E79088E1C10EE6700DFE7FE /* COpenGLCoreFeature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreFeature.h; sourceTree = ""; }; + 5E79088F1C10EE6700DFE7FE /* COpenGLCoreRenderTarget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreRenderTarget.h; sourceTree = ""; }; + 5E7908901C10EE6700DFE7FE /* COpenGLCoreTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = COpenGLCoreTexture.h; sourceTree = ""; }; 5E7908911C10EEC000DFE7FE /* COpenGLCacheHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = COpenGLCacheHandler.cpp; sourceTree = ""; }; 5E7908921C10EEC000DFE7FE /* COpenGLCacheHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COpenGLCacheHandler.h; sourceTree = ""; }; 5E7908931C10EEC000DFE7FE /* COpenGLCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COpenGLCommon.h; sourceTree = ""; }; @@ -2419,10 +2419,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 = ""; diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj index 49c32c18..1db86597 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj +++ b/source/Irrlicht/Irrlicht10.0.vcxproj @@ -1011,10 +1011,10 @@ - - - - + + + + diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters index e8452d86..0eede239 100644 --- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters @@ -1327,16 +1327,16 @@ Irrlicht\video\OpenGL - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core diff --git a/source/Irrlicht/Irrlicht11.0.vcxproj b/source/Irrlicht/Irrlicht11.0.vcxproj index b4a3d52f..5775e782 100644 --- a/source/Irrlicht/Irrlicht11.0.vcxproj +++ b/source/Irrlicht/Irrlicht11.0.vcxproj @@ -1011,10 +1011,10 @@ - - - - + + + + diff --git a/source/Irrlicht/Irrlicht11.0.vcxproj.filters b/source/Irrlicht/Irrlicht11.0.vcxproj.filters index 28e0b75f..2604ac35 100644 --- a/source/Irrlicht/Irrlicht11.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht11.0.vcxproj.filters @@ -1327,16 +1327,16 @@ Irrlicht\video\OpenGL - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core diff --git a/source/Irrlicht/Irrlicht12.0.vcxproj b/source/Irrlicht/Irrlicht12.0.vcxproj index 259af46f..0aab07f7 100644 --- a/source/Irrlicht/Irrlicht12.0.vcxproj +++ b/source/Irrlicht/Irrlicht12.0.vcxproj @@ -1011,10 +1011,10 @@ - - - - + + + + diff --git a/source/Irrlicht/Irrlicht12.0.vcxproj.filters b/source/Irrlicht/Irrlicht12.0.vcxproj.filters index e4e590c2..2a3ce2ae 100644 --- a/source/Irrlicht/Irrlicht12.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht12.0.vcxproj.filters @@ -1327,16 +1327,16 @@ Irrlicht\video\OpenGL - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core diff --git a/source/Irrlicht/Irrlicht14.0.vcxproj b/source/Irrlicht/Irrlicht14.0.vcxproj index eba46c93..3cf8129c 100644 --- a/source/Irrlicht/Irrlicht14.0.vcxproj +++ b/source/Irrlicht/Irrlicht14.0.vcxproj @@ -1021,10 +1021,10 @@ - - - - + + + + diff --git a/source/Irrlicht/Irrlicht14.0.vcxproj.filters b/source/Irrlicht/Irrlicht14.0.vcxproj.filters index 3594b6f6..b0b40aeb 100644 --- a/source/Irrlicht/Irrlicht14.0.vcxproj.filters +++ b/source/Irrlicht/Irrlicht14.0.vcxproj.filters @@ -1327,16 +1327,16 @@ Irrlicht\video\OpenGL - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core - + Irrlicht\video\OpenGL Core