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

Integrated changes for MacOSX, submitted by Phil Atkin, with small mods by

Browse Source 
Robert Osfield to maintain compatability under Linux.
This commit is contained in:
Robert Osfield
2001-10-03 21:44:07 +00:00
parent 1ebddc2af7
commit 2c6e85442b
29 changed files with 395 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/Texture.cpp
View File

@@ -9,7 +9,7 @@
#include <osg/Notify>
#include <osg/GLExtensions>
#include <GL/glu.h>
#include <osg/GLU>
using namespace osg;
@@ -176,7 +176,7 @@ void Texture::apply(State& state) const
const uint contextID = state.getContextID();
// get the globj for the current contextID.
uint& handle = getHandle(contextID);
GLuint& handle = getHandle(contextID);
// For multi-texturing will need something like...
// glActiveTextureARB((GLenum)(GL_TEXTURE0_ARB+_textureUnit));
@@ -548,7 +548,7 @@ void Texture::copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, i
const uint contextID = state.getContextID();
// get the globj for the current contextID.
uint& handle = getHandle(contextID);
GLuint& handle = getHandle(contextID);
if (handle)
{