From a3befd78779e89b27b57da7b7ac8b0dddc93bf1b Mon Sep 17 00:00:00 2001 From: James Turk Date: Mon, 17 Mar 2003 03:56:19 +0000 Subject: [PATCH] changed bind behavior so technically zimage can work in stock GL programs --- src/ZE_ZImage.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ZE_ZImage.cpp b/src/ZE_ZImage.cpp index 3b0fc11..031fde9 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.27 2003/02/10 05:26:17 cozman Exp $
+$Id: ZE_ZImage.cpp,v 1.28 2003/03/17 03:56:19 cozman Exp $
\file ZE_ZImage.cpp \brief Source file for ZImage. @@ -229,10 +229,7 @@ void ZImage::Bind() const if(!rTexID) rEngine->ReportError(ZERR_NOIMAGE,"Bind"); else - { - glColor4ub(255,255,255,rAlpha); glBindTexture(GL_TEXTURE_2D, rTexID); - } } void ZImage::Draw(int x, int y) const @@ -242,6 +239,7 @@ void ZImage::Draw(int x, int y) const void ZImage::Draw(float x, float y) const { + glColor4ub(255,255,255,rAlpha); Bind(); glBegin(GL_TRIANGLE_STRIP); glTexCoord2f(rTexMinX,rTexMinY); glVertex2f(x,y); @@ -267,6 +265,7 @@ void ZImage::DrawRotated(float x, float y, float angle) const glPushMatrix(); glTranslatef(x+cX,y+cY,0); glRotatef(angle,0,0,1.0f); + glColor4ub(255,255,255,rAlpha); Bind(); glBegin(GL_TRIANGLE_STRIP); glTexCoord2f(rTexMinX,rTexMinY); glVertex2f(-cX,-cY);