Changeset 533

Timestamp:

11/18/10 18:26:02 (18 months ago)

Author:

ddangelo

Message:

Field to get the ViewMatrix? from the osg camera added

Location:

trunk/avango-osg

Files:

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

trunk/avango-osg/include/avango/osg/viewer/Camera.h

@@ -94 +94 @@
         SFDouble Near;
         SFDouble Far;
-        
+
         /**
          * Defines the background color.
          * Default is Vec4(0,0,0,1).
          */
-        SFVec4 BackgroundColor; 
+        SFVec4 BackgroundColor;
 
         /**
@@ -175 +175 @@
          */
         SFMatrix ProjectionMatrix;
+
+        /**
+         * Outputs the view matrix (modelview) of the osg camera
+         */
+        SFMatrix ViewMatrix;
 
         /**

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

@@ -127 +127 @@
   AV_FC_ADD_FIELD(Far, 500.0);
   AV_FC_ADD_FIELD(BackgroundColor, ::osg::Vec4(0.0, 0.0, 0.0, 1.0));
-  
+
   AV_FC_ADD_FIELD(ViewerTransform, ::osg::Matrix::translate(0.0, 0.0, 0.6));
   AV_FC_ADD_FIELD(ScreenTransform, ::osg::Matrix::translate(0.0, 0.0, -0.6));
@@ -140 +140 @@
   AV_FC_ADD_FIELD(MouseNearTransform, ::osg::Matrix::identity());
   AV_FC_ADD_FIELD(ProjectionMatrix, ::osg::Matrix::identity());
+  AV_FC_ADD_FIELD(ViewMatrix, ::osg::Matrix::identity());
+
 
   mOsgCamera->setReferenceFrame(::osg::Transform::ABSOLUTE_RF);
@@ -277 +279 @@
                                              ::osg::Matrix::translate(eye_trans.getTrans()) *
                                              ViewerTransform.getValue()));
+      ViewMatrix.setValue(mOsgCamera->getViewMatrix());
     }
   }