[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22058] branches/itasc: iTaSC: fix compilation problems in Linux.

[Benoit Bolsee]

Revision: 22058
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22058
Author:   ben2610
Date:     2009-07-30 18:26:03 +0200 (Thu, 30 Jul 2009)

Log Message:
-----------
iTaSC: fix compilation problems in Linux.

Modified Paths:
--------------
    branches/itasc/intern/itasc/Armature.hpp
    branches/itasc/intern/itasc/CopyPose.hpp
    branches/itasc/intern/itasc/kdl/segment.hpp
    branches/itasc/source/blender/ikplugin/SConscript

Modified: branches/itasc/intern/itasc/Armature.hpp
===================================================================
--- branches/itasc/intern/itasc/Armature.hpp	2009-07-30 15:25:56 UTC (rev 22057)
+++ branches/itasc/intern/itasc/Armature.hpp	2009-07-30 16:26:03 UTC (rev 22058)
@@ -10,7 +10,7 @@
 
 #include "ControlledObject.hpp"
 #include "ConstraintSet.hpp"
-#include "kdl/TreeJntToJacSolver.hpp"
+#include "kdl/treejnttojacsolver.hpp"
 #include "kdl/treefksolverpos_recursive.hpp"
 #include <vector>
 

Modified: branches/itasc/intern/itasc/CopyPose.hpp
===================================================================
--- branches/itasc/intern/itasc/CopyPose.hpp	2009-07-30 15:25:56 UTC (rev 22057)
+++ branches/itasc/intern/itasc/CopyPose.hpp	2009-07-30 16:26:03 UTC (rev 22058)
@@ -22,7 +22,7 @@
     virtual bool initialise(Frame& init_pose);
     virtual void initCache(Cache *_cache);
     virtual void updateControlOutput(const Timestamp& timestamp);
-	virtual void CopyPose::modelUpdate(Frame& _external_pose,const Timestamp& timestamp);
+	virtual void modelUpdate(Frame& _external_pose,const Timestamp& timestamp);
 	virtual double getMaxTimestep(double& timestep);
 
 public:

Modified: branches/itasc/intern/itasc/kdl/segment.hpp
===================================================================
--- branches/itasc/intern/itasc/kdl/segment.hpp	2009-07-30 15:25:56 UTC (rev 22057)
+++ branches/itasc/intern/itasc/kdl/segment.hpp	2009-07-30 16:26:03 UTC (rev 22058)
@@ -97,7 +97,7 @@
          * @return 6D-velocity at a given point p, expressed
          * in the base-frame of the segment(root) 
          */
-	    Twist Segment::twist(const Vector& p, const double& qdot, int dof=0)const;
+	    Twist twist(const Vector& p, const double& qdot, int dof=0)const;
 
         /**
          * Request the 6D-velocity at a given frame origin, relative to base frame of the segment
@@ -109,7 +109,7 @@
          * @return 6D-velocity at frame reference point, expressed
          * in the base-frame of the segment(root) 
          */
-		Twist Segment::twist(const Frame& f, const double& qdot, int dof)const;
+		Twist twist(const Frame& f, const double& qdot, int dof)const;
 
         /**
          * Request the joint of the segment

Modified: branches/itasc/source/blender/ikplugin/SConscript
===================================================================
--- branches/itasc/source/blender/ikplugin/SConscript	2009-07-30 15:25:56 UTC (rev 22057)
+++ branches/itasc/source/blender/ikplugin/SConscript	2009-07-30 16:26:03 UTC (rev 22058)
@@ -6,4 +6,4 @@
 incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
 incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
 
-env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[5, 190] )
+env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] )