Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[176] trunk
|
From: <a-...@us...> - 2010-02-25 13:10:00
|
Revision: 176
http://simspark.svn.sourceforge.net/simspark/?rev=176&view=rev
Author: a-held
Date: 2010-02-25 12:19:37 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
merge branch into trunk after a long day of hard work...
Modified Paths:
--------------
trunk/rcssserver3d/data/rsg/agent/ball.rsg
trunk/rcssserver3d/data/rsg/agent/hoap2.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
trunk/rcssserver3d/doc/users/robots.tex
trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
trunk/rcssserver3d/plugin/soccer/ball/ball.h
trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.h
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.h
trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h
trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h
trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h
trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.h
trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.h
trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinput.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinput.h
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/rcssserver3d/main.cpp
trunk/rcssserver3d/rcssserver3d/rcsoccersim3d.in
trunk/rsgedit/src/property.cpp
trunk/rsgedit/src/sparkglrender.cpp
trunk/simspark-utilities/data/rsg/agent/ball.rsg
trunk/spark/RELEASE
trunk/spark/data/ros/aibo.rsi
trunk/spark/data/ros/blockworld.ros
trunk/spark/data/rsg/boxspheres/box.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler055.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler056.rsg
trunk/spark/data/rsg/boxspheres/simspark.rsg
trunk/spark/data/rsg/boxspheres/sphere.rsg
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/kerosin/kerosin.cpp
trunk/spark/lib/kerosin/kerosin.h
trunk/spark/lib/kerosin/renderserver/renderserver.cpp
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.cpp
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.h
trunk/spark/lib/oxygen/oxygen.cpp
trunk/spark/lib/oxygen/oxygen.h
trunk/spark/lib/oxygen/physicsserver/angularmotor.cpp
trunk/spark/lib/oxygen/physicsserver/angularmotor.h
trunk/spark/lib/oxygen/physicsserver/angularmotor_c.cpp
trunk/spark/lib/oxygen/physicsserver/balljoint.cpp
trunk/spark/lib/oxygen/physicsserver/balljoint.h
trunk/spark/lib/oxygen/physicsserver/balljoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/body.cpp
trunk/spark/lib/oxygen/physicsserver/body.h
trunk/spark/lib/oxygen/physicsserver/body_c.cpp
trunk/spark/lib/oxygen/physicsserver/bodycontroller.cpp
trunk/spark/lib/oxygen/physicsserver/bodycontroller.h
trunk/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/boxcollider.cpp
trunk/spark/lib/oxygen/physicsserver/boxcollider.h
trunk/spark/lib/oxygen/physicsserver/boxcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/collider.cpp
trunk/spark/lib/oxygen/physicsserver/collider.h
trunk/spark/lib/oxygen/physicsserver/collider_c.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.h
trunk/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.h
trunk/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/dragcontroller.cpp
trunk/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/fixedjoint.cpp
trunk/spark/lib/oxygen/physicsserver/fixedjoint.h
trunk/spark/lib/oxygen/physicsserver/fixedjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/hinge2joint.cpp
trunk/spark/lib/oxygen/physicsserver/hinge2joint.h
trunk/spark/lib/oxygen/physicsserver/hinge2joint_c.cpp
trunk/spark/lib/oxygen/physicsserver/hingejoint.cpp
trunk/spark/lib/oxygen/physicsserver/hingejoint.h
trunk/spark/lib/oxygen/physicsserver/hingejoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/joint.cpp
trunk/spark/lib/oxygen/physicsserver/joint.h
trunk/spark/lib/oxygen/physicsserver/joint_c.cpp
trunk/spark/lib/oxygen/physicsserver/physicsserver.cpp
trunk/spark/lib/oxygen/physicsserver/physicsserver.h
trunk/spark/lib/oxygen/physicsserver/physicsserver_c.cpp
trunk/spark/lib/oxygen/physicsserver/planecollider.cpp
trunk/spark/lib/oxygen/physicsserver/planecollider.h
trunk/spark/lib/oxygen/physicsserver/planecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/raycollider.cpp
trunk/spark/lib/oxygen/physicsserver/raycollider.h
trunk/spark/lib/oxygen/physicsserver/raycollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/recorderhandler.cpp
trunk/spark/lib/oxygen/physicsserver/recorderhandler.h
trunk/spark/lib/oxygen/physicsserver/recorderhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.h
trunk/spark/lib/oxygen/physicsserver/sliderjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/space.cpp
trunk/spark/lib/oxygen/physicsserver/space.h
trunk/spark/lib/oxygen/physicsserver/space_c.cpp
trunk/spark/lib/oxygen/physicsserver/spherecollider.cpp
trunk/spark/lib/oxygen/physicsserver/spherecollider.h
trunk/spark/lib/oxygen/physicsserver/spherecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/transformcollider.cpp
trunk/spark/lib/oxygen/physicsserver/transformcollider.h
trunk/spark/lib/oxygen/physicsserver/transformcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/universaljoint.cpp
trunk/spark/lib/oxygen/physicsserver/universaljoint.h
trunk/spark/lib/oxygen/physicsserver/universaljoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/velocitycontroller.cpp
trunk/spark/lib/oxygen/physicsserver/velocitycontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/world.cpp
trunk/spark/lib/oxygen/physicsserver/world.h
trunk/spark/lib/oxygen/physicsserver/world_c.cpp
trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp
trunk/spark/lib/oxygen/sceneserver/fpscontroller.cpp
trunk/spark/lib/oxygen/sceneserver/sceneserver.cpp
trunk/spark/lib/oxygen/sceneserver/sceneserver.h
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/accelerometer/CMakeLists.txt
trunk/spark/plugin/accelerometer/accelerometer.cpp
trunk/spark/plugin/accelerometer/accelerometer.h
trunk/spark/plugin/collisionperceptor/forceresistanceperceptor.cpp
trunk/spark/plugin/collisionperceptor/forceresistanceperceptor.h
trunk/spark/plugin/collisionperceptor/perceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/perceptorhandler.h
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.h
trunk/spark/plugin/forceeffector/forceeffector.cpp
trunk/spark/plugin/forceeffector/forceeffector.h
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.cpp
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.h
trunk/spark/plugin/rosimporter/roselements.cpp
trunk/spark/plugin/rosimporter/roselements.h
trunk/spark/plugin/rosimporter/rosimporter.cpp
trunk/spark/plugin/rosimporter/rosimporter.h
trunk/spark/plugin/sparkagent/hinge2effector.cpp
trunk/spark/plugin/sparkagent/hingeeffector.cpp
trunk/spark/plugin/sparkagent/universaljointeffector.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorclient.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
trunk/spark/spark/spark.rb
trunk/spark/test/scenetest/script/scenetest.rb
Added Paths:
-----------
trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg
trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
trunk/spark/data/rsg/boxspheres/capsule.rsg
trunk/spark/data/rsg/boxspheres/staticcapsule.rsg
trunk/spark/lib/kerosin/sceneserver/capsule.cpp
trunk/spark/lib/kerosin/sceneserver/capsule.h
trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.h
trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.h
trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.h
trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.h
trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h
trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.h
trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.h
trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.h
trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.h
trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
trunk/spark/lib/oxygen/physicsserver/int/
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
trunk/spark/lib/oxygen/physicsserver/physicsobject.h
trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.h
trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.h
trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.h
trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp
trunk/spark/plugin/odeimps/
trunk/spark/plugin/odeimps/CMakeLists.txt
trunk/spark/plugin/odeimps/export.cpp
trunk/spark/plugin/odeimps/odeangularmotor.cpp
trunk/spark/plugin/odeimps/odeangularmotor.h
trunk/spark/plugin/odeimps/odeangularmotor_c.cpp
trunk/spark/plugin/odeimps/odeballjoint.cpp
trunk/spark/plugin/odeimps/odeballjoint.h
trunk/spark/plugin/odeimps/odeballjoint_c.cpp
trunk/spark/plugin/odeimps/odebody.cpp
trunk/spark/plugin/odeimps/odebody.h
trunk/spark/plugin/odeimps/odebody_c.cpp
trunk/spark/plugin/odeimps/odeboxcollider.cpp
trunk/spark/plugin/odeimps/odeboxcollider.h
trunk/spark/plugin/odeimps/odeboxcollider_c.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.h
trunk/spark/plugin/odeimps/odecapsulecollider_c.cpp
trunk/spark/plugin/odeimps/odecollider.cpp
trunk/spark/plugin/odeimps/odecollider.h
trunk/spark/plugin/odeimps/odecollider_c.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.h
trunk/spark/plugin/odeimps/odecompoundcollider_c.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.h
trunk/spark/plugin/odeimps/odeconcavecollider_c.cpp
trunk/spark/plugin/odeimps/odeconecollider.cpp
trunk/spark/plugin/odeimps/odeconecollider.h
trunk/spark/plugin/odeimps/odeconecollider_c.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.h
trunk/spark/plugin/odeimps/odeconetwistjoint_c.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.h
trunk/spark/plugin/odeimps/odecontactjointhandler_c.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.h
trunk/spark/plugin/odeimps/odeconvexcollider_c.cpp
trunk/spark/plugin/odeimps/odecylindercollider.cpp
trunk/spark/plugin/odeimps/odecylindercollider.h
trunk/spark/plugin/odeimps/odecylindercollider_c.cpp
trunk/spark/plugin/odeimps/odedynamicbody.cpp
trunk/spark/plugin/odeimps/odedynamicbody.h
trunk/spark/plugin/odeimps/odedynamicbody_c.cpp
trunk/spark/plugin/odeimps/odeemptycollider.cpp
trunk/spark/plugin/odeimps/odeemptycollider.h
trunk/spark/plugin/odeimps/odeemptycollider_c.cpp
trunk/spark/plugin/odeimps/odefixedjoint.cpp
trunk/spark/plugin/odeimps/odefixedjoint.h
trunk/spark/plugin/odeimps/odefixedjoint_c.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.h
trunk/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
trunk/spark/plugin/odeimps/odehinge2joint.cpp
trunk/spark/plugin/odeimps/odehinge2joint.h
trunk/spark/plugin/odeimps/odehinge2joint_c.cpp
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odehingejoint_c.cpp
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
trunk/spark/plugin/odeimps/odejoint_c.cpp
trunk/spark/plugin/odeimps/odephysicsobject.cpp
trunk/spark/plugin/odeimps/odephysicsobject.h
trunk/spark/plugin/odeimps/odephysicsobject_c.cpp
trunk/spark/plugin/odeimps/odephysicsserver.cpp
trunk/spark/plugin/odeimps/odephysicsserver.h
trunk/spark/plugin/odeimps/odephysicsserver_c.cpp
trunk/spark/plugin/odeimps/odeplanecollider.cpp
trunk/spark/plugin/odeimps/odeplanecollider.h
trunk/spark/plugin/odeimps/odeplanecollider_c.cpp
trunk/spark/plugin/odeimps/oderaycollider.cpp
trunk/spark/plugin/odeimps/oderaycollider.h
trunk/spark/plugin/odeimps/oderaycollider_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
trunk/spark/plugin/odeimps/oderigidbody_c.cpp
trunk/spark/plugin/odeimps/odesliderjoint.cpp
trunk/spark/plugin/odeimps/odesliderjoint.h
trunk/spark/plugin/odeimps/odesliderjoint_c.cpp
trunk/spark/plugin/odeimps/odesoftbody.cpp
trunk/spark/plugin/odeimps/odesoftbody.h
trunk/spark/plugin/odeimps/odesoftbody_c.cpp
trunk/spark/plugin/odeimps/odespace.cpp
trunk/spark/plugin/odeimps/odespace.h
trunk/spark/plugin/odeimps/odespace_c.cpp
trunk/spark/plugin/odeimps/odespherecollider.cpp
trunk/spark/plugin/odeimps/odespherecollider.h
trunk/spark/plugin/odeimps/odespherecollider_c.cpp
trunk/spark/plugin/odeimps/odestaticbody.cpp
trunk/spark/plugin/odeimps/odestaticbody.h
trunk/spark/plugin/odeimps/odestaticbody_c.cpp
trunk/spark/plugin/odeimps/odetransformcollider.cpp
trunk/spark/plugin/odeimps/odetransformcollider.h
trunk/spark/plugin/odeimps/odetransformcollider_c.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.h
trunk/spark/plugin/odeimps/odeuniversaljoint_c.cpp
trunk/spark/plugin/odeimps/odeworld.cpp
trunk/spark/plugin/odeimps/odeworld.h
trunk/spark/plugin/odeimps/odeworld_c.cpp
trunk/spark/plugin/odeimps/odewrapper.h
Removed Paths:
-------------
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
trunk/spark/data/rsg/boxspheres/ccylinder.rsg
trunk/spark/data/rsg/boxspheres/staticccylinder.rsg
trunk/spark/lib/kerosin/sceneserver/ccylinder.cpp
trunk/spark/lib/kerosin/sceneserver/ccylinder.h
trunk/spark/lib/kerosin/sceneserver/ccylinder_c.cpp
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
trunk/spark/plugin/odeimps/CMakeLists.txt
trunk/spark/plugin/odeimps/export.cpp
trunk/spark/plugin/odeimps/odeangularmotor.cpp
trunk/spark/plugin/odeimps/odeangularmotor.h
trunk/spark/plugin/odeimps/odeangularmotor_c.cpp
trunk/spark/plugin/odeimps/odeballjoint.cpp
trunk/spark/plugin/odeimps/odeballjoint.h
trunk/spark/plugin/odeimps/odeballjoint_c.cpp
trunk/spark/plugin/odeimps/odebody.cpp
trunk/spark/plugin/odeimps/odebody.h
trunk/spark/plugin/odeimps/odebody_c.cpp
trunk/spark/plugin/odeimps/odeboxcollider.cpp
trunk/spark/plugin/odeimps/odeboxcollider.h
trunk/spark/plugin/odeimps/odeboxcollider_c.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.h
trunk/spark/plugin/odeimps/odecapsulecollider_c.cpp
trunk/spark/plugin/odeimps/odecollider.cpp
trunk/spark/plugin/odeimps/odecollider.h
trunk/spark/plugin/odeimps/odecollider_c.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.h
trunk/spark/plugin/odeimps/odecompoundcollider_c.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.h
trunk/spark/plugin/odeimps/odeconcavecollider_c.cpp
trunk/spark/plugin/odeimps/odeconecollider.cpp
trunk/spark/plugin/odeimps/odeconecollider.h
trunk/spark/plugin/odeimps/odeconecollider_c.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.h
trunk/spark/plugin/odeimps/odeconetwistjoint_c.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.h
trunk/spark/plugin/odeimps/odecontactjointhandler_c.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.h
trunk/spark/plugin/odeimps/odeconvexcollider_c.cpp
trunk/spark/plugin/odeimps/odecylindercollider.cpp
trunk/spark/plugin/odeimps/odecylindercollider.h
trunk/spark/plugin/odeimps/odecylindercollider_c.cpp
trunk/spark/plugin/odeimps/odedynamicbody.cpp
trunk/spark/plugin/odeimps/odedynamicbody.h
trunk/spark/plugin/odeimps/odedynamicbody_c.cpp
trunk/spark/plugin/odeimps/odeemptycollider.cpp
trunk/spark/plugin/odeimps/odeemptycollider.h
trunk/spark/plugin/odeimps/odeemptycollider_c.cpp
trunk/spark/plugin/odeimps/odefixedjoint.cpp
trunk/spark/plugin/odeimps/odefixedjoint.h
trunk/spark/plugin/odeimps/odefixedjoint_c.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.h
trunk/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
trunk/spark/plugin/odeimps/odehinge2joint.cpp
trunk/spark/plugin/odeimps/odehinge2joint.h
trunk/spark/plugin/odeimps/odehinge2joint_c.cpp
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odehingejoint_c.cpp
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
trunk/spark/plugin/odeimps/odejoint_c.cpp
trunk/spark/plugin/odeimps/odephysicsobject.cpp
trunk/spark/plugin/odeimps/odephysicsobject.h
trunk/spark/plugin/odeimps/odephysicsobject_c.cpp
trunk/spark/plugin/odeimps/odephysicsserver.cpp
trunk/spark/plugin/odeimps/odephysicsserver.h
trunk/spark/plugin/odeimps/odephysicsserver_c.cpp
trunk/spark/plugin/odeimps/odeplanecollider.cpp
trunk/spark/plugin/odeimps/odeplanecollider.h
trunk/spark/plugin/odeimps/odeplanecollider_c.cpp
trunk/spark/plugin/odeimps/oderaycollider.cpp
trunk/spark/plugin/odeimps/oderaycollider.h
trunk/spark/plugin/odeimps/oderaycollider_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
trunk/spark/plugin/odeimps/oderigidbody_c.cpp
trunk/spark/plugin/odeimps/odesliderjoint.cpp
trunk/spark/plugin/odeimps/odesliderjoint.h
trunk/spark/plugin/odeimps/odesliderjoint_c.cpp
trunk/spark/plugin/odeimps/odesoftbody.cpp
trunk/spark/plugin/odeimps/odesoftbody.h
trunk/spark/plugin/odeimps/odesoftbody_c.cpp
trunk/spark/plugin/odeimps/odespace.cpp
trunk/spark/plugin/odeimps/odespace.h
trunk/spark/plugin/odeimps/odespace_c.cpp
trunk/spark/plugin/odeimps/odespherecollider.cpp
trunk/spark/plugin/odeimps/odespherecollider.h
trunk/spark/plugin/odeimps/odespherecollider_c.cpp
trunk/spark/plugin/odeimps/odestaticbody.cpp
trunk/spark/plugin/odeimps/odestaticbody.h
trunk/spark/plugin/odeimps/odestaticbody_c.cpp
trunk/spark/plugin/odeimps/odetransformcollider.cpp
trunk/spark/plugin/odeimps/odetransformcollider.h
trunk/spark/plugin/odeimps/odetransformcollider_c.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.h
trunk/spark/plugin/odeimps/odeuniversaljoint_c.cpp
trunk/spark/plugin/odeimps/odeworld.cpp
trunk/spark/plugin/odeimps/odeworld.h
trunk/spark/plugin/odeimps/odeworld_c.cpp
trunk/spark/plugin/odeimps/odewrapper.h
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/treehole:175
Modified: trunk/rcssserver3d/data/rsg/agent/ball.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -15,7 +15,7 @@
(setScale $Radius $Radius $Radius)
)
- (nd Body
+ (nd RigidBody
(setName physics)
(setSphereTotal $Mass $Radius)
Modified: trunk/rcssserver3d/data/rsg/agent/hoap2.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -142,7 +142,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -151,7 +151,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -373,7 +373,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -410,7 +410,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
@@ -16,4 +16,4 @@
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
-)
\ No newline at end of file
+)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,11 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $material)
+
+ (nd Capsule
+ (setParams $radius $length)
+ (setMaterial $material)
+ )
+)
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,19 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius $length)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+
+ (nd CapsuleCollider
+ (setParams $radius $length)
+
+ (importScene rsg/agent/nao/contactjointhandler.rsg)
+ )
+ )
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,13 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+)
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,11 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $material)
-
- (nd CCylinder
- (setParams $radius $length)
- (setMaterial $material)
- )
-)
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,19 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius $length)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-
- (nd CCylinderCollider
- (setParams $radius $length)
-
- (importScene rsg/agent/nao/contactjointhandler.rsg)
- )
- )
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,13 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -43,12 +43,12 @@
(setName neck)
(setLocalPos $Neck_X $Neck_Y $Neck_Z)
- (importScene rsg/agent/nao/ccylinder_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
- (importScene rsg/agent/nao/ccylinder_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
+ (importScene rsg/agent/nao/capsule_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
+ (importScene rsg/agent/nao/capsule_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
(importScene rsg/agent/nao/hingejoint.rsg
hj1 he1
- ../ccylinderBody ../../body/boxBody
+ ../capsuleBody ../../body/boxBody
0 0 0
0 0 1
$he1_min $he1_max)
@@ -80,7 +80,7 @@
(importScene rsg/agent/nao/hingejoint.rsg
hj2 he2
- ../sphereBody ../../neck/ccylinderBody
+ ../sphereBody ../../neck/capsuleBody
;../boxBody ../../body/boxBody
0 0 -0.005
1 0 0
Modified: trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -168,7 +168,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -178,7 +178,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -336,7 +336,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -374,7 +374,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -204,7 +204,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -214,7 +214,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -409,7 +409,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -455,7 +455,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -771,7 +771,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -812,7 +812,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -8,17 +8,17 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
- (nd DragController
- (setAngularDrag 0.01)
- (setLinearDrag 0.01)
- )
+ (nd DragController
+ (setAngularDrag 0.01)
+ (setLinearDrag 0.01)
+ )
)
(nd BoxCollider
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
- )
\ No newline at end of file
+ )
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -8,7 +8,7 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
(nd DragController
@@ -21,4 +21,4 @@
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/touchperceptorhandler.rsg)
)
- )
\ No newline at end of file
+ )
Copied: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,37 @@
+;; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $name $perceptorName $effectorName $attach
+ $x $y $z
+ $lenX $lenY $lenZ
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ $minDeg $maxDeg
+ $totalMass $material $ElbowRadius $ElbowLen)
+
+ (nd Transform
+ (setName $name)
+ (setLocalPos $x $y $z)
+ (importScene rsg/agent/soccerbot058/box.rsg
+ $lenX $lenY $lenZ
+ $totalMass $material)
+
+ ;; install hinge joint
+ (importScene rsg/agent/nao/hingejoint.rsg
+ $perceptorName $effectorName
+ ../boxBody $attach
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ
+ $minDeg $maxDeg)
+
+ ;; static cylinder for the elbow
+ (nd Transform
+ (setLocalPos $anchorX $anchorY $anchorZ)
+ (setLocalRotation 0 90 0)
+ (nd Capsule
+ (setMaterial matGrey)
+ (setParams $ElbowRadius $ElbowLen)
+ )
+ )
+ )
+ )
Deleted: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,37 +0,0 @@
-;; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $name $perceptorName $effectorName $attach
- $x $y $z
- $lenX $lenY $lenZ
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ $minDeg $maxDeg
- $totalMass $material $ElbowRadius $ElbowLen)
-
- (nd Transform
- (setName $name)
- (setLocalPos $x $y $z)
- (importScene rsg/agent/soccerbot058/box.rsg
- $lenX $lenY $lenZ
- $totalMass $material)
-
- ;; install hinge joint
- (importScene rsg/agent/nao/hingejoint.rsg
- $perceptorName $effectorName
- ../boxBody $attach
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ
- $minDeg $maxDeg)
-
- ;; static cylinder for the elbow
- (nd Transform
- (setLocalPos $anchorX $anchorY $anchorZ)
- (setLocalRotation 0 90 0)
- (nd CCylinder
- (setMaterial matGrey)
- (setParams $ElbowRadius $ElbowLen)
- )
- )
- )
- )
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -9,7 +9,7 @@
(setName head)
(setLocalPos $HeadPosX $HeadPosY $HeadPosZ)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $headMass $headRadius
$HeadPosX $HeadPosY $HeadPosZ
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -38,7 +38,7 @@
(nd Transform
(setLocalPos $anchorX $anchorY $anchorZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLen)
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -32,7 +32,7 @@
- (eval 0.04 * $scale)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
;; Lower arm
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -216,7 +216,7 @@
$offsetLeftShoulderCylY
$offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -228,7 +228,7 @@
$offsetRightShoulderCylY
$offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -434,7 +434,7 @@
- (eval $ShankHeight / 2.0)
- (eval 0.05 * $scale)))
(def $ShankAnchorZ (eval $ShankHeight * 0.5))
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
leftshank llj4 lle4 ../../leftthigh/boxBody
$LeftShankPosX $LeftShankPosY $LeftShankPosZ
$ShankLength $ShankWidth $ShankHeight
@@ -447,7 +447,7 @@
(def $RightShankPosX $RightThighPosX)
(def $RightShankPosY $RightThighPosY)
(def $RightShankPosZ $LeftShankPosZ)
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
rightshank rlj4 rle4 ../../rightthigh/boxBody
$RightShankPosX $RightShankPosY $RightShankPosZ
$ShankLength $ShankWidth $ShankHeight
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -16,7 +16,7 @@
; + (eval 0.1 * $scale))
; + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBoxTotal $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -203,7 +203,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -213,7 +213,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -369,7 +369,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -415,7 +415,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -621,7 +621,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -662,7 +662,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -10,7 +10,7 @@
;(setScale 1.0 1.0 1.0)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
;(setBoxTotal $totalMass $lenX $lenY $lenZ)
(setBox $totalMass $lenX $lenY $lenZ)
@@ -36,4 +36,4 @@
)
)
-)
\ No newline at end of file
+)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -14,7 +14,7 @@
(def $HeadPosY 0.05)
(def $HeadPosZ (eval (eval (eval 0.5 * $upperLenZ) + 0.1) + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBox $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: trunk/rcssserver3d/doc/users/robots.tex
===================================================================
--- trunk/rcssserver3d/doc/users/robots.tex 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/doc/users/robots.tex 2010-02-25 12:19:37 UTC (rev 176)
@@ -237,11 +237,11 @@
box\_physics\_with\_handler.rsg & Not only do the job as file
“box\_physics.rsg”, but also install a touchperceptorhandler under
the BoxCollider Node. \\
- ccylinder\_appearance.rsg & Install a capped cylinder which is
+ capsule\_appearance.rsg & Install a capsule which is
for the GL render. \\
- ccylinder\_physics.rsg & Install a capped cylinder that has
+ capsule\_physics.rsg & Install a capsule that has
physics effect(ODE related) \\
- ccylinder\_physics\_nocollider.rsg & Install a capped cylinder that
+ capsule\_physics\_nocollider.rsg & Install a capsule that
only has dynamics effect (mass, linear velocity, etc). But it can
never collide to the others. \\
contactjointhandler.rsg & Install a contactjointhandler to
Modified: trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -27,7 +27,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
}
class AgentState : public ObjectState
Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 12:19:37 UTC (rev 176)
@@ -46,7 +46,7 @@
if (mBody.get() == 0)
{
- mBody = shared_dynamic_cast<Body>(GetChildOfClass("Body"));
+ mBody = shared_dynamic_cast<RigidBody>(GetChildOfClass("RigidBody"));
}
}
Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -23,7 +23,7 @@
#define BALL_H
#include <oxygen/sceneserver/transform.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <salt/vector.h>
class BallStateAspect;
@@ -65,7 +65,7 @@
salt::Vector3f mForce;
salt::Vector3f mTorque;
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
boost::shared_ptr<oxygen::AgentAspect> mKickedLast;
boost::shared_ptr<BallStateAspect> mBallStateAspect;
};
Modified: trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -23,7 +23,7 @@
#define BEAMEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <gamestateaspect/gamestateaspect.h>
class BeamEffector : public oxygen::Effector
@@ -51,7 +51,7 @@
protected:
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
/** the reference to the GameState */
boost::shared_ptr<GameStateAspect> mGameState;
Modified: trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -22,7 +22,7 @@
#define CATCHEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <ball/ball.h>
#include <ballstateaspect/ballstateaspect.h>
@@ -33,7 +33,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
class AgentAspect;
}
@@ -74,7 +74,7 @@
protected:
/** reference to the body node of the ball */
- boost::shared_ptr<oxygen::Body> mBallBody;
+ boost::shared_ptr<oxygen::RigidBody> mBallBody;
/** reference to the agent aspect */
boost::shared_ptr<oxygen::AgentAspect> mAgent;
/** reference to the agentstate */
Modified: trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -24,7 +24,7 @@
#include <salt/random.h>
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <agentstate/agentstate.h>
class DriveEffector : public oxygen::Effector
@@ -84,7 +84,7 @@
/** the reference to the parent transform node */
boost::shared_ptr<oxygen::Transform> mTransformParent;
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
//! a reference to the agent state
boost::shared_ptr<AgentState> mAgentState;
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_eff...
[truncated message content] |
