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

Various files which should have been checked in earlier but were missed...

Browse Source 
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:
Robert Osfield 2001-12-04 20:38:27 +00:00
parent 396b2668c8
commit 20e3785bf8
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VisualStudio/osgPlugins/flt/flt.dsp
View File

@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"../../../bin/osgdb_fltd.dll" /pdbtype:sept /libpath:"../../../lib" # ADD LINK32 /nologo /dll /pdb:"../../../bin/osgdb_fltd.pdb" /debug /machine:I386 /out:"../../../bin/osgdb_fltd.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /incremental:no # SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF !ENDIF
@ -201,6 +201,10 @@ SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterFLT.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterATTR.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgPlugins\flt\Record.cpp SOURCE=..\..\..\src\osgPlugins\flt\Record.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

2
include/osg/Image
View File

@ -70,7 +70,7 @@ class SG_EXPORT Image : public Object
void ensureDimensionsArePowerOfTwo(); void ensureDimensionsArePowerOfTwo();
/** Dirty the image, which increments the modified flag, to force osg::Texture to reload the image.*/ /** 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. */ /** Set the modified tag value, only used by osg::Texture when using texture subloading. */
inline void setModifiedTag(const unsigned int value) { _modifiedTag=value; } inline void setModifiedTag(const unsigned int value) { _modifiedTag=value; }

5
include/osg/Texture
View File

@ -49,6 +49,10 @@
#define GL_MIRRORED_REPEAT_IBM 0x8370 #define GL_MIRRORED_REPEAT_IBM 0x8370
#endif #endif
#ifndef GL_CLAMP_TO_EDGE
#define GL_CLAMP_TO_EDGE 0x812F
#endif
#ifndef GL_GENERATE_MIPMAP_SGIS #ifndef GL_GENERATE_MIPMAP_SGIS
#define GL_GENERATE_MIPMAP_SGIS 0x8191 #define GL_GENERATE_MIPMAP_SGIS 0x8191
#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
@ -118,6 +122,7 @@ class SG_EXPORT Texture : public StateAttribute
enum WrapMode { enum WrapMode {
CLAMP = GL_CLAMP, CLAMP = GL_CLAMP,
CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
REPEAT = GL_REPEAT, REPEAT = GL_REPEAT,
MIRROR = GL_MIRRORED_REPEAT_IBM MIRROR = GL_MIRRORED_REPEAT_IBM
}; };

2
include/osgUtil/SceneView
View File

@ -109,7 +109,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced
{ {
MONO, MONO,
QUAD_BUFFER_STEREO, QUAD_BUFFER_STEREO,
RED_GREEN_STEREO, ANAGLYPHIC_STEREO,
HORIZONTAL_SPLIT_STEREO, HORIZONTAL_SPLIT_STEREO,
VERTICAL_SPLIT_STEREO VERTICAL_SPLIT_STEREO
}; };