Changeset 335

Timestamp:

01/13/10 16:11:18 (2 years ago)

Author:

rkuck

Message:

CameraAttachment? can now contain an Image

Location:

trunk/avango-osg

Files:

• include/avango/osg/CameraAttachment.h (modified) (2 diffs)
• src/avango/osg/Camera.cpp (modified) (2 diffs)
• src/avango/osg/CameraAttachment.cpp (modified) (2 diffs)

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

@@ -36 +36 @@
 #include <avango/StandardFields.h>
 #include <avango/osg/Texture.h>
+#include <avango/osg/Image.h>
 
 namespace av
@@ -61 +62 @@
       SFInt InternalFormat;
       SFTexture Texture;
+      SFImage Image;
       SFUInt Level;
       SFUInt Face;

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

@@ -204 +204 @@
       if (texture) a->Texture.setValue(texture);
     }
+    if (i->second._image)
+    {
+      Image* image = dynamic_cast<Image*>(i->second._image->getUserData());
+      if (image) a->Image.setValue(image);
+    }
     a->Level.setValue(i->second._level);
     a->Face.setValue(i->second._face);
@@ -244 +249 @@
       attachment._texture = (*i)->Texture.getValue()->getOsgTexture();
     }
+    if ((*i)->Image.getValue().isValid())
+    {
+      attachment._image = (*i)->Image.getValue()->getOsgImage();
+    }
     attachment._mipMapGeneration = (*i)->MIPMapGeneration.getValue();
     attachment._multisampleSamples = (*i)->MultisampleSamples.getValue();

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

@@ -25 +25 @@
 
 #include <avango/osg/CameraAttachment.h>
-#include <avango/osg/Texture.h>
 #include <osg/Camera>
 #include <avango/Logger.h>
@@ -45 +44 @@
   AV_FC_ADD_FIELD(InternalFormat, GL_RGBA);
   AV_FC_ADD_FIELD(Texture, Link< ::av::osg::Texture >());
+  AV_FC_ADD_FIELD(Image, Link< ::av::osg::Image >());
   AV_FC_ADD_FIELD(Level, 0);
   AV_FC_ADD_FIELD(Face, 0);