Changeset 398

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (1 diff)
• DistortionSet.cpp (modified) (1 diff)
• DistortionSet.h (modified) (2 diffs)
• extViewer.cpp (modified) (1 diff)
• shaderIntensityMap.frag (modified) (1 diff)

experimental/distortionNG/DistortionManipulator.cpp

@@ -533 +533 @@
         {
                 // Get slave struct to update the offset matrixes.
-                int slaveIndex = _viewer->findSlaveIndexForCamera( _viewer->getCamera() );
-
-                _viewer->getSlave( slaveIndex )._projectionOffset = _distortionSet->getProjectionOffset();
-                _viewer->getSlave( slaveIndex )._viewOffset = _distortionSet->getViewOffset();
+                osgViewer::View::Slave* sceneSlave = _viewer->findSlaveForCamera( _distortionSet->getSceneCamera() );
+
+                sceneSlave->_projectionOffset = _distortionSet->getProjectionOffset();
+                sceneSlave->_viewOffset = _distortionSet->getViewOffset();
 
 

experimental/distortionNG/DistortionSet.cpp

@@ -40 +40 @@
         _showIntesityMapMapOnly = false;
 
-        _camera = NULL;
+        _sceneCamera = NULL;
+        _distortionCamera = NULL;
         _distortionInternals = NULL;
 

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
 

experimental/distortionNG/extViewer.cpp

@@ -259 +259 @@
         camera->attach(osg::Camera::COLOR_BUFFER, sceneTexture);
 
+                _distortionSet->setSceneCamera( camera );
+
         addSlave(camera.get(), _distortionSet->getProjectionOffset(), _distortionSet->getViewOffset() );
 

experimental/distortionNG/shaderIntensityMap.frag

@@ -7 +7 @@
 {
         vec4 blendColor = texture2DRect(intensityMapTexture, gl_FragCoord);
-        //vec4 blendColor = texture2DRect(intensityMapTexture, texCoord);
-        
         gl_FragColor = blendColor * texture2DRect( sceneTexture, texCoord) ;
 }