Changeset 337 for trunk

Timestamp:

01/14/10 00:35:48 (2 years ago)

Author:

ddangelo

Message:

UseFilename? flag allows no either the usage of loading a texture from a file, or by specifying it via the Texture field.

Location:

trunk/avango-osg

Files:

• include/avango/osg/TexturedQuad.h (modified) (1 diff)
• src/avango/osg/TexturedQuad.cpp (modified) (3 diffs)

trunk/avango-osg/include/avango/osg/TexturedQuad.h

@@ -95 +95 @@
       bool mColorChanged;
       bool mFilenameChanged;
+      bool mTextureChanged;
       ::osg::ref_ptr< ::osg::Vec3Array> mVertexArray;
       ::osg::ref_ptr< ::osg::Vec3Array> mNormals;

trunk/avango-osg/src/avango/osg/TexturedQuad.cpp

@@ -43 +43 @@
   mColorChanged(true),
   mFilenameChanged(false),
+  mTextureChanged(false),
   mVertexArray(new ::osg::Vec3Array(4)),
   mNormals(new ::osg::Vec3Array(1)),
@@ -132 +133 @@
     mFilenameChanged = true;
   }
+
+  if (&field == &Texture)
+  {
+        mTextureChanged = true;
+  }
 }
 
@@ -155 +161 @@
     updateTexture();
     mFilenameChanged = false;
+  }
+
+  if (mTextureChanged)
+  {
+        if(!UseFilename.getValue())
+        {
+      getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture.getValue()->getOsgTexture2D(),::osg::StateAttribute::ON);
+    }
+        mTextureChanged = false;
   }
 }