From 20e3785bf8b58a0e0d21c78912e42e79e4da4b36 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 4 Dec 2001 20:38:27 +0000
Subject: [PATCH] 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.

---
 VisualStudio/osgPlugins/flt/flt.dsp | 6 +++++-
 include/osg/Image                   | 2 +-
 include/osg/Texture                 | 5 +++++
 include/osgUtil/SceneView           | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/VisualStudio/osgPlugins/flt/flt.dsp b/VisualStudio/osgPlugins/flt/flt.dsp
index da6de438c..a0990e5b0 100644
--- a/VisualStudio/osgPlugins/flt/flt.dsp
+++ b/VisualStudio/osgPlugins/flt/flt.dsp
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 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 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
 
 !ENDIF 
@@ -201,6 +201,10 @@ SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterFLT.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\src\osgPlugins\flt\ReaderWriterATTR.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\src\osgPlugins\flt\Record.cpp
 # End Source File
 # Begin Source File
diff --git a/include/osg/Image b/include/osg/Image
index 228041520..369d04280 100644
--- a/include/osg/Image
+++ b/include/osg/Image
@@ -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; }
diff --git a/include/osg/Texture b/include/osg/Texture
index 5b5164d08..b7e489c84 100644
--- a/include/osg/Texture
+++ b/include/osg/Texture
@@ -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
         };
diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView
index 4fdaabb50..7d1409252 100644
--- a/include/osgUtil/SceneView
+++ b/include/osgUtil/SceneView
@@ -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
         };