Changeset 338

Timestamp:

01/14/10 22:41:23 (2 years ago)

Author:

ddangelo

Message:

Fields for setting the texture coordinates of the quad corners added

Location:

trunk/avango-osg

Files:

• include/avango/osg/TexturedQuad.h (modified) (2 diffs)
• src/avango/osg/TexturedQuad.cpp (modified) (4 diffs)

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

@@ -80 +80 @@
       SFInt MagFilter;
       SFFloat MaxAnisotropy;
+      SFVec2 TexCoord01;
+      SFVec2 TexCoord00;
+      SFVec2 TexCoord10;
+      SFVec2 TexCoord11;
 
       /* virtual */ void fieldHasChangedLocalSideEffect(const av::Field& field);
@@ -96 +100 @@
       bool mFilenameChanged;
       bool mTextureChanged;
+      bool mTexCoordsChanged;
+
       ::osg::ref_ptr< ::osg::Vec3Array> mVertexArray;
       ::osg::ref_ptr< ::osg::Vec3Array> mNormals;

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

@@ -44 +44 @@
   mFilenameChanged(false),
   mTextureChanged(false),
+  mTexCoordsChanged(false),
   mVertexArray(new ::osg::Vec3Array(4)),
   mNormals(new ::osg::Vec3Array(1)),
@@ -58 +59 @@
   AV_FC_ADD_FIELD(Filename, "");
   AV_FC_ADD_FIELD(Texture, texture);
-
+  AV_FC_ADD_FIELD(TexCoord01, ::osg::Vec2(0.0f,1.0f));
+  AV_FC_ADD_FIELD(TexCoord00, ::osg::Vec2(0.0f,0.0f));
+  AV_FC_ADD_FIELD(TexCoord10, ::osg::Vec2(1.0f,0.0f));
+  AV_FC_ADD_FIELD(TexCoord11, ::osg::Vec2(1.0f,1.0f));
+
+  SFVec3 TexCoord01;
+        SFVec3 TexCoord00;
+        SFVec3 TexCoord10;
+        SFVec3 TexCoord11;
 
   AV_FC_ADD_ADAPTOR_FIELD(MinFilter,
@@ -136 +145 @@
   if (&field == &Texture)
   {
-        mTextureChanged = true;
+    mTextureChanged = true;
+  }
+
+  if (&field == &TexCoord01 || &field == &TexCoord00 || &field == &TexCoord10 || &field == &TexCoord11 )
+  {
+    mTexCoordsChanged = true;
   }
 }
@@ -165 +179 @@
   if (mTextureChanged)
   {
-        if(!UseFilename.getValue())
-        {
+    if(!UseFilename.getValue())
+    {
       getOsgGeometry()->getOrCreateStateSet()->setTextureAttributeAndModes(0,Texture.getValue()->getOsgTexture2D(),::osg::StateAttribute::ON);
     }
-        mTextureChanged = false;
+    mTextureChanged = false;
+  }
+
+  if (mTexCoordsChanged)
+  {
+    (*mTexCoords)[0] = TexCoord01.getValue();
+    (*mTexCoords)[1] = TexCoord00.getValue();
+    (*mTexCoords)[2] = TexCoord10.getValue();
+    (*mTexCoords)[3] = TexCoord11.getValue();
+    getOsgGeometry()->setTexCoordArray(0,mTexCoords.get());
+    mTexCoordsChanged = false;
   }
 }