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

Renamed futher uint/ushort instances.

Browse Source
This commit is contained in:
Robert Osfield 2003-02-14 16:52:47 +00:00
parent bd506b53da
commit 77fee92d71
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/osg/Texture
View File

@ -187,19 +187,19 @@ class SG_EXPORT Texture : public osg::StateAttribute
/** Get the handle to the texture object for the current context.*/ /** Get the handle to the texture object for the current context.*/
/** return the OpenGL texture object for specified context.*/ /** return the OpenGL texture object for specified context.*/
inline GLuint& getTextureObject(uint contextID) const inline GLuint& getTextureObject(unsigned int contextID) const
{ {
// get the globj for the current contextID. // get the globj for the current contextID.
return _handleList[contextID]; return _handleList[contextID];
} }
inline uint& getModifiedTag(uint contextID) const inline unsigned int& getModifiedTag(unsigned int contextID) const
{ {
// get the modified tag for the current contextID. // get the modified tag for the current contextID.
return _modifiedTag[contextID]; return _modifiedTag[contextID];
} }
inline uint& getTextureParameterDirty(uint contextID) const inline unsigned int& getTextureParameterDirty(unsigned int contextID) const
{ {
// get the dirty flag for the current contextID. // get the dirty flag for the current contextID.
return _texParametersDirtyList[contextID]; return _texParametersDirtyList[contextID];
@ -216,11 +216,11 @@ class SG_EXPORT Texture : public osg::StateAttribute
* OpenGL texture objects to cached until they can be deleted * OpenGL texture objects to cached until they can be deleted
* by the OpenGL context in which they were created, specified * by the OpenGL context in which they were created, specified
* by contextID.*/ * by contextID.*/
static void deleteTextureObject(uint contextID,GLuint handle); static void deleteTextureObject(unsigned int contextID,GLuint handle);
/** flush all the cached display list which need to be deleted /** flush all the cached display list which need to be deleted
* in the OpenGL context related to contextID.*/ * in the OpenGL context related to contextID.*/
static void flushDeletedTextureObjects(uint contextID); static void flushDeletedTextureObjects(unsigned int contextID);
/** Texture is pure virtual base class, apply must be overriden. */ /** Texture is pure virtual base class, apply must be overriden. */
virtual void apply(State& state) const = 0; virtual void apply(State& state) const = 0;

2
src/osg/Drawable.cpp
View File

@ -139,7 +139,7 @@ void Drawable::compile(State& state) const
unsigned int contextID = state.getContextID(); unsigned int contextID = state.getContextID();
// get the globj for the current contextID. // get the globj for the current contextID.
uint& globj = _globjList[contextID]; GLuint& globj = _globjList[contextID];
// call the globj if already set otherwise comple and execute. // call the globj if already set otherwise comple and execute.
if( globj != 0 ) if( globj != 0 )

2
src/osg/GeoSet.cpp
View File

@ -811,7 +811,7 @@ void GeoSet::setInterleavedArray( InterleaveArrayType format, float *pointer )
} }
void GeoSet::setInterleavedArray( InterleaveArrayType format, float *ia, ushort *iai ) void GeoSet::setInterleavedArray( InterleaveArrayType format, float *ia, unsigned short *iai )
{ {
_iaformat = format; _iaformat = format;