Various files which should have been checked in earlier but were missed...
VisualStudio files for flt loader, and header files or Image and Texture for new osg::Texture::CLAMP_TO_EDGE and osg::Image::dirty.
This commit is contained in:
@@ -70,7 +70,7 @@ class SG_EXPORT Image : public Object
|
||||
void ensureDimensionsArePowerOfTwo();
|
||||
|
||||
/** Dirty the image, which increments the modified flag, to force osg::Texture to reload the image.*/
|
||||
inline void dirtyImage() { ++_modifiedTag; }
|
||||
inline void dirty() { ++_modifiedTag; }
|
||||
|
||||
/** Set the modified tag value, only used by osg::Texture when using texture subloading. */
|
||||
inline void setModifiedTag(const unsigned int value) { _modifiedTag=value; }
|
||||
|
||||
@@ -49,6 +49,10 @@
|
||||
#define GL_MIRRORED_REPEAT_IBM 0x8370
|
||||
#endif
|
||||
|
||||
#ifndef GL_CLAMP_TO_EDGE
|
||||
#define GL_CLAMP_TO_EDGE 0x812F
|
||||
#endif
|
||||
|
||||
#ifndef GL_GENERATE_MIPMAP_SGIS
|
||||
#define GL_GENERATE_MIPMAP_SGIS 0x8191
|
||||
#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
|
||||
@@ -118,6 +122,7 @@ class SG_EXPORT Texture : public StateAttribute
|
||||
|
||||
enum WrapMode {
|
||||
CLAMP = GL_CLAMP,
|
||||
CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
|
||||
REPEAT = GL_REPEAT,
|
||||
MIRROR = GL_MIRRORED_REPEAT_IBM
|
||||
};
|
||||
|
||||
@@ -109,7 +109,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced
|
||||
{
|
||||
MONO,
|
||||
QUAD_BUFFER_STEREO,
|
||||
RED_GREEN_STEREO,
|
||||
ANAGLYPHIC_STEREO,
|
||||
HORIZONTAL_SPLIT_STEREO,
|
||||
VERTICAL_SPLIT_STEREO
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user