Changeset 11032 for OpenSceneGraph/trunk/src/osgPlugins/Inventor/PendulumCallback.cpp

Timestamp:

01/31/10 13:55:29 (3 years ago)

Author:

robert

Message:

From Jan Peciva, "I am sending improved version of Inventor plugin. Attaching just
modified files, while GroupSoLOD.h and .cpp was deleted. Please, delete
it from repository, it is not used any longer and I doubt if it is
probably not used for anything meaningful for a while. In the new code,
there is no GroupSoLOD. Please, delete it.

I am using new plugin version for about 1.5 month so I consider it
stable by myself.

List of changes:
- rewritten Inventor state stack
- shaders support
- light attenuation support
- support for reading from stream (readNode(std::istream& fin, options))
- improved grouping node handling (SoSeparator?, SoGroup?,...)
- fixed transformation bug when two SoShapes/Drawables? with different transformations are placed bellow one grouping node
- introduced preprocessing to handle more advanced usage schemes of SoLOD and SoSwitch? nodes
- unused code clean up
- improved notify messages
- animation callbacks fixes
- FindInventor?.cmake improved finding routines, support for Coin3 and Coin4"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/Inventor/PendulumCallback.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osgPlugins/Inventor/PendulumCallback.cpp

@@ -3 +3 @@
 #include "PendulumCallback.h"
 
-PendulumCallback::PendulumCallback(const osg::Vec3& axis, 
+PendulumCallback::PendulumCallback(const osg::Vec3& axis,
                                          float startAngle, float endAngle,
                                          float frequency)
@@ -11 +11 @@
     _endAngle = endAngle;
     _frequency = frequency;
-    
+
     _previousTraversalNumber = -1;
     _previousTime = -1.0;
@@ -27 +27 @@
 
     const osg::FrameStamp* fs = nv->getFrameStamp();
-    if (!fs) 
-        return; 
-    
+    if (!fs)
+        return;
+
     // ensure that we do not operate on this node more than
     // once during this traversal.  This is an issue since node
@@ -36 +36 @@
     {
         double currentTime = fs->getSimulationTime();
+        if (_previousTime == -1.)
+            _previousTime = currentTime;
         _angle += (currentTime - _previousTime) * 2 * osg::PI * _frequency;
-        
-        double frac = 0.5 + 0.5 * sin(_angle);
-        double rotAngle = _endAngle  - _startAngle - osg::PI 
+
+        double frac = 0.5 - 0.5 * cos(_angle);
+        double rotAngle = //_endAngle  - _startAngle - osg::PI
                 + (1.0 - frac) * _startAngle + frac * _endAngle;
 
         // update the specified transform
         transform->setMatrix(osg::Matrix::rotate(rotAngle, _axis));
-            
+
         _previousTraversalNumber = nv->getTraversalNumber();
         _previousTime = currentTime;
@@ -53 +55 @@
 
 }
+