Changeset 10934

Timestamp:

01/08/10 12:32:55 (3 years ago)

Author:

robert

Message:

From Rob Radtke, "I recently ran into some issues trying to save/load a scene graph as a .ive file. The problems came about because the scene graph contained depth textures in it. I have attached a patch (against the current revision: 10919) that fixes the issues that I encountered. Both attachments contain the same patch--one is a .zip file that contains the modified files and the other is a text patch file. Here is a summary of the changes I made:

1) Add getShadowComparison() accessor function to osg::Texture class
2) Modify ReaderWriterTiff::writeTifStream() and _readColor() (in Image.cpp) to handle pixelFormat==GL_DEPTH_COMPONENT as if it were GL_LUMINANCE
3) Modify the Texture classes of the ive and osg plug-ins so that they save/load the following Texture members: _use_shadow_comparison, _shadow_compare_func and _shadow_texture_mode
"

Location:

OpenSceneGraph/trunk

Files:

• include/osg/Texture (modified) (1 diff)
• src/osg/Image.cpp (modified) (1 diff)
• src/osgPlugins/ive/IveVersion.h (modified) (1 diff)
• src/osgPlugins/ive/Texture.cpp (modified) (2 diffs)
• src/osgPlugins/osg/Texture.cpp (modified) (5 diffs)
• src/osgPlugins/tiff/ReaderWriterTIFF.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/Texture

@@ -538 +538 @@
           * See http://oss.sgi.com/projects/ogl-sample/registry/ARB/shadow.txt. */
         void setShadowComparison(bool flag) { _use_shadow_comparison = flag; }
-
+        bool getShadowComparison() const { return _use_shadow_comparison; }
+        
         enum ShadowCompareFunc {
             NEVER = GL_NEVER,

OpenSceneGraph/trunk/src/osg/Image.cpp

@@ -1417 +1417 @@
     switch(pixelFormat)
     {
+        case(GL_DEPTH_COMPONENT):   //intentionally fall through and execute the code for GL_LUMINANCE
         case(GL_LUMINANCE):         { float l = float(*data++)*scale; return Vec4(l, l, l, 1.0f); }
         case(GL_ALPHA):             { float a = float(*data++)*scale; return Vec4(1.0f, 1.0f, 1.0f, a); }

OpenSceneGraph/trunk/src/osgPlugins/ive/IveVersion.h

@@ -52 +52 @@
 #define VERSION_0041 41
 #define VERSION_0042 42
+#define VERSION_0043 43
 
-#define VERSION VERSION_0042
+#define VERSION VERSION_0043
 
 /* The BYTE_SEX tag is used to check the endian

OpenSceneGraph/trunk/src/osgPlugins/ive/Texture.cpp

@@ -63 +63 @@
         out->writeInt(_sourceType);
     }
+
+    if( out->getVersion() >= VERSION_0043 )
+    {
+      out->writeBool( _use_shadow_comparison );
+      out->writeInt( _shadow_compare_func );
+      out->writeInt( _shadow_texture_mode );
+    }
 }
 
@@ -113 +120 @@
             _sourceType = in->readInt();
         }
+
+        if( in->getVersion() >= VERSION_0043 )
+        {
+          _use_shadow_comparison = in->readBool();
+          _shadow_compare_func = (osg::Texture::ShadowCompareFunc)in->readInt();
+          _shadow_texture_mode = (osg::Texture::ShadowTextureMode)in->readInt();
+        }
     }
     else

OpenSceneGraph/trunk/src/osgPlugins/osg/Texture.cpp

@@ -27 +27 @@
 bool Texture_matchSourceTypeStr(const char* str,int& value);
 const char* Texture_getSourceTypeStr(int value);
+bool Texture_matchShadowCompareFuncStr(const char* str,Texture::ShadowCompareFunc& value);
+const char* Texture_getShadowCompareFuncStr(Texture::ShadowCompareFunc value);
+bool Texture_matchShadowTextureModeStr(const char* str,Texture::ShadowTextureMode& value);
+const char* Texture_getShadowTextureModeStr(Texture::ShadowTextureMode value);
 
 // register the read and write functions with the osgDB::Registry.
@@ -202 +206 @@
     }
 
+    if (fr[0].matchWord("shadowComparison"))
+    {
+        if (fr[1].matchWord("TRUE")) 
+        {
+            texture.setShadowComparison(true);
+            fr +=2 ;
+            iteratorAdvanced = true;
+        }
+        else if (fr[1].matchWord("FALSE")) 
+        {
+            texture.setShadowComparison(false);
+            fr +=2 ;
+            iteratorAdvanced = true;
+        }
+    }
+
+    if (fr[0].matchWord("shadowCompareFunc"))
+    {
+        Texture::ShadowCompareFunc value;
+        if (Texture_matchShadowCompareFuncStr(fr[1].getStr(),value))
+        {
+            texture.setShadowCompareFunc(value);
+            fr+=2;
+            iteratorAdvanced = true;
+        }
+    }
+
+    if (fr[0].matchWord("shadowTextureMode"))
+    {
+        Texture::ShadowTextureMode value;
+        if (Texture_matchShadowTextureModeStr(fr[1].getStr(),value))
+        {
+            texture.setShadowTextureMode(value);
+            fr+=2;
+            iteratorAdvanced = true;
+        }
+    }
+
     return iteratorAdvanced;
 }
@@ -254 +296 @@
 
     fw.indent() << "resizeNonPowerOfTwo "<< (texture.getResizeNonPowerOfTwoHint()?"TRUE":"FALSE") << std::endl;
+
+    fw.indent() << "shadowComparison "<< (texture.getShadowComparison()?"TRUE":"FALSE") << std::endl;
+
+    fw.indent() << "shadowCompareFunc " << Texture_getShadowCompareFuncStr(texture.getShadowCompareFunc()) << std::endl;
+
+    fw.indent() << "shadowTextureMode " << Texture_getShadowTextureModeStr(texture.getShadowTextureMode()) << std::endl;
 
     return true;
@@ -427 +475 @@
 }
 
-
 const char* Texture_getSourceTypeStr(int value)
 {
@@ -442 +489 @@
     return NULL;
 }
+
+bool Texture_matchShadowCompareFuncStr(const char* str, Texture::ShadowCompareFunc& value)
+{
+    if (     strcmp(str,"GL_LEQUAL")==0) value = Texture::LEQUAL;
+    else if (strcmp(str,"GL_GEQUAL")==0) value = Texture::GEQUAL;
+    else return false;
+
+    return true;
+}
+
+const char* Texture_getShadowCompareFuncStr(Texture::ShadowCompareFunc value)
+{
+    switch(value)
+    {
+    case( Texture::LEQUAL ): return "GL_LEQUAL";
+    case( Texture::GEQUAL ): return "GL_GEQUAL";
+    }
+    return NULL;
+}
+
+bool Texture_matchShadowTextureModeStr(const char* str,Texture::ShadowTextureMode& value)
+{
+    if (     strcmp(str,"GL_LUMINANCE")==0) value = Texture::LUMINANCE;
+    else if (strcmp(str,"GL_INTENSITY")==0) value = Texture::INTENSITY;
+    else if (strcmp(str,"GL_ALPHA")==0) value = Texture::ALPHA;
+    else return false;
+
+    return true;
+}
+
+const char* Texture_getShadowTextureModeStr(Texture::ShadowTextureMode value)
+{
+    switch(value)
+    {
+        case( Texture::LUMINANCE ): return "GL_LUMINANCE";
+        case( Texture::INTENSITY ): return "GL_INTENSITY";
+        case( Texture::ALPHA ): return "GL_ALPHA";
+    }
+    return NULL;
+}

OpenSceneGraph/trunk/src/osgPlugins/tiff/ReaderWriterTIFF.cpp

@@ -784 +784 @@
 
             switch(img.getPixelFormat()) {
+                case GL_DEPTH_COMPONENT:
                 case GL_LUMINANCE:
                 case GL_ALPHA: