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

Removed last of the uint references.

Browse Source
This commit is contained in:
Robert Osfield
2003-02-14 11:41:52 +00:00
parent 319e84ceed
commit bd506b53da
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/Drawable.cpp
View File

@@ -32,7 +32,7 @@ typedef std::vector<GLuint> DisplayListVector;
typedef std::map<GLuint,DisplayListVector> DeletedDisplayListCache;
static DeletedDisplayListCache s_deletedDisplayListCache;
void Drawable::deleteDisplayList(uint contextID,uint globj)
void Drawable::deleteDisplayList(unsigned int contextID,GLuint globj)
{
if (globj!=0)
{
@@ -43,7 +43,7 @@ void Drawable::deleteDisplayList(uint contextID,uint globj)
/** flush all the cached display list which need to be deleted
* in the OpenGL context related to contextID.*/
void Drawable::flushDeletedDisplayLists(uint contextID)
void Drawable::flushDeletedDisplayLists(unsigned int contextID)
{
DeletedDisplayListCache::iterator citr = s_deletedDisplayListCache.find(contextID);
if (citr!=s_deletedDisplayListCache.end())
@@ -136,7 +136,7 @@ void Drawable::compile(State& state) const
// get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context.
uint contextID = state.getContextID();
unsigned int contextID = state.getContextID();
// get the globj for the current contextID.
uint& globj = _globjList[contextID];
@@ -221,7 +221,7 @@ void Drawable::setUseDisplayList(bool flag)
void Drawable::dirtyDisplayList()
{
for(uint i=0;i<_globjList.size();++i)
for(unsigned int i=0;i<_globjList.size();++i)
{
if (_globjList[i] != 0)
{

18
src/osg/Texture.cpp
View File

@@ -31,7 +31,7 @@ typedef std::map<unsigned int,TextureObjectVector> DeletedTextureObjectCache;
static DeletedTextureObjectCache s_deletedTextureObjectCache;
void Texture::deleteTextureObject(uint contextID,GLuint handle)
void Texture::deleteTextureObject(unsigned int contextID,GLuint handle)
{
if (handle!=0)
{
@@ -41,7 +41,7 @@ void Texture::deleteTextureObject(uint contextID,GLuint handle)
}
void Texture::flushDeletedTextureObjects(uint contextID)
void Texture::flushDeletedTextureObjects(unsigned int contextID)
{
DeletedTextureObjectCache::iterator citr = s_deletedTextureObjectCache.find(contextID);
if (citr!=s_deletedTextureObjectCache.end())
@@ -167,7 +167,7 @@ void Texture::setMaxAnisotropy(float anis)
/** Force a recompile on next apply() of associated OpenGL texture objects.*/
void Texture::dirtyTextureObject()
{
for(uint i=0;i<_handleList.size();++i)
for(unsigned int i=0;i<_handleList.size();++i)
{
if (_handleList[i] != 0)
{
@@ -179,7 +179,7 @@ void Texture::dirtyTextureObject()
void Texture::dirtyTextureParameters()
{
for(uint i=0;i<_texParametersDirtyList.size();++i)
for(unsigned int i=0;i<_texParametersDirtyList.size();++i)
{
_texParametersDirtyList[i] = 1;
}
@@ -187,7 +187,7 @@ void Texture::dirtyTextureParameters()
void Texture::computeInternalFormatWithImage(osg::Image& image) const
{
const uint contextID = 0; // state.getContextID(); // set to 0 right now, assume same paramters for each graphics context...
const unsigned int contextID = 0; // state.getContextID(); // set to 0 right now, assume same paramters for each graphics context...
const Extensions* extensions = getExtensions(contextID,true);
// static bool s_ARB_Compression = isGLExtensionSupported("GL_ARB_texture_compression");
@@ -303,7 +303,7 @@ void Texture::applyTexParameters(GLenum target, State& state) const
{
// get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context.
const uint contextID = state.getContextID();
const unsigned int contextID = state.getContextID();
const Extensions* extensions = getExtensions(contextID,true);
WrapMode ws = _wrap_s, wt = _wrap_t, wr = _wrap_r;
@@ -371,7 +371,7 @@ void Texture::applyTexImage2D(GLenum target, Image* image, State& state, GLsizei
// get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context.
const uint contextID = state.getContextID();
const unsigned int contextID = state.getContextID();
const Extensions* extensions = getExtensions(contextID,true);
// update the modified tag to show that it is upto date.
@@ -498,13 +498,13 @@ void Texture::compile(State& state) const
typedef buffered_value< ref_ptr<Texture::Extensions> > BufferedExtensions;
static BufferedExtensions s_extensions;
const Texture::Extensions* Texture::getExtensions(uint contextID,bool createIfNotInitalized)
const Texture::Extensions* Texture::getExtensions(unsigned int contextID,bool createIfNotInitalized)
{
if (!s_extensions[contextID] && createIfNotInitalized) s_extensions[contextID] = new Extensions;
return s_extensions[contextID].get();
}
void Texture::setExtensions(uint contextID,Extensions* extensions)
void Texture::setExtensions(unsigned int contextID,Extensions* extensions)
{
s_extensions[contextID] = extensions;
}

10
src/osg/Texture3D.cpp
View File

@@ -97,7 +97,7 @@ void Texture3D::apply(State& state) const
// get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context.
const uint contextID = state.getContextID();
const unsigned int contextID = state.getContextID();
const Extensions* extensions = getExtensions(contextID,true);
@@ -179,7 +179,7 @@ void Texture3D::applyTexImage3D(GLenum target, Image* image, State& state, GLsiz
// get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context.
const uint contextID = state.getContextID();
const unsigned int contextID = state.getContextID();
const Extensions* extensions = getExtensions(contextID,true);
@@ -265,7 +265,7 @@ void Texture3D::applyTexImage3D(GLenum target, Image* image, State& state, GLsiz
void Texture3D::copyTexSubImage3D(State& state, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height )
{
const uint contextID = state.getContextID();
const unsigned int contextID = state.getContextID();
// get the globj for the current contextID.
GLuint& handle = getTextureObject(contextID);
@@ -295,13 +295,13 @@ void Texture3D::copyTexSubImage3D(State& state, int xoffset, int yoffset, int zo
typedef buffered_value< ref_ptr<Texture3D::Extensions> > BufferedExtensions;
static BufferedExtensions s_extensions;
const Texture3D::Extensions* Texture3D::getExtensions(uint contextID,bool createIfNotInitalized)
const Texture3D::Extensions* Texture3D::getExtensions(unsigned int contextID,bool createIfNotInitalized)
{
if (!s_extensions[contextID] && createIfNotInitalized) s_extensions[contextID] = new Extensions;
return s_extensions[contextID].get();
}
void Texture3D::setExtensions(uint contextID,Extensions* extensions)
void Texture3D::setExtensions(unsigned int contextID,Extensions* extensions)
{
s_extensions[contextID] = extensions;
}