Changeset 3295

Timestamp:

08/17/04 09:58:32 (9 years ago)

Author:

robert

Message:

From David Fries, "I added code to also check the local up vector, but
only if one of the rotation modes is selected, because autoscale isn't
affected by the camera rotations. "

Location:

OpenSceneGraph/trunk

Files:

• include/osg/AutoTransform (modified) (2 diffs)
• src/osg/AutoTransform.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/include/osg/AutoTransform

@@ -120 +120 @@
         mutable bool        _firstTimeToInitEyePoint;
         mutable osg::Vec3   _previousEyePoint;
+        mutable osg::Vec3   _previousLocalUp;
         mutable int         _previousWidth;
         mutable int         _previousHeight;        
@@ -130 +131 @@
         mutable bool        _matrixDirty;
         mutable osg::Matrix _cachedMatrix;
-        
-       
-        
 };
 

OpenSceneGraph/trunk/src/osg/AutoTransform.cpp

@@ -114 +114 @@
 
             osg::Vec3 eyePoint = cs->getEyeLocal(); 
+            osg::Vec3 localUp = cs->getUpLocal(); 
             osg::Vec3 position = getPosition();
 
@@ -123 +124 @@
                 osg::Vec3 dv = _previousEyePoint-eyePoint;
                 if (dv.length2()>getAutoUpdateEyeMovementTolerance()*(eyePoint-getPosition()).length2())
+                {
+                    doUpdate = true;
+                }
+                osg::Vec3 dupv = _previousLocalUp-localUp;
+                // rotating the camera only affects ROTATE_TO_*
+                if (_autoRotateMode &&
+                    dupv.length2()>getAutoUpdateEyeMovementTolerance())
                 {
                     doUpdate = true;
@@ -160 +168 @@
                     osg::Vec3 PosToEye = _position - eyePoint;
                     osg::Matrix lookto = osg::Matrix::lookAt(
-                        osg::Vec3(0,0,0), PosToEye, cs->getUpLocal());
+                        osg::Vec3(0,0,0), PosToEye, localUp);
                     Quat q;
                     q.set(osg::Matrix::inverse(lookto));
@@ -167 +175 @@
 
                 _previousEyePoint = eyePoint;
+                _previousLocalUp = localUp;
                 _previousWidth = width;
                 _previousHeight = height;