Update of /cvsroot/simspark/simspark/spark/kerosin/materialserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21428
Modified Files:
Tag: WIN32
material2dtexture.cpp
Log Message:
- lookup glActiveTextureARB extension via the OpenGLServer
Index: material2dtexture.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/material2dtexture.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** material2dtexture.cpp 5 Dec 2005 21:38:22 -0000 1.1
--- material2dtexture.cpp 10 Feb 2007 16:18:00 -0000 1.1.2.1
***************
*** 80,84 ****
if (mTexDiffuse.get() != 0)
{
! glActiveTextureARB(GL_TEXTURE0_ARB);
glEnable(GL_TEXTURE_2D);
mTexDiffuse->Bind();
--- 80,84 ----
if (mTexDiffuse.get() != 0)
{
! OpenGLServer::glActiveTextureARB(GL_TEXTURE0_ARB);
glEnable(GL_TEXTURE_2D);
mTexDiffuse->Bind();
***************
*** 87,91 ****
if (mTexNormal.get() != 0)
{
! glActiveTextureARB(GL_TEXTURE1_ARB);
glEnable(GL_TEXTURE_2D);
mTexNormal->Bind();
--- 87,91 ----
if (mTexNormal.get() != 0)
{
! OpenGLServer::glActiveTextureARB(GL_TEXTURE1_ARB);
glEnable(GL_TEXTURE_2D);
mTexNormal->Bind();
***************
*** 94,98 ****
if (mTexSpecular.get() != 0)
{
! glActiveTextureARB(GL_TEXTURE2_ARB);
glEnable(GL_TEXTURE_2D);
mTexSpecular->Bind();
--- 94,98 ----
if (mTexSpecular.get() != 0)
{
! OpenGLServer::glActiveTextureARB(GL_TEXTURE2_ARB);
glEnable(GL_TEXTURE_2D);
mTexSpecular->Bind();
|
