Changeset 341 for trunk/avango-osg/include/avango/osg/TexturedQuad.h

Timestamp:

02/01/10 17:37:44 (2 years ago)

Author:

ddangelo

Message:

osg 1D texture wrapped. Added function to create an av::osg::Image node by loading an image file. TexturedQuad? now supports 1D and 2D texturing. Old functionality should not be affected. The textured quad node should definitively be refactored into multiple nodes (or a script.container node).

File:

• trunk/avango-osg/include/avango/osg/TexturedQuad.h (modified) (3 diffs)

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

@@ -34 +34 @@
 #include <avango/osg/Geometry.h>
 #include <osg/Texture2D>
+#include <avango/osg/Texture1D.h>
 #include <avango/osg/Texture2D.h>
 #include <osgDB/ReadFile>
@@ -72 +73 @@
       SFVec4 Color;
       SFVec3 Position;
-      SFTexture2D Texture;
-      //Due to backwards compatibility, thie flag indicates if the field Filename can be used to load a texture directly.
+      SFTexture1D Texture1D;
+      SFTexture2D Texture2D;
+      //Due to backwards compatibility, this flag indicates if the field Filename can be used to load a texture directly.
       //If this is set to False, the Texture field must be used directly. Default is True
       SFBool UseFilename;
@@ -99 +101 @@
       bool mColorChanged;
       bool mFilenameChanged;
-      bool mTextureChanged;
+      bool mTextureChanged1D;
+      bool mTextureChanged2D;
       bool mTexCoordsChanged;