Changeset 341 for trunk/avango-osg/src/avango/osg/TexturedQuad.cpp

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/src/avango/osg/TexturedQuad.cpp (modified) (16 diffs)

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

@@ -43 +43 @@
   mColorChanged(true),
   mFilenameChanged(false),
-  mTextureChanged(false),
+  mTextureChanged1D(false),
+  mTextureChanged2D(false),
   mTexCoordsChanged(false),
   mVertexArray(new ::osg::Vec3Array(4)),
@@ -50 +51 @@
   mTexCoords(new ::osg::Vec2Array(4))
 {
-  av::osg::Texture2D *texture = new av::osg::Texture2D();
+  av::osg::Texture1D *texture1D = new av::osg::Texture1D();
+  av::osg::Texture2D *texture2D = new av::osg::Texture2D();
 
   AV_FC_ADD_FIELD(Width, 1.0f);
@@ -58 +60 @@
   AV_FC_ADD_FIELD(UseFilename, true);
   AV_FC_ADD_FIELD(Filename, "");
-  AV_FC_ADD_FIELD(Texture, texture);
+  AV_FC_ADD_FIELD(Texture1D, texture1D);
+  AV_FC_ADD_FIELD(Texture2D, texture2D);
   AV_FC_ADD_FIELD(TexCoord01, ::osg::Vec2(0.0f,1.0f));
   AV_FC_ADD_FIELD(TexCoord00, ::osg::Vec2(0.0f,0.0f));
@@ -65 +68 @@
 
   SFVec3 TexCoord01;
-        SFVec3 TexCoord00;
-        SFVec3 TexCoord10;
-        SFVec3 TexCoord11;
+  SFVec3 TexCoord00;
+  SFVec3 TexCoord10;
+  SFVec3 TexCoord11;
 
   AV_FC_ADD_ADAPTOR_FIELD(MinFilter,
@@ -94 +97 @@
   (*mTexCoords)[3].set(1.0f,1.0f);
   getOsgGeometry()->setTexCoordArray(0,mTexCoords.get());
-  getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture.getValue()->getOsgTexture2D(),::osg::StateAttribute::ON);
 
   // set up texture
-  Texture.getValue()->getOsgTexture2D()->setWrap(::osg::Texture::WRAP_S, ::osg::Texture::CLAMP_TO_EDGE);
-  Texture.getValue()->getOsgTexture2D()->setWrap(::osg::Texture::WRAP_T, ::osg::Texture::CLAMP_TO_EDGE);
+  Texture2D.getValue()->getOsgTexture2D()->setWrap(::osg::Texture::WRAP_S, ::osg::Texture::CLAMP_TO_EDGE);
+  Texture2D.getValue()->getOsgTexture2D()->setWrap(::osg::Texture::WRAP_T, ::osg::Texture::CLAMP_TO_EDGE);
 }
 
@@ -143 +145 @@
   }
 
-  if (&field == &Texture)
-  {
-    mTextureChanged = true;
+  if (&field == &Texture1D)
+  {
+    mTextureChanged1D = true;
+  }
+
+  if (&field == &Texture2D)
+  {
+    mTextureChanged2D = true;
   }
 
@@ -171 +178 @@
   }
 
-  if (mFilenameChanged)
+  if (mFilenameChanged && UseFilename.getValue())
   {
     updateTexture();
@@ -177 +184 @@
   }
 
-  if (mTextureChanged)
-  {
-    if(!UseFilename.getValue())
-    {
-      getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture.getValue()->getOsgTexture2D(),::osg::StateAttribute::ON);
-    }
-    mTextureChanged = false;
+  if (mTextureChanged1D && !UseFilename.getValue())
+  {
+    getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture1D.getValue()->getOsgTexture1D(),::osg::StateAttribute::ON);
+    mTextureChanged1D = false;
+  }
+
+  if (mTextureChanged2D && !UseFilename.getValue())
+  {
+    getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture2D.getValue()->getOsgTexture2D(),::osg::StateAttribute::ON);
+    mTextureChanged2D = false;
   }
 
@@ -199 +209 @@
 ::osg::ref_ptr< ::osg::Texture2D>
 av::osg::TexturedQuad::getOsgTexture() const {
-  ::osg::ref_ptr< ::osg::Texture2D> tex = Texture.getValue()->getOsgTexture2D();
+  ::osg::ref_ptr< ::osg::Texture2D> tex = Texture2D.getValue()->getOsgTexture2D();
   return tex;
 }
@@ -225 +235 @@
   if(Filename.getValue().size() != 0 && UseFilename.getValue())
   {
-    Texture.getValue()->getOsgTexture2D()->setImage(::osgDB::readImageFile(Filename.getValue()));
+    Texture2D.getValue()->getOsgTexture2D()->setImage(::osgDB::readImageFile(Filename.getValue()));
+    getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture2D.getValue()->getOsgTexture2D(),::osg::StateAttribute::ON);
   }
 }
@@ -240 +251 @@
 av::osg::TexturedQuad::getMinFilterCB(const av::SFInt::GetValueEvent& event)
 {
-  *(event.getValuePtr()) = Texture.getValue()->getOsgTexture2D()->getFilter(::osg::Texture2D::MIN_FILTER);
+  *(event.getValuePtr()) = Texture2D.getValue()->getOsgTexture2D()->getFilter(::osg::Texture2D::MIN_FILTER);
 }
 
@@ -246 +257 @@
 av::osg::TexturedQuad::setMinFilterCB(const av::SFInt::SetValueEvent& event)
 {
-        Texture.getValue()->getOsgTexture2D()->setFilter(::osg::Texture2D::MIN_FILTER,(::osg::Texture::FilterMode)(event.getValue()));
+        Texture2D.getValue()->getOsgTexture2D()->setFilter(::osg::Texture2D::MIN_FILTER,(::osg::Texture2D::FilterMode)(event.getValue()));
 }
 
@@ -252 +263 @@
 av::osg::TexturedQuad::getMagFilterCB(const av::SFInt::GetValueEvent& event)
 {
-  *(event.getValuePtr()) = Texture.getValue()->getOsgTexture2D()->getFilter(::osg::Texture2D::MAG_FILTER);
+  *(event.getValuePtr()) = Texture2D.getValue()->getOsgTexture2D()->getFilter(::osg::Texture2D::MAG_FILTER);
 }
 
@@ -258 +269 @@
 av::osg::TexturedQuad::setMagFilterCB(const av::SFInt::SetValueEvent& event)
 {
-  Texture.getValue()->getOsgTexture2D()->setFilter(::osg::Texture2D::MAG_FILTER,(::osg::Texture::FilterMode)(event.getValue()));
+  Texture2D.getValue()->getOsgTexture2D()->setFilter(::osg::Texture2D::MAG_FILTER,(::osg::Texture2D::FilterMode)(event.getValue()));
 }
 
@@ -264 +275 @@
 av::osg::TexturedQuad::getMaxAnisotropyCB(const av::SFFloat::GetValueEvent& event)
 {
-  *(event.getValuePtr()) = Texture.getValue()->getOsgTexture2D()->getMaxAnisotropy();
+  *(event.getValuePtr()) = Texture2D.getValue()->getOsgTexture2D()->getMaxAnisotropy();
 }
 
@@ -270 +281 @@
 av::osg::TexturedQuad::setMaxAnisotropyCB(const av::SFFloat::SetValueEvent& event)
 {
-  Texture.getValue()->getOsgTexture2D()->setMaxAnisotropy(event.getValue());
-}
+  Texture2D.getValue()->getOsgTexture2D()->setMaxAnisotropy(event.getValue());
+}