|
From: <axl...@us...> - 2008-12-23 19:24:52
|
Revision: 80
http://hgengine.svn.sourceforge.net/hgengine/?rev=80&view=rev
Author: axlecrusher
Date: 2008-12-23 19:24:48 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
VBO texure binding
Modified Paths:
--------------
Mercury2/src/Texture.cpp
Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp 2008-12-23 19:23:21 UTC (rev 79)
+++ Mercury2/src/Texture.cpp 2008-12-23 19:24:48 UTC (rev 80)
@@ -99,6 +99,8 @@
{
m_textureResource = GL_TEXTURE0+m_activeTextures;
glActiveTexture( m_textureResource );
+ glClientActiveTextureARB(m_textureResource);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glEnable( GL_TEXTURE_2D );
glBindTexture(GL_TEXTURE_2D, m_textureID);
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
@@ -108,12 +110,14 @@
void Texture::UnbindTexture()
{
glActiveTexture( m_textureResource );
+ glClientActiveTextureARB(m_textureResource);
+ glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisable( GL_TEXTURE_2D );
--m_activeTextures;
}
-bool Texture::m_initTextureSuccess;
-unsigned short Texture::m_activeTextures;
+bool Texture::m_initTextureSuccess = false;
+unsigned short Texture::m_activeTextures = 0;
/***************************************************************************
* Copyright (C) 2008 by Joshua Allen *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|