Changeset 6941 for OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

Timestamp:

06/12/07 16:20:16 (6 years ago)

Author:

robert

Message:

From Martin Lavery and Robert Osfield, Updated examples to use a variation of the MIT License

Files:

• OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -1 @@
-// -*-c++-*-
+/* OpenSceneGraph example, osgmovie.
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+*  THE SOFTWARE.
+*/
 
 #include <osgViewer/Viewer>
@@ -260 +276 @@
                                            0.0f,image->t(), image->s(),0.0f);
 
+        osg::TextureRectangle* texture = new osg::TextureRectangle(image);
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        
+        
         pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0,
-                    new osg::TextureRectangle(image),
-                    osg::StateAttribute::ON);
-                    
+                                                                        texture,
+                                                                        osg::StateAttribute::ON);
+        
         return pictureQuad;
     }
@@ -274 +295 @@
                                     
         osg::Texture2D* texture = new osg::Texture2D(image);
-        texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);  
-                                       
+        texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        
+        
         pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0,
                     texture,