Changeset 398 for experimental/distortionNG/DistortionSet.h

Timestamp:

Jul 7, 2012, 12:35:22 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionSet.h (modified) (2 diffs)

experimental/distortionNG/DistortionSet.h

@@ -64 +64 @@
         bool& getShowIntensityMapOnlyAsRef()    { return _showIntesityMapMapOnly;}
 
-        void setDistortionCamera(osg::Camera* camera)   { _camera = camera;}
-        osg::Camera* getDistortionCamera()      { return _camera.get(); }
+        void setSceneCamera(osg::Camera* camera)        { _sceneCamera = camera;}
+        osg::Camera* getSceneCamera()   { return _sceneCamera.get(); }
+
+        void setDistortionCamera(osg::Camera* camera)   { _distortionCamera = camera;}
+        osg::Camera* getDistortionCamera()      { return _distortionCamera.get(); }
 
         osg::Switch* getDistortionInternals()   { return _distortionInternals; }
@@ -129 +132 @@
         // These variable are therefor not saved/restored by the serializer but populated on runtime.
         bool _showIntesityMapMapOnly;   // Intensity Blending is done by a frag shader. To control it on runtime, the uniform must be bound to a central variable.
-        osg::observer_ptr<osg::Camera> _camera; // is used to pass the distortion cam from osgViewers setupDistortion() method to the manipulator.
+        osg::observer_ptr<osg::Camera> _sceneCamera;    // us used to pass the scene camera to the manipulator to allow matrix changes of the camera
+        osg::observer_ptr<osg::Camera> _distortionCamera;       // is used to pass the distortion cam from osgViewers setupDistortion() method to the manipulator.
         osg::ref_ptr<osg::Switch> _distortionInternals; // definition: child #0 = mesh, #1 = highlighter, #2 HUD