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

Timestamp:

01/14/10 00:05:49 (2 years ago)

Author:

ddangelo

Message:

Field for setting the 2D texture of the Quad added. To be backward compatible and to avoid confusion, a bool field which controls the functionality to load a texture directly from an image file added. Default is true, so no existing code should break. If set to false, the field Filename will be ignored and the Texture field must be used to set the texture of the Quad.

File:

• trunk/avango-osg/src/avango/osg/TexturedQuad.cpp (modified) (10 diffs)

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

@@ -46 +46 @@
   mNormals(new ::osg::Vec3Array(1)),
   mColors(new ::osg::Vec4Array(1)),
-  mTexCoords(new ::osg::Vec2Array(4)),
-  mOsgTexture(new ::osg::Texture2D)
-{
+  mTexCoords(new ::osg::Vec2Array(4))
+{
+  av::osg::Texture2D *texture = new av::osg::Texture2D();
+
   AV_FC_ADD_FIELD(Width, 1.0f);
   AV_FC_ADD_FIELD(Height, 1.0f);
   AV_FC_ADD_FIELD(Color, ::osg::Vec4(1,1,1,1));
   AV_FC_ADD_FIELD(Position, ::osg::Vec3(0,0,0));
+  AV_FC_ADD_FIELD(UseFilename, true);
   AV_FC_ADD_FIELD(Filename, "");
+  AV_FC_ADD_FIELD(Texture, texture);
+
 
   AV_FC_ADD_ADAPTOR_FIELD(MinFilter,
@@ -80 +84 @@
   (*mTexCoords)[3].set(1.0f,1.0f);
   getOsgGeometry()->setTexCoordArray(0,mTexCoords.get());
-  getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,mOsgTexture.get(),::osg::StateAttribute::ON);
+  getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture.getValue()->getOsgTexture2D(),::osg::StateAttribute::ON);
 
   // set up texture
-  mOsgTexture->setWrap(::osg::Texture::WRAP_S, ::osg::Texture::CLAMP_TO_EDGE);
-  mOsgTexture->setWrap(::osg::Texture::WRAP_T, ::osg::Texture::CLAMP_TO_EDGE);
+  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);
 }
 
@@ -156 +160 @@
 ::osg::ref_ptr< ::osg::Texture2D>
 av::osg::TexturedQuad::getOsgTexture() const {
-  return mOsgTexture;
+  ::osg::ref_ptr< ::osg::Texture2D> tex = Texture.getValue()->getOsgTexture2D();
+  return tex;
 }
 
@@ -179 +184 @@
 av::osg::TexturedQuad::updateTexture()
 {
-  if(Filename.getValue().size() != 0)
-  {
-    mOsgTexture->setImage(::osgDB::readImageFile(Filename.getValue()));
+  if(Filename.getValue().size() != 0 && UseFilename.getValue())
+  {
+    Texture.getValue()->getOsgTexture2D()->setImage(::osgDB::readImageFile(Filename.getValue()));
   }
 }
@@ -196 +201 @@
 av::osg::TexturedQuad::getMinFilterCB(const av::SFInt::GetValueEvent& event)
 {
-  *(event.getValuePtr()) = mOsgTexture->getFilter(::osg::Texture2D::MIN_FILTER);
+  *(event.getValuePtr()) = Texture.getValue()->getOsgTexture2D()->getFilter(::osg::Texture2D::MIN_FILTER);
 }
 
@@ -202 +207 @@
 av::osg::TexturedQuad::setMinFilterCB(const av::SFInt::SetValueEvent& event)
 {
-  mOsgTexture->setFilter(::osg::Texture2D::MIN_FILTER,(::osg::Texture::FilterMode)(event.getValue()));
+        Texture.getValue()->getOsgTexture2D()->setFilter(::osg::Texture2D::MIN_FILTER,(::osg::Texture::FilterMode)(event.getValue()));
 }
 
@@ -208 +213 @@
 av::osg::TexturedQuad::getMagFilterCB(const av::SFInt::GetValueEvent& event)
 {
-  *(event.getValuePtr()) = mOsgTexture->getFilter(::osg::Texture2D::MAG_FILTER);
+  *(event.getValuePtr()) = Texture.getValue()->getOsgTexture2D()->getFilter(::osg::Texture2D::MAG_FILTER);
 }
 
@@ -214 +219 @@
 av::osg::TexturedQuad::setMagFilterCB(const av::SFInt::SetValueEvent& event)
 {
-  mOsgTexture->setFilter(::osg::Texture2D::MAG_FILTER,(::osg::Texture::FilterMode)(event.getValue()));
+  Texture.getValue()->getOsgTexture2D()->setFilter(::osg::Texture2D::MAG_FILTER,(::osg::Texture::FilterMode)(event.getValue()));
 }
 
@@ -220 +225 @@
 av::osg::TexturedQuad::getMaxAnisotropyCB(const av::SFFloat::GetValueEvent& event)
 {
-  *(event.getValuePtr()) = mOsgTexture->getMaxAnisotropy();
+  *(event.getValuePtr()) = Texture.getValue()->getOsgTexture2D()->getMaxAnisotropy();
 }
 
@@ -226 +231 @@
 av::osg::TexturedQuad::setMaxAnisotropyCB(const av::SFFloat::SetValueEvent& event)
 {
-  mOsgTexture->setMaxAnisotropy(event.getValue());
-}
+  Texture.getValue()->getOsgTexture2D()->setMaxAnisotropy(event.getValue());
+}