[simspark-svn] SF.net SVN: simspark:[288] trunk/spark

[<yx...@us...>]

Revision: 288
          http://simspark.svn.sourceforge.net/simspark/?rev=288&view=rev
Author:   yxu
Date:     2012-01-25 18:03:13 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
bugfix in joint feedback

Modified Paths:
--------------
    trunk/spark/lib/oxygen/physicsserver/int/jointint.h
    trunk/spark/plugin/odeimps/odehingejoint.cpp
    trunk/spark/plugin/odeimps/odehingejoint.h
    trunk/spark/plugin/odeimps/odejoint.cpp
    trunk/spark/plugin/odeimps/odejoint.h

Modified: trunk/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/jointint.h	2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/lib/oxygen/physicsserver/int/jointint.h	2012-01-25 18:03:13 UTC (rev 288)
@@ -88,7 +88,7 @@
         does not collect any feedback information.
      */
     virtual void EnableFeedback(bool enable, long jointID,
-                                boost::shared_ptr<GenericJointFeedback> feedback) = 0;
+                                boost::shared_ptr<GenericJointFeedback>& feedback) = 0;
 
     /** returns true if the joint is set to collect feedback
         information

Modified: trunk/spark/plugin/odeimps/odehingejoint.cpp
===================================================================
--- trunk/spark/plugin/odeimps/odehingejoint.cpp	2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odehingejoint.cpp	2012-01-25 18:03:13 UTC (rev 288)
@@ -32,7 +32,6 @@
 {
     dWorldID ODEWorld = (dWorldID) worldID;
     dJointID ODEJoint = dJointCreateHinge(ODEWorld, 0);
-    dJointSetFeedback( ODEJoint, &mFeedback );
     return (long) ODEJoint;
 }
 

Modified: trunk/spark/plugin/odeimps/odehingejoint.h
===================================================================
--- trunk/spark/plugin/odeimps/odehingejoint.h	2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odehingejoint.h	2012-01-25 18:03:13 UTC (rev 288)
@@ -39,9 +39,6 @@
     float GetAngle(long jointID) const;
     float GetAngleRate(long jointID) const;
     float GetTorque(long jointID) const;
-private:
-    dJointFeedback mFeedback;
-
 };
 
 DECLARE_CLASS(HingeJointImp);

Modified: trunk/spark/plugin/odeimps/odejoint.cpp
===================================================================
--- trunk/spark/plugin/odeimps/odejoint.cpp	2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odejoint.cpp	2012-01-25 18:03:13 UTC (rev 288)
@@ -74,7 +74,7 @@
 }
 
 void JointImp::EnableFeedback(bool enable, long jointID,
-                              boost::shared_ptr<GenericJointFeedback> feedback)
+                              boost::shared_ptr<GenericJointFeedback>& feedback)
 {
     dJointID JointImp = (dJointID) jointID;
 

Modified: trunk/spark/plugin/odeimps/odejoint.h
===================================================================
--- trunk/spark/plugin/odeimps/odejoint.h	2012-01-21 22:56:08 UTC (rev 287)
+++ trunk/spark/plugin/odeimps/odejoint.h	2012-01-25 18:03:13 UTC (rev 288)
@@ -42,7 +42,7 @@
     int GetType(long jointID) const;
     long GetBodyID(int idx, long jointID);
     void EnableFeedback(bool enable, long jointID, 
-                        boost::shared_ptr<oxygen::GenericJointFeedback> feedback);
+                        boost::shared_ptr<oxygen::GenericJointFeedback>& feedback);
     bool FeedbackEnabled(long jointID) const;
     salt::Vector3f GetFeedbackForce(int idx,
                                     boost::shared_ptr<oxygen::GenericJointFeedback> feedback) const;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.