Changeset 9858 for OpenSceneGraph/trunk/src/osgDB/ReadFile.cpp

Timestamp:

03/04/09 14:24:36 (4 years ago)

Author:

robert

Message:

Added handling of ImageStream? Origin to make sure the movie always appears the correct way up.

Files:

• OpenSceneGraph/trunk/src/osgDB/ReadFile.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgDB/ReadFile.cpp

@@ -159 +159 @@
         if (imageStream.valid())
         {
+            bool flip = image->getOrigin()==osg::Image::TOP_LEFT;
+
             // start the stream playing.
             imageStream->play();
@@ -170 +172 @@
                                                    osg::Vec3(image->s(),0.0f,0.0f),
                                                    osg::Vec3(0.0f,0.0f,image->t()),
-                                                   0.0f,image->t(), image->s(),0.0f);
+                                                   0.0f, flip ? image->t() : 0.0, image->s(), flip ? 0.0 : image->t());
 
                 pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0,
@@ -181 +183 @@
                                                    osg::Vec3(image->s(),0.0f,0.0f),
                                                    osg::Vec3(0.0f,0.0f,image->t()),
-                                                   0.0f,0.0f, 1.0f,1.0f);
+                                                   0.0f, flip ? 1.0f : 0.0f , 1.0f, flip ? 0.0f : 1.0f);
 
                 pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0,