[simspark-svn] SF.net SVN: simspark:[173] branches/multiphys

[<a-...@us...>]

Revision: 173
          http://simspark.svn.sourceforge.net/simspark/?rev=173&view=rev
Author:   a-held
Date:     2010-02-25 06:59:54 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
Clean up after SVN merge

Modified Paths:
--------------
    branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
    branches/multiphys/spark/lib/oxygen/CMakeLists.txt

Modified: branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
===================================================================
--- branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp	2010-02-25 06:41:58 UTC (rev 172)
+++ branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp	2010-02-25 06:59:54 UTC (rev 173)
@@ -264,7 +264,7 @@
         double tpos = servo_target_pos[i];
         float err = servo_gain[i] * (tpos - servo_angle[i]);
 
-        joint->SetParameter(dParamVel, err);
+        joint->SetParameter(2 /*dParamVel*/, err);
 
         if (abs(err) > 0.00001)
         {

Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2010-02-25 06:41:58 UTC (rev 172)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2010-02-25 06:59:54 UTC (rev 173)
@@ -89,8 +89,8 @@
     physicsserver/int/universaljointint.h
     physicsserver/int/worldint.h
     
-    #proxyserver/agentproxy.h
-    #proxyserver/proxyserver.h
+    proxyserver/agentproxy.h
+    proxyserver/proxyserver.h
     sceneserver/sceneimporter.h
     sceneserver/basenode.h
     sceneserver/fpscontroller.h
@@ -121,8 +121,6 @@
     monitorserver/monitoritem.h
     monitorserver/custommonitor.h
     monitorserver/monitorcmdparser.h
-    proxyserver/agentproxy.h
-    proxyserver/proxyserver.h
 )
 if(SPADES_FOUND)
    set(oxygen_LIB_HDRS
@@ -229,10 +227,6 @@
     physicsserver/angularmotor.cpp
     physicsserver/angularmotor_c.cpp
     
-    proxyserver/agentproxy.cpp
-    proxyserver/proxyserver.cpp
-    proxyserver/agentproxy_c.cpp
-    proxyserver/proxyserver_c.cpp
     sceneserver/basenode.cpp
     sceneserver/basenode_c.cpp
     sceneserver/fpscontroller.cpp


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