Changeset 361

Timestamp:

10/23/06 12:00:56 (2 years ago)

Author:

dshipton

Message:

This getWorldToCamera doesn't work.

Files:

• branches/Dirk_RenderTraversalWork/Source/System/RenderingBackend/OSGDrawEnv.h (modified) (2 diffs)
• branches/Dirk_RenderTraversalWork/Source/System/RenderingBackend/OSGDrawEnv.inl (modified) (2 diffs)

branches/Dirk_RenderTraversalWork/Source/System/RenderingBackend/OSGDrawEnv.h

@@ -107 +107 @@
-
-    const Matrixr  &getObjectToWorld        (void         ) const;
+
+    const Matrixr  &getWorldToScreen        (void         ) const;
-
-          Real      getCameraNear           (void         ) const;
@@ -176 +178 @@
-    Matrixr        _cameraToWorld;
-    Matrixr        _objectToWorld;
+    Matrixr        _worldToScreen;
-
-    Real           _cameraNear;

branches/Dirk_RenderTraversalWork/Source/System/RenderingBackend/OSGDrawEnv.inl

@@ -79 +79 @@
-{
-    _cameraViewing = matrix;
+    _worldToScreen.setValue(_cameraProjection);
+    _worldToScreen.mult(_cameraProjectionTrans);
+    _worldToScreen.mult(_cameraViewing);
-    
-    _cameraToWorld.invertFrom(matrix);
-}
-
@@ -106 +108 @@
-{
-    _aActiveTexTargets[uiSlot] = uiTarget;
+}
+
+inline
+const Matrixr &DrawEnv::getWorldToScreen(void) const
+{
+    return _cameraToWorld;
-}
-