freeminer/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the getSize confusion and the wrongly comitted profiling option in the makefile.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@732 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
hybrid 2007-06-25 21:42:06 +00:00
parent 3f5c46d952
commit 222f57d8e3
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/Irrlicht/COpenGLTexture.cpp
View File

@ -158,17 +158,10 @@ COpenGLTexture::~COpenGLTexture()
glDeleteTextures(1, &DepthRenderBuffer);
if (StencilRenderBuffer && StencilRenderBuffer != DepthRenderBuffer)
glDeleteTextures(1, &StencilRenderBuffer);
ColorFrameBuffer = 0;
DepthRenderBuffer = 0;
StencilRenderBuffer = 0;
glDeleteTextures(1, &TextureName);
if (Image)
{
Image->drop();
Image=0;
}
ImageSize.Width=ImageSize.Height=0;
}
@ -346,8 +339,16 @@ void COpenGLTexture::unlock()
//! Returns original size of the texture.
//! Returns size of the original image.
const core::dimension2d<s32>& COpenGLTexture::getOriginalSize()
{
return ImageSize;
}
//! Returns of the texture.
const core::dimension2d<s32>& COpenGLTexture::getSize()
{
if (Image)
return Image->getDimension();
@ -357,14 +358,6 @@ const core::dimension2d<s32>& COpenGLTexture::getOriginalSize()
//! Returns (=size) of the texture.
const core::dimension2d<s32>& COpenGLTexture::getSize()
{
return ImageSize;
}
//! returns driver type of texture (=the driver, who created the texture)
E_DRIVER_TYPE COpenGLTexture::getDriverType()
{

2
source/Irrlicht/Makefile
View File

@ -38,7 +38,7 @@ CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
CXXFLAGS = -Wall
ifndef NDEBUG
CXXFLAGS += -pg
CXXFLAGS += -g
else
CXXFLAGS += -fexpensive-optimizations -O3
endif