diff --git a/src/ZE_ZImage.cpp b/src/ZE_ZImage.cpp index 75924cf..8de5372 100644 --- a/src/ZE_ZImage.cpp +++ b/src/ZE_ZImage.cpp @@ -13,7 +13,7 @@ File: ZE_ZImage.cpp
Description: Implementation source file for core ZEngine Image or Texture Object.
Author(s): James Turk, Gamer Tazar
-$Id: ZE_ZImage.cpp,v 1.12 2003/01/07 06:11:26 cozman Exp $
+$Id: ZE_ZImage.cpp,v 1.13 2003/01/08 06:07:06 cozman Exp $
\file ZE_ZImage.cpp \brief Source file for ZImage. @@ -204,7 +204,6 @@ void ZImage::Draw(float x, float y) glTexCoord2f(rTexMinX,rTexMaxY); glVertex2f(x,y+rHeight); glTexCoord2f(rTexMaxX,rTexMaxY); glVertex2f(x+rWidth,y+rHeight); glEnd(); - glBindTexture(GL_TEXTURE_2D,0); //reset to blank texture } void ZImage::DrawRotated(int x, int y, float angle) diff --git a/src/ZE_ZRect.cpp b/src/ZE_ZRect.cpp index f36a93e..0d1f9f8 100644 --- a/src/ZE_ZRect.cpp +++ b/src/ZE_ZRect.cpp @@ -13,7 +13,7 @@ File: ZE_ZRect.cpp
Description: Implementation source file for core ZEngine Rectangle Object.
Author(s): James Turk
-$Id: ZE_ZRect.cpp,v 1.5 2003/01/07 05:44:32 cozman Exp $
+$Id: ZE_ZRect.cpp,v 1.6 2003/01/08 06:07:07 cozman Exp $
\file ZE_ZRect.cpp \brief Source file for ZRect. @@ -80,7 +80,7 @@ bool ZRect::operator<(const ZRect &rhs) const else if(rWidth > rhs.Width()) return false; else - return false; //nothing left to check they are == + return false; //nothing left to check, they are == } } } @@ -88,6 +88,7 @@ bool ZRect::operator<(const ZRect &rhs) const void ZRect::Draw(Uint8 red, Uint8 green, Uint8 blue, Uint8 alpha) { + glBindTexture(GL_TEXTURE_2D,0); //reset to blank texture glColor4ub(red,green,blue,alpha); glBegin(GL_QUADS); glVertex2f(rX, rY); @@ -95,7 +96,7 @@ void ZRect::Draw(Uint8 red, Uint8 green, Uint8 blue, Uint8 alpha) glVertex2f(rX+rWidth, rY+rHeight); glVertex2f(rX, rY+rHeight); glEnd(); - glColor4ub(255,255,255,255); + glColor4ub(255,255,255,255); //restore color setting } void ZRect::Move(float x, float y) diff --git a/test/ZRectTest.cpp b/test/ZRectTest.cpp index 638cfde..33036a9 100644 --- a/test/ZRectTest.cpp +++ b/test/ZRectTest.cpp @@ -8,7 +8,7 @@ and the home of this Library is http://www.zengine.sourceforge.net *******************************************************************************/ -/*$Id: ZRectTest.cpp,v 1.13 2003/01/04 05:18:51 cozman Exp $*/ +/*$Id: ZRectTest.cpp,v 1.14 2003/01/08 06:07:07 cozman Exp $*/ #include #include @@ -69,7 +69,6 @@ void Test() } engine->Clear(); - LogError(FormatStr("FPS=%.2f",1/engine->GetFrameTime())); moveRect.Draw(255,0,0,128); stillRect.Draw(0,0,255,128); moveRect.Intersection(stillRect).Draw(0,255,0);