Changeset 1983 for OpenSceneGraph/trunk/examples/osgtexturerectangle/osgtexturerectangle.cpp

Timestamp:

06/24/03 17:40:09 (10 years ago)

Author:

don

Message:

*** empty log message ***

Files:

• OpenSceneGraph/trunk/examples/osgtexturerectangle/osgtexturerectangle.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osgtexturerectangle/osgtexturerectangle.cpp

@@ -21 +21 @@
 #include <osg/Geode>
 
+#include <osg/Group>
 #include <osg/Projection>
 #include <osg/MatrixTransform>
-
 #include <osgText/Text>
 
@@ -138 +138 @@
     geom->setUseDisplayList(false);
 
-    osg::Geode* geode = new osg::Geode;
-    geode->addDrawable(geom);
-
     // setup texture
     osg::TextureRectangle* texture = new osg::TextureRectangle;
-    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP);
-    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP);
 
     // load image
     osg::Image* img = osgDB::readImageFile(filename);
     texture->setImage(img);
-    
+
+    // setup state
     osg::StateSet* state = geom->getOrCreateStateSet();
     state->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
@@ -157 +153 @@
 
     // install 'update' callback
+    osg::Geode* geode = new osg::Geode;
+    geode->addDrawable(geom);
     geode->setUpdateCallback(new TexturePanCallback(geom, img));
     
@@ -191 +189 @@
 
     // add text
-    osg::Vec3 pos(150.0f, 800.0f, 0.0f);
+    osg::Vec3 pos(120.0f, 800.0f, 0.0f);
     const osg::Vec3 delta(0.0f, -80.0f, 0.0f);
 
@@ -197 +195 @@
         "TextureRectangle Mini-HOWTO",
         "- essentially behaves like Texture2D, *except* that:",
-        "- tex coords must be non-normalized (0..width) instead of (0..1)",
-        "- wrap mode must be CLAMP, CLAMP_TO_EDGE, or CLAMP_TO_BORDER",
-        "- repeating wrap modes are *not* supported",
-        "- texture border is *not* supported",
-        "- texture mipmaps are *not* supported",
+        "- tex coords must be non-normalized (0..pixel) instead of (0..1)",
+        "- wrap modes must be CLAMP, CLAMP_TO_EDGE, or CLAMP_TO_BORDER\n  repeating wrap modes are not supported",
+        "- filter modes must be NEAREST or LINEAR since\n  mipmaps are not supported",
+        "- texture borders are not supported",
+        "- defaults should be fine",
         NULL
     };
@@ -227 +225 @@
 {
     osg::Group* root = new osg::Group;
-    
-    osg::BoundingBox bb(0.0f,0.0f,0.0f,1.0f,1.0f,1.0f);
-    root->addChild(createRectangle(bb, filename)); // XXX
+
+    if (filename != "X") {
+        osg::BoundingBox bb(0.0f,0.0f,0.0f,1.0f,1.0f,1.0f);
+        root->addChild(createRectangle(bb, filename)); // XXX
+    }
 
     root->addChild(createHUD());