Skip to content

D
deprecated-irrlicht-mac
Commit 2f3ca311 authored by nadro's avatar nadro
Browse files
Options

- Renamed COpenGLCallBridge to COpenGLCacheHandler and moved this class to dedicated files. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5156 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 172b399f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 981 additions and 890 deletions
source/Irrlicht/COpenGLCacheHandler.cpp 0 → 100644
View file @ 2f3ca311
This diff is collapsed.
source/Irrlicht/COpenGLCacheHandler.h 0 → 100644
View file @ 2f3ca311
// Copyright (C) 2015 Patryk Nadrowski
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in Irrlicht.h
#ifndef __C_OPEN_GL_CACHE_HANDLER_H_INCLUDED__
#define __C_OPEN_GL_CACHE_HANDLER_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_OPENGL_
#include "COpenGLExtensionHandler.h"
#include "SMaterial.h"
namespace irr
{
namespace video
{
class COpenGLDriver;
class COpenGLTexture;
class COpenGLCacheHandler
{
class STextureCache
{
public:
STextureCache();
STextureCache(COpenGLCacheHandler* cacheHandler, u32 textureCount);
~STextureCache();
const COpenGLTexture* operator[](int index) const;
bool set(u32 index, const ITexture* texture);
void remove(ITexture* texture);
void clear();
private:
COpenGLCacheHandler* CacheHandler;
const COpenGLTexture* Texture[MATERIAL_MAX_TEXTURES];
u32 TextureCount;
};
public:
COpenGLCacheHandler(COpenGLDriver* driver);
~COpenGLCacheHandler();
void reset();
// Alpha calls.
void setAlphaFunc(GLenum mode, GLclampf ref);
void setAlphaTest(bool enable);
// Blending calls.
void setBlendEquation(GLenum mode);
void setBlendEquationIndexed(GLuint index, GLenum mode);
void setBlendFunc(GLenum source, GLenum destination);
void setBlendFuncSeparate(GLenum sourceRGB, GLenum destinationRGB, GLenum sourceAlpha, GLenum destinationAlpha);
void setBlendFuncIndexed(GLuint index, GLenum source, GLenum destination);
void setBlendFuncSeparateIndexed(GLuint index, GLenum sourceRGB, GLenum destinationRGB, GLenum sourceAlpha, GLenum destinationAlpha);
void setBlend(bool enable);
void setBlendIndexed(GLuint index, bool enable);
// Client state calls.
void setClientState(bool vertex, bool normal, bool color, bool texCoord0);
// Color Mask.
void setColorMask(bool red, bool green, bool blue, bool alpha);
void setColorMaskIndexed(GLuint index, bool red, bool green, bool blue, bool alpha);
// Cull face calls.
void setCullFaceFunc(GLenum mode);
void setCullFace(bool enable);
// Depth calls.
void setDepthFunc(GLenum mode);
void setDepthMask(bool enable);
void setDepthTest(bool enable);
// FBO calls.
void getFBO(GLuint& id) const;
void setFBO(GLuint id);
// Matrix calls.
void setMatrixMode(GLenum mode);
// Texture calls.
void setActiveTexture(GLenum texture);
void setClientActiveTexture(GLenum texture);
// Viewport calls.
void setViewport(GLint viewportX, GLint viewportY, GLsizei viewportWidth, GLsizei viewportHeight);
// Texture cache.
STextureCache TextureCache;
private:
COpenGLDriver* Driver;
GLuint FrameBufferCount;
GLenum AlphaMode;
GLclampf AlphaRef;
bool AlphaTest;
GLenum* BlendEquation;
GLenum* BlendSourceRGB;
GLenum* BlendDestinationRGB;
GLenum* BlendSourceAlpha;
GLenum* BlendDestinationAlpha;
bool* Blend;
bool (*ColorMask)[4];
GLenum CullFaceMode;
bool CullFace;
GLenum DepthFunc;
bool DepthMask;
bool DepthTest;
GLuint FrameBufferID;
GLenum MatrixMode;
GLenum ActiveTexture;
GLenum ClientActiveTexture;
bool ClientStateVertex;
bool ClientStateNormal;
bool ClientStateColor;
bool ClientStateTexCoord0;
GLint ViewportX;
GLint ViewportY;
GLsizei ViewportWidth;
GLsizei ViewportHeight;
};
} // end namespace video
} // end namespace irr
#endif // _IRR_COMPILE_WITH_OPENGL_
#endif
source/Irrlicht/COpenGLDriver.cpp
View file @ 2f3ca311
This diff is collapsed.
source/Irrlicht/COpenGLDriver.h
View file @ 2f3ca311
......@@ -29,12 +29,12 @@ namespace irr
namespace video
{
class COpenGLCallBridge;
class COpenGLCacheHandler;
class COpenGLTexture;
class COpenGLDriver : public CNullDriver, public IMaterialRendererServices, public COpenGLExtensionHandler
{
friend class COpenGLCallBridge;
friend class COpenGLCacheHandler;
friend class COpenGLTexture;
public:
// Information about state of fixed pipeline activity.
......@@ -409,8 +409,7 @@ namespace video
//! Get current material.
const SMaterial& getCurrentMaterial() const;
//! Get bridge calls.
COpenGLCallBridge* getBridgeCalls() const;
COpenGLCacheHandler* getCacheHandler() const;
private:
......@@ -454,8 +453,7 @@ namespace video
void renderArray(const void* indexList, u32 primitiveCount,
scene::E_PRIMITIVE_TYPE pType, E_INDEX_TYPE iType);
// Bridge calls.
COpenGLCallBridge* BridgeCalls;
COpenGLCacheHandler* CacheHandler;
core::stringw Name;
core::matrix4 Matrices[ETS_COUNT];
......@@ -535,149 +533,6 @@ namespace video
E_DEVICE_TYPE DeviceType;
};
//! This is a bridge between Irlicht pseudo OpenGL calls and real OpenGL calls.
class COpenGLCallBridge
{
class STextureCache
{
public:
STextureCache(COpenGLCallBridge* cacheHandler, u32 textureCount);
~STextureCache();
const COpenGLTexture* operator[](int index) const;
bool set(u32 index, const ITexture* texture);
void remove(ITexture* texture);
void clear();
private:
COpenGLCallBridge* CacheHandler;
const COpenGLTexture* Texture[MATERIAL_MAX_TEXTURES];
u32 TextureCount;
};
public:
COpenGLCallBridge(COpenGLDriver* driver);
~COpenGLCallBridge();
// Alpha calls.
void setAlphaFunc(GLenum mode, GLclampf ref);
void setAlphaTest(bool enable);
// Blending calls.
void setBlendEquation(GLenum mode);
void setBlendEquationIndexed(GLuint index, GLenum mode);
void setBlendFunc(GLenum source, GLenum destination);
void setBlendFuncSeparate(GLenum sourceRGB, GLenum destinationRGB, GLenum sourceAlpha, GLenum destinationAlpha);
void setBlendFuncIndexed(GLuint index, GLenum source, GLenum destination);
void setBlendFuncSeparateIndexed(GLuint index, GLenum sourceRGB, GLenum destinationRGB, GLenum sourceAlpha, GLenum destinationAlpha);
void setBlend(bool enable);
void setBlendIndexed(GLuint index, bool enable);
// Client state calls.
void setClientState(bool vertex, bool normal, bool color, bool texCoord0);
// Color Mask.
void setColorMask(bool red, bool green, bool blue, bool alpha);
void setColorMaskIndexed(GLuint index, bool red, bool green, bool blue, bool alpha);
// Cull face calls.
void setCullFaceFunc(GLenum mode);
void setCullFace(bool enable);
// Depth calls.
void setDepthFunc(GLenum mode);
void setDepthMask(bool enable);
void setDepthTest(bool enable);
// FBO calls.
void getFBO(GLuint& id) const;
void setFBO(GLuint id);
// Matrix calls.
void setMatrixMode(GLenum mode);
// Texture calls.
void setActiveTexture(GLenum texture);
void setClientActiveTexture(GLenum texture);
// Viewport calls.
void setViewport(GLint viewportX, GLint viewportY, GLsizei viewportWidth, GLsizei viewportHeight);
// Texture cache.
STextureCache TextureCache;
private:
COpenGLDriver* Driver;
GLuint FrameBufferCount;
GLenum AlphaMode;
GLclampf AlphaRef;
bool AlphaTest;
GLenum* BlendEquation;
GLenum* BlendSourceRGB;
GLenum* BlendDestinationRGB;
GLenum* BlendSourceAlpha;
GLenum* BlendDestinationAlpha;
bool* Blend;
bool ClientStateVertex;
bool ClientStateNormal;
bool ClientStateColor;
bool ClientStateTexCoord0;
bool (*ColorMask)[4];
GLenum CullFaceMode;
bool CullFace;
GLenum DepthFunc;
bool DepthMask;
bool DepthTest;
GLuint FrameBufferID;
GLenum MatrixMode;
GLenum ActiveTexture;
GLenum ClientActiveTexture;
GLint ViewportX;
GLint ViewportY;
GLsizei ViewportWidth;
GLsizei ViewportHeight;
};
} // end namespace video
} // end namespace irr
......
source/Irrlicht/COpenGLMaterialRenderer.h
View file @ 2f3ca311
This diff is collapsed.
source/Irrlicht/COpenGLRenderTarget.cpp
View file @ 2f3ca311
......@@ -92,7 +92,7 @@ bool checkFBOStatus(COpenGLDriver* Driver)
}
COpenGLRenderTarget::COpenGLRenderTarget(COpenGLDriver* driver) : AssignedDepth(false), AssignedStencil(false), RequestTextureUpdate(false), RequestDepthStencilUpdate(false),
BufferID(0), SupportForFBO(false), SupportForMRT(false), BridgeCalls(0), Driver(driver)
BufferID(0), SupportForFBO(false), SupportForMRT(false), Driver(driver)
{
#ifdef _DEBUG
setDebugName("COpenGLRenderTarget");
......@@ -101,7 +101,6 @@ COpenGLRenderTarget::COpenGLRenderTarget(COpenGLDriver* driver) : AssignedDepth(
DriverType = EDT_OPENGL;
Size = Driver->getScreenSize();
BridgeCalls = Driver->getBridgeCalls();
#if defined(GL_VERSION_3_0) || defined(GL_ARB_framebuffer_object) || defined(GL_EXT_framebuffer_object)
SupportForFBO = Driver->FeatureAvailable[COpenGLDriver::IRR_EXT_framebuffer_object] || Driver->FeatureAvailable[COpenGLDriver::IRR_ARB_framebuffer_object];
......
source/Irrlicht/COpenGLRenderTarget.h
View file @ 2f3ca311
......@@ -20,7 +20,7 @@ namespace video
{
class COpenGLDriver;
class COpenGLCallBridge;
class COpenGLCacheHandler;
class COpenGLRenderTarget : public IRenderTarget
{
......@@ -53,8 +53,6 @@ protected:
bool SupportForFBO;
bool SupportForMRT;
COpenGLCallBridge* BridgeCalls;
COpenGLDriver* Driver;
};
......
source/Irrlicht/COpenGLSLMaterialRenderer.cpp
View file @ 2f3ca311
......@@ -20,6 +20,7 @@
#include "IVideoDriver.h"
#include "os.h"
#include "COpenGLDriver.h"
#include "COpenGLCacheHandler.h"
#include "COpenGLMaterialRenderer.h"
namespace irr
......@@ -231,7 +232,7 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
else
Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE);
COpenGLCallBridge* bridgeCalls = Driver->getBridgeCalls();
COpenGLCacheHandler* cacheHandler = Driver->getCacheHandler();
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{
......@@ -245,13 +246,13 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
if (Alpha)
{
bridgeCalls->setBlend(true);
bridgeCalls->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
cacheHandler->setBlend(true);
cacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
else if (FixedBlending)
{
bridgeCalls->setBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
bridgeCalls->setBlend(true);
cacheHandler->setBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
cacheHandler->setBlend(true);
}
else if (Blending)
{
......@@ -262,20 +263,20 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
if (Driver->queryFeature(EVDF_BLEND_SEPARATE))
{
bridgeCalls->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
cacheHandler->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
Driver->getGLBlend(srcAlphaFact), Driver->getGLBlend(dstAlphaFact));
}
else
{
bridgeCalls->setBlendFunc(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact));
cacheHandler->setBlendFunc(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact));
}
bridgeCalls->setBlend(true);
cacheHandler->setBlend(true);
}
else if (AlphaTest)
{
bridgeCalls->setAlphaTest(true);
bridgeCalls->setAlphaFunc(GL_GREATER, 0.5f);
cacheHandler->setAlphaTest(true);
cacheHandler->setAlphaFunc(GL_GREATER, 0.5f);
}
if (CallBack)
......
source/Irrlicht/COpenGLShaderMaterialRenderer.cpp
View file @ 2f3ca311
......@@ -11,6 +11,7 @@
#include "IVideoDriver.h"
#include "os.h"
#include "COpenGLDriver.h"
#include "COpenGLCacheHandler.h"
#include "COpenGLMaterialRenderer.h"
namespace irr
......@@ -161,7 +162,7 @@ void COpenGLShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& materi
else
Driver->setFixedPipelineState(COpenGLDriver::EOFPS_DISABLE);
COpenGLCallBridge* bridgeCalls = Driver->getBridgeCalls();
COpenGLCacheHandler* cacheHandler = Driver->getCacheHandler();
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
{
......@@ -208,13 +209,13 @@ void COpenGLShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& materi
if (Alpha)
{
bridgeCalls->setBlend(true);
bridgeCalls->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
cacheHandler->setBlend(true);
cacheHandler->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
else if (FixedBlending)
{
bridgeCalls->setBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
bridgeCalls->setBlend(true);
cacheHandler->setBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
cacheHandler->setBlend(true);
}
else if (Blending)
{
......@@ -225,20 +226,20 @@ void COpenGLShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& materi
if (Driver->queryFeature(EVDF_BLEND_SEPARATE))
{
bridgeCalls->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
cacheHandler->setBlendFuncSeparate(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact),
Driver->getGLBlend(srcAlphaFact), Driver->getGLBlend(dstAlphaFact));
}
else
{
bridgeCalls->setBlendFunc(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact));
cacheHandler->setBlendFunc(Driver->getGLBlend(srcRGBFact), Driver->getGLBlend(dstRGBFact));
}
bridgeCalls->setBlend(true);
cacheHandler->setBlend(true);
}
else if (AlphaTest)
{
bridgeCalls->setAlphaTest(true);
bridgeCalls->setAlphaFunc(GL_GREATER, 0.5f);
cacheHandler->setAlphaTest(true);
cacheHandler->setAlphaFunc(GL_GREATER, 0.5f);
}
if (CallBack)
......
source/Irrlicht/COpenGLTexture.cpp
View file @ 2f3ca311
......@@ -9,6 +9,7 @@
#include "irrTypes.h"
#include "COpenGLTexture.h"
#include "COpenGLDriver.h"
#include "COpenGLCacheHandler.h"
#include "os.h"
#include "CColorConverter.h"
......@@ -108,8 +109,8 @@ COpenGLTexture::COpenGLTexture(const io::path& name, const core::dimension2d<u32
setDebugName("COpenGLTexture");
#endif
COpenGLCallBridge* bridgeCalls = Driver->getBridgeCalls();
const COpenGLTexture* prevTexture = bridgeCalls->TextureCache[0];
COpenGLCacheHandler* cacheHandler = Driver->getCacheHandler();
const COpenGLTexture* prevTexture = cacheHandler->TextureCache[0];
DriverType = EDT_OPENGL;
......@@ -140,7 +141,7 @@ COpenGLTexture::COpenGLTexture(const io::path& name, const core::dimension2d<u32
glGenTextures(1, &TextureName);
bridgeCalls->TextureCache.set(0, this);
cacheHandler->TextureCache.set(0, this);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, FilteringType);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
......@@ -156,14 +157,14 @@ COpenGLTexture::COpenGLTexture(const io::path& name, const core::dimension2d<u32
glTexImage2D(GL_TEXTURE_2D, 0, InternalFormat, OriginalSize.Width, OriginalSize.Height, 0, PixelFormat, PixelType, 0);
bridgeCalls->TextureCache.set(0, prevTexture);
cacheHandler->TextureCache.set(0, prevTexture);
}
//! destructor
COpenGLTexture::~COpenGLTexture()
{
Driver->getBridgeCalls()->TextureCache.remove(this);
Driver->getCacheHandler()->TextureCache.remove(this);
if (TextureName)
glDeleteTextures(1, &TextureName);
......@@ -478,8 +479,8 @@ void COpenGLTexture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
return;
}
COpenGLCallBridge* bridgeCalls = Driver->getBridgeCalls();
const COpenGLTexture* prevTexture = bridgeCalls->TextureCache[0];
COpenGLCacheHandler* cacheHandler = Driver->getCacheHandler();
const COpenGLTexture* prevTexture = cacheHandler->TextureCache[0];
// get correct opengl color data values
GLenum oldInternalFormat = InternalFormat;
......@@ -489,7 +490,7 @@ void COpenGLTexture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
if (!newTexture)
InternalFormat=oldInternalFormat;
bridgeCalls->TextureCache.set(0, this);
cacheHandler->TextureCache.set(0, this);
if (Driver->testGLError())
os::Printer::log("Could not bind Texture", ELL_ERROR);
......@@ -603,7 +604,7 @@ void COpenGLTexture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
if (Driver->testGLError())
os::Printer::log("Could not glTexImage2D", ELL_ERROR);
bridgeCalls->TextureCache.set(0, prevTexture);
cacheHandler->TextureCache.set(0, prevTexture);
}
......
source/Irrlicht/Irrlicht-gcc.cbp
View file @ 2f3ca311
......@@ -830,6 +830,8 @@
<Unit filename="COctreeTriangleSelector.h" />
<Unit filename="COgreMeshFileLoader.cpp" />
<Unit filename="COgreMeshFileLoader.h" />
<Unit filename="COpenGLCacheHandler.cpp" />
<Unit filename="COpenGLCacheHandler.h" />
<Unit filename="COpenGLDriver.cpp" />
<Unit filename="COpenGLDriver.h" />
<Unit filename="COpenGLExtensionHandler.cpp" />
......
source/Irrlicht/Irrlicht10.0.vcxproj
View file @ 2f3ca311
......@@ -1102,6 +1102,7 @@
<ClInclude Include="IZBuffer.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="S2DVertex.h" />
<ClInclude Include="COpenGLCacheHandler.h" />
<ClInclude Include="COpenGLDriver.h" />
<ClInclude Include="COpenGLExtensionHandler.h" />
<ClInclude Include="COpenGLMaterialRenderer.h" />
......@@ -1351,6 +1352,7 @@
<ClCompile Include="CTRTextureGouraudNoZ.cpp" />
<ClCompile Include="CTRTextureGouraudWire.cpp" />
<ClCompile Include="CZBuffer.cpp" />
<ClCompile Include="COpenGLCacheHandler.cpp" />
<ClCompile Include="COpenGLDriver.cpp" />
<ClCompile Include="COpenGLExtensionHandler.cpp" />
<ClCompile Include="COpenGLNormalMapRenderer.cpp" />
......
source/Irrlicht/Irrlicht10.0.vcxproj.filters
View file @ 2f3ca311
......@@ -849,6 +849,9 @@
<ClInclude Include="S2DVertex.h">
<Filter>Irrlicht\video\Software</Filter>
</ClInclude>
<ClInclude Include="COpenGLCacheHandler.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
<ClInclude Include="COpenGLDriver.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
......@@ -1616,6 +1619,9 @@
<ClCompile Include="CZBuffer.cpp">
<Filter>Irrlicht\video\Software</Filter>
</ClCompile>
<ClCompile Include="COpenGLCacheHandler.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
<ClCompile Include="COpenGLDriver.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
......
source/Irrlicht/Irrlicht11.0.vcxproj
View file @ 2f3ca311
......@@ -1101,6 +1101,7 @@
<ClInclude Include="IZBuffer.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="S2DVertex.h" />
<ClInclude Include="COpenGLCacheHandler.h" />
<ClInclude Include="COpenGLDriver.h" />
<ClInclude Include="COpenGLExtensionHandler.h" />
<ClInclude Include="COpenGLMaterialRenderer.h" />
......@@ -1351,6 +1352,7 @@
<ClCompile Include="CTRTextureGouraudNoZ.cpp" />
<ClCompile Include="CTRTextureGouraudWire.cpp" />
<ClCompile Include="CZBuffer.cpp" />
<ClCompile Include="COpenGLCacheHandler.cpp" />
<ClCompile Include="COpenGLDriver.cpp" />
<ClCompile Include="COpenGLExtensionHandler.cpp" />
<ClCompile Include="COpenGLNormalMapRenderer.cpp" />
......
source/Irrlicht/Irrlicht11.0.vcxproj.filters
View file @ 2f3ca311
......@@ -855,6 +855,9 @@
<ClInclude Include="S2DVertex.h">
<Filter>Irrlicht\video\Software</Filter>
</ClInclude>
<ClInclude Include="COpenGLCacheHandler.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
<ClInclude Include="COpenGLDriver.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
......@@ -1616,6 +1619,9 @@
<ClCompile Include="CZBuffer.cpp">
<Filter>Irrlicht\video\Software</Filter>
</ClCompile>
<ClCompile Include="COpenGLCacheHandler.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
<ClCompile Include="COpenGLDriver.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
......
source/Irrlicht/Irrlicht12.0.vcxproj
View file @ 2f3ca311
......@@ -1101,6 +1101,7 @@
<ClInclude Include="IZBuffer.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="S2DVertex.h" />
<ClInclude Include="COpenGLCacheHandler.h" />
<ClInclude Include="COpenGLDriver.h" />
<ClInclude Include="COpenGLExtensionHandler.h" />
<ClInclude Include="COpenGLMaterialRenderer.h" />
......@@ -1351,6 +1352,7 @@
<ClCompile Include="CTRTextureGouraudNoZ.cpp" />
<ClCompile Include="CTRTextureGouraudWire.cpp" />
<ClCompile Include="CZBuffer.cpp" />
<ClCompile Include="COpenGLCacheHandler.cpp" />
<ClCompile Include="COpenGLDriver.cpp" />
<ClCompile Include="COpenGLExtensionHandler.cpp" />
<ClCompile Include="COpenGLNormalMapRenderer.cpp" />
......
source/Irrlicht/Irrlicht12.0.vcxproj.filters
View file @ 2f3ca311
......@@ -855,6 +855,9 @@
<ClInclude Include="S2DVertex.h">
<Filter>Irrlicht\video\Software</Filter>
</ClInclude>
<ClInclude Include="COpenGLCacheHandler.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
<ClInclude Include="COpenGLDriver.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
......@@ -1616,6 +1619,9 @@
<ClCompile Include="CZBuffer.cpp">
<Filter>Irrlicht\video\Software</Filter>
</ClCompile>
<ClCompile Include="COpenGLCacheHandler.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
<ClCompile Include="COpenGLDriver.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
......
source/Irrlicht/Irrlicht14.0.vcxproj
View file @ 2f3ca311
......@@ -1111,6 +1111,7 @@
<ClInclude Include="IZBuffer.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="S2DVertex.h" />
<ClInclude Include="COpenGLCacheHandler.h" />
<ClInclude Include="COpenGLDriver.h" />
<ClInclude Include="COpenGLExtensionHandler.h" />
<ClInclude Include="COpenGLMaterialRenderer.h" />
......@@ -1361,6 +1362,7 @@
<ClCompile Include="CTRTextureGouraudNoZ.cpp" />
<ClCompile Include="CTRTextureGouraudWire.cpp" />
<ClCompile Include="CZBuffer.cpp" />
<ClCompile Include="COpenGLCacheHandler.cpp" />
<ClCompile Include="COpenGLDriver.cpp" />
<ClCompile Include="COpenGLExtensionHandler.cpp" />
<ClCompile Include="COpenGLNormalMapRenderer.cpp" />
......
source/Irrlicht/Irrlicht14.0.vcxproj.filters
View file @ 2f3ca311
......@@ -855,6 +855,9 @@
<ClInclude Include="S2DVertex.h">
<Filter>Irrlicht\video\Software</Filter>
</ClInclude>
<ClInclude Include="COpenGLCacheHandler.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
<ClInclude Include="COpenGLDriver.h">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClInclude>
......@@ -1616,6 +1619,9 @@
<ClCompile Include="CZBuffer.cpp">
<Filter>Irrlicht\video\Software</Filter>
</ClCompile>
<ClCompile Include="COpenGLCacheHandler.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
<ClCompile Include="COpenGLDriver.cpp">
<Filter>Irrlicht\video\OpenGL</Filter>
</ClCompile>
......
source/Irrlicht/Irrlicht9.0.vcproj
View file @ 2f3ca311
......@@ -2187,6 +2187,14 @@
<Filter
Name="OpenGL"
>
<File
RelativePath="COpenGLCacheHandler.cpp"
>
</File>
<File
RelativePath="COpenGLCacheHandler.h"
>
</File>
<File
RelativePath="COpenGLDriver.cpp"
>
......
source/Irrlicht/Makefile
View file @ 2f3ca311
......@@ -38,7 +38,7 @@ IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \
IRROBJ = CBillboardSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctreeSceneNode.o COctreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CVolumeLightSceneNode.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o CSceneLoaderIrr.o
IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o CParticleScaleAffector.o
IRRANIMOBJ = CSceneNodeAnimatorCameraFPS.o CSceneNodeAnimatorCameraMaya.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o
IRRDRVROBJ = CNullDriver.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLRenderTarget.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o
IRRDRVROBJ = CNullDriver.o COpenGLCacheHandler.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLRenderTarget.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o
IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderDDS.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o CImageLoaderRGB.o \
CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment