FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Erik Hofman:

Browse Source 
This patch fixes and STL problem, and adds (compile time) support for
architextures that don't support multitexturing.
This commit is contained in:
curt 2002-09-18 19:41:52 +00:00
parent ab074726df
commit 01ccdd3ae1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
simgear/scene/sky/clouds3d/SkyTextureState.cpp
View File

@ -1,3 +1,4 @@
//------------------------------------------------------------------------------
// File : SkyTextureState.cpp
//------------------------------------------------------------------------------
@ -42,11 +43,13 @@ SkyTextureState::SkyTextureState()
if (0 == s_iNumTextureUnits)
{
int iNumTextureUnits = 0;
#ifdef GL_ARB_multitexture
glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &iNumTextureUnits);
if (iNumTextureUnits > 0)
s_iNumTextureUnits = iNumTextureUnits;
else
s_iNumTextureUnits = 1;
#endif
}
_pTextureUnitState = new TexState[s_iNumTextureUnits];
@ -84,8 +87,10 @@ SKYRESULT SkyTextureState::Activate()
//GLVU::CheckForGLError("SkyTextureState::Activate(8)");
for (unsigned int i = 0; i < s_iNumTextureUnits; ++i)
{
#ifdef GL_ARB_multitexture
if (s_iNumTextureUnits > 1)
glActiveTextureARB(GL_TEXTURE0_ARB + i);
#endif
bool bEnabled = IsTextureEnabled(i);
if (pCurrent->IsTextureEnabled(i) != bEnabled)
{
@ -144,8 +149,10 @@ SKYRESULT SkyTextureState::Activate()
}
//GLVU::CheckForGLError("SkyTextureState::Activate()");
}
#ifdef GL_ARB_multitexture
if (s_iNumTextureUnits > 1)
glActiveTextureARB(GL_TEXTURE0_ARB);
#endif
}
return SKYRESULT_OK;
}

5
simgear/scene/sky/clouds3d/camera.cpp
View File

@ -20,8 +20,11 @@
//----------------------------------------------------------------------------
// $Id$
//============================================================================
#include <simgear/compiler.h>
#include "camera.hpp"
#include <iostream>
#include STL_IOSTREAM
//----------------------------------------------------------------------------
// CONSTRUCTOR: defines a default camera system defined as (45 DEG FOV)