Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[331] trunk
|
From: <he...@us...> - 2013-02-13 08:31:59
|
Revision: 331
http://simspark.svn.sourceforge.net/simspark/?rev=331&view=rev
Author: hedayat
Date: 2013-02-13 08:31:45 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
Fix some boost library link errors
Some Boost 1.53 compatibility: replaced shared_dynamic/static_cast with the modern dynamic/static_pointer_cast
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/plugin/soccer/agentcollisionhandler/agentcollisionhandler.cpp
trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp
trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp
trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp
trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp
trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp
trunk/rcssserver3d/plugin/soccer/createeffector/createeffector.cpp
trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp
trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp
trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp
trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp
trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp
trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp
trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp
trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp
trunk/rcssserver3d/plugin/soccer/soccernode/soccernode.cpp
trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp
trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinput.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerrender.cpp
trunk/rcssserver3d/rcssagent3d/hoap2behavior.cpp
trunk/rcssserver3d/rcssagent3d/naobehavior.cpp
trunk/rcssserver3d/rcssagent3d/soccerbehavior.cpp
trunk/rcssserver3d/rcssagent3d/soccerbotbehavior.cpp
trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/lib/kerosin/imageserver/imageserver.cpp
trunk/spark/lib/kerosin/inputserver/inputcontrol.cpp
trunk/spark/lib/kerosin/inputserver/inputserver.cpp
trunk/spark/lib/kerosin/materialserver/material2dtexture.cpp
trunk/spark/lib/kerosin/materialserver/materialserver.cpp
trunk/spark/lib/kerosin/openglserver/openglserver.cpp
trunk/spark/lib/kerosin/renderserver/rendercontrol.cpp
trunk/spark/lib/kerosin/renderserver/renderserver.cpp
trunk/spark/lib/kerosin/sceneserver/singlematnode.cpp
trunk/spark/lib/kerosin/sceneserver/staticmesh.cpp
trunk/spark/lib/kerosin/soundserver/soundserver.cpp
trunk/spark/lib/oxygen/agentaspect/agentaspect.cpp
trunk/spark/lib/oxygen/agentaspect/effector.cpp
trunk/spark/lib/oxygen/controlaspect/controlaspect.cpp
trunk/spark/lib/oxygen/gamecontrolserver/gamecontrolserver.cpp
trunk/spark/lib/oxygen/geometryserver/geometryserver.cpp
trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
trunk/spark/lib/oxygen/physicsserver/angularmotor.cpp
trunk/spark/lib/oxygen/physicsserver/balljoint.cpp
trunk/spark/lib/oxygen/physicsserver/body.cpp
trunk/spark/lib/oxygen/physicsserver/bodycontroller.cpp
trunk/spark/lib/oxygen/physicsserver/boxcollider.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
trunk/spark/lib/oxygen/physicsserver/collider.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp
trunk/spark/lib/oxygen/physicsserver/fixedjoint.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
trunk/spark/lib/oxygen/physicsserver/hinge2joint.cpp
trunk/spark/lib/oxygen/physicsserver/hingejoint.cpp
trunk/spark/lib/oxygen/physicsserver/joint.cpp
trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
trunk/spark/lib/oxygen/physicsserver/physicsserver.cpp
trunk/spark/lib/oxygen/physicsserver/planecollider.cpp
trunk/spark/lib/oxygen/physicsserver/raycollider.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.cpp
trunk/spark/lib/oxygen/physicsserver/space.cpp
trunk/spark/lib/oxygen/physicsserver/spherecollider.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.cpp
trunk/spark/lib/oxygen/physicsserver/transformcollider.cpp
trunk/spark/lib/oxygen/physicsserver/universaljoint.cpp
trunk/spark/lib/oxygen/physicsserver/world.cpp
trunk/spark/lib/oxygen/sceneserver/basenode.cpp
trunk/spark/lib/oxygen/sceneserver/fpscontroller.cpp
trunk/spark/lib/oxygen/sceneserver/sceneserver.cpp
trunk/spark/lib/oxygen/sceneserver/transform.cpp
trunk/spark/lib/oxygen/simulationserver/simcontrolnode.cpp
trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp
trunk/spark/lib/oxygen/spadesserver/spadesserver.cpp
trunk/spark/lib/zeitgeist/class.cpp
trunk/spark/lib/zeitgeist/core.cpp
trunk/spark/lib/zeitgeist/core.h
trunk/spark/lib/zeitgeist/corecontext.cpp
trunk/spark/lib/zeitgeist/fileserver/fileserver.cpp
trunk/spark/lib/zeitgeist/leaf.cpp
trunk/spark/lib/zeitgeist/leaf.h
trunk/spark/lib/zeitgeist/node.cpp
trunk/spark/lib/zeitgeist/node.h
trunk/spark/plugin/accelerometer/accelerometer.cpp
trunk/spark/plugin/collisionperceptor/forceresistanceperceptor.cpp
trunk/spark/plugin/collisionperceptor/perceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.cpp
trunk/spark/plugin/filesystemrar/filesystemrar.cpp
trunk/spark/plugin/forceeffector/forceeffector.cpp
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.cpp
trunk/spark/plugin/imageperceptor/imageperceptor.cpp
trunk/spark/plugin/inputsdl/inputsystemsdl.cpp
trunk/spark/plugin/objimporter/objimporter.cpp
trunk/spark/plugin/perfectvisionperceptor/perfectvisionperceptor.cpp
trunk/spark/plugin/rosimporter/rosimporter.cpp
trunk/spark/plugin/rubysceneimporter/rubysceneimporter.cpp
trunk/spark/plugin/sceneeffector/sceneeffector.cpp
trunk/spark/plugin/sparkagent/hinge2effector.cpp
trunk/spark/plugin/sparkagent/hingeeffector.cpp
trunk/spark/plugin/sparkagent/timeperceptor.cpp
trunk/spark/plugin/sparkagent/universaljointeffector.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorclient.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
trunk/spark/spark/spark.cpp
trunk/spark/test/coretest/main.cpp
trunk/spark/test/fonttest/main.cpp
trunk/spark/test/inputtest/main.cpp
trunk/spark/test/scenetest/main.cpp
trunk/spark/test/scenetest/md5mesh.cpp
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/CMakeLists.txt 2013-02-13 08:31:45 UTC (rev 331)
@@ -26,7 +26,7 @@
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
-find_package(Boost REQUIRED)
+find_package(Boost REQUIRED system)
find_package(SDL REQUIRED)
find_package(DevIL REQUIRED)
find_package(ODE REQUIRED)
Modified: trunk/rcssserver3d/plugin/soccer/agentcollisionhandler/agentcollisionhandler.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentcollisionhandler/agentcollisionhandler.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/agentcollisionhandler/agentcollisionhandler.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -56,5 +56,5 @@
return boost::shared_ptr<AgentState>();
}
- return boost::shared_static_cast<AgentState>(agentAspect->FindChildSupportingClass<AgentState>(true));
+ return boost::static_pointer_cast<AgentState>(agentAspect->FindChildSupportingClass<AgentState>(true));
}
Modified: trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -217,7 +217,7 @@
void
AgentState::UpdateHierarchyInternal()
{
- boost::shared_ptr<RenderNode> node = boost::shared_dynamic_cast<RenderNode>(GetChild("SelectionMarker", true));
+ boost::shared_ptr<RenderNode> node = boost::dynamic_pointer_cast<RenderNode>(GetChild("SelectionMarker", true));
if (!node)
{
GetLog()->Error() << "ERROR: (AgentState::UpdateHierarchyInternal) could not find selection marker\n";
Modified: trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -61,7 +61,7 @@
predicate.parameter.Clear();
boost::shared_ptr<BaseNode> parent =
- shared_dynamic_cast<BaseNode>(GetParent().lock());
+ dynamic_pointer_cast<BaseNode>(GetParent().lock());
if (parent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -46,7 +46,7 @@
if (mBody.get() == 0)
{
- mBody = shared_dynamic_cast<RigidBody>(GetChildOfClass("RigidBody"));
+ mBody = dynamic_pointer_cast<RigidBody>(GetChildOfClass("RigidBody"));
}
}
@@ -60,7 +60,7 @@
// mBallStateAspect during OnLink
if (mBallStateAspect.get() == 0)
{
- mBallStateAspect = shared_dynamic_cast<BallStateAspect>
+ mBallStateAspect = dynamic_pointer_cast<BallStateAspect>
(GetCore()->Get("/sys/server/gamecontrol/BallStateAspect"));
if (mBallStateAspect.get() == 0) return;
}
Modified: trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/ballstateaspect/ballstateaspect.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -74,7 +74,7 @@
if (agents.size() > 0)
{
- mLastCollidingAgent = shared_static_cast<AgentAspect>
+ mLastCollidingAgent = static_pointer_cast<AgentAspect>
(agents.front().lock());
mLastAgentCollisionTime = mGameState->GetTime();
Modified: trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -61,7 +61,7 @@
}
boost::shared_ptr<BeamAction> beamAction =
- shared_dynamic_cast<BeamAction>(mAction);
+ dynamic_pointer_cast<BeamAction>(mAction);
mAction.reset();
Modified: trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -83,7 +83,7 @@
}
boost::shared_ptr<CatchAction> catchAction =
- shared_dynamic_cast<CatchAction>(mAction);
+ dynamic_pointer_cast<CatchAction>(mAction);
mAction.reset();
if (catchAction.get() == 0)
{
@@ -177,7 +177,7 @@
SoccerBase::GetSoccerRuleAspect(*this,mSoccerRule);
- mAgent = shared_dynamic_cast<AgentAspect>(GetParent().lock());
+ mAgent = dynamic_pointer_cast<AgentAspect>(GetParent().lock());
if (mAgent.get() == 0)
{
@@ -188,7 +188,7 @@
}
boost::shared_ptr<SphereCollider> geom =
- shared_dynamic_cast<SphereCollider>(mAgent->GetChild("geometry"));
+ dynamic_pointer_cast<SphereCollider>(mAgent->GetChild("geometry"));
if (geom.get() == 0)
{
GetLog()->Error()
Modified: trunk/rcssserver3d/plugin/soccer/createeffector/createeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/createeffector/createeffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/createeffector/createeffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -42,7 +42,7 @@
return;
boost::shared_ptr<CreateAction> createAction =
- shared_dynamic_cast<CreateAction>(mAction);
+ dynamic_pointer_cast<CreateAction>(mAction);
mAction.reset();
if (createAction.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -50,7 +50,7 @@
}
boost::shared_ptr<BaseNode> parent =
- shared_dynamic_cast<BaseNode>(GetParent().lock());
+ dynamic_pointer_cast<BaseNode>(GetParent().lock());
if (parent.get() == 0)
{
@@ -59,7 +59,7 @@
return false;
}
- boost::shared_ptr<DriveAction> driveAction = shared_dynamic_cast<DriveAction>(action);
+ boost::shared_ptr<DriveAction> driveAction = dynamic_pointer_cast<DriveAction>(action);
if (driveAction.get() == 0)
{
@@ -117,7 +117,7 @@
SoccerBase::GetAgentState(*this,mAgentState);
boost::shared_ptr<SphereCollider> geom =
- shared_dynamic_cast<SphereCollider>(mTransformParent->GetChild("geometry"));
+ dynamic_pointer_cast<SphereCollider>(mTransformParent->GetChild("geometry"));
mMaxDistance = 0.001;
if (geom.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/gametimeperceptor/gametimeperceptor.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -65,7 +65,7 @@
void
GameTimePerceptor::OnLink()
{
- mGameState = shared_dynamic_cast<GameStateAspect>
+ mGameState = dynamic_pointer_cast<GameStateAspect>
(GetCore()->Get("/sys/server/gamecontrol/GameStateAspect"));
if (mGameState.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -85,7 +85,7 @@
return;
}
- boost::shared_ptr<HMDPAction> hMDPAction = shared_dynamic_cast<HMDPAction>(mAction);
+ boost::shared_ptr<HMDPAction> hMDPAction = dynamic_pointer_cast<HMDPAction>(mAction);
mAction.reset();
if (hMDPAction.get() == 0)
{
@@ -141,7 +141,7 @@
// parent should be a transform, or some other node, which has a
// Body-child
- mBody = shared_dynamic_cast<RigidBody>(parent->GetChildOfClass("RigidBody"));
+ mBody = dynamic_pointer_cast<RigidBody>(parent->GetChildOfClass("RigidBody"));
if (mBody.get() == 0)
{
@@ -216,7 +216,7 @@
boost::shared_ptr<Leaf> join = *j_it;
boost::shared_ptr<BaseNode> jparent =
- shared_dynamic_cast<BaseNode>(join->GetParent().lock());
+ dynamic_pointer_cast<BaseNode>(join->GetParent().lock());
std::cout << i << " " << jparent->GetName() << std::endl;
i++;
@@ -259,7 +259,7 @@
for (TLeafList::iterator j_it = jointList.begin(); j_it != jointList.end(); j_it++)
{
- boost::shared_ptr<HingeJoint> joint = shared_static_cast<HingeJoint> (*j_it);
+ boost::shared_ptr<HingeJoint> joint = static_pointer_cast<HingeJoint> (*j_it);
servo_angle[i] = joint->GetAngle() - zeroPosServo(i);
double tpos = servo_target_pos[i];
float err = servo_gain[i] * (tpos - servo_angle[i]);
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -48,10 +48,10 @@
{
messageOut = "";
- boost::shared_ptr<Transform> transformParent = shared_static_cast<Transform> (
+ boost::shared_ptr<Transform> transformParent = static_pointer_cast<Transform> (
FindParentSupportingClass<Transform> ().lock());
- mBody = shared_static_cast<RigidBody> (transformParent->GetChildOfClass("RigidBody"));
+ mBody = static_pointer_cast<RigidBody> (transformParent->GetChildOfClass("RigidBody"));
}
void HMDPPerceptor::OnUnlink()
Modified: trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -55,7 +55,7 @@
}
boost::shared_ptr<InitAction> initAction =
- shared_dynamic_cast<InitAction>(mAction);
+ dynamic_pointer_cast<InitAction>(mAction);
mAction.reset();
if (initAction.get() == 0)
@@ -66,7 +66,7 @@
}
// search for the AgentState
- boost::shared_ptr<AgentState> state = shared_static_cast<AgentState>
+ boost::shared_ptr<AgentState> state = static_pointer_cast<AgentState>
(mAgentAspect->GetChildOfClass("AgentState", true));
if (state.get() == 0)
@@ -95,7 +95,7 @@
// agents may be encapsulated in their own collision spaces, so we need
// to get the parent of the parent of the agent aspect in this case
- boost::shared_ptr<Transform> parent = shared_dynamic_cast<Transform>
+ boost::shared_ptr<Transform> parent = dynamic_pointer_cast<Transform>
(mAgentAspect->GetParentSupportingClass("Transform").lock());
@@ -133,7 +133,7 @@
)
{
boost::shared_ptr<Body> childBody =
- shared_dynamic_cast<Body>(*iter);
+ dynamic_pointer_cast<Body>(*iter);
Vector3f childPos = childBody->GetPosition();
Matrix childR = childBody->GetRotation();
@@ -169,7 +169,7 @@
void InitEffector::OnLink()
{
- mGameState = shared_dynamic_cast<GameStateAspect>
+ mGameState = dynamic_pointer_cast<GameStateAspect>
(SoccerBase::GetControlAspect(*this,"GameStateAspect"));
mAgentAspect = GetAgentAspect();
if (mAgentAspect.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/initeffector/singlematiniteffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -68,7 +68,7 @@
jersey.push_back("lowerTorso");
// search for the AgentState
- boost::shared_ptr<AgentState> state = shared_static_cast<AgentState>
+ boost::shared_ptr<AgentState> state = static_pointer_cast<AgentState>
(mAgentAspect->GetChildOfClass("AgentState",true));
if (state.get() == 0)
@@ -102,7 +102,7 @@
// get parent of the agent aspect
- boost::shared_ptr<Node> parent = shared_dynamic_cast<Node>
+ boost::shared_ptr<Node> parent = dynamic_pointer_cast<Node>
(mAgentAspect->GetParent().lock());
if (parent.get() == 0)
@@ -123,7 +123,7 @@
if (child.get() != 0)
{
- matNode = shared_static_cast<SingleMatNode>
+ matNode = static_pointer_cast<SingleMatNode>
(child->FindChildSupportingClass<SingleMatNode>(true));
if (matNode.get() == 0)
@@ -147,7 +147,7 @@
// set the scene modified, the monitor will update
boost::shared_ptr<SceneServer> sceneServer =
- shared_dynamic_cast<SceneServer>(GetCore()->Get("/sys/server/scene"));
+ dynamic_pointer_cast<SceneServer>(GetCore()->Get("/sys/server/scene"));
if (sceneServer.get() ==0)
{
Modified: trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/initeffector/staticmeshiniteffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -58,7 +58,7 @@
InitEffector::PrePhysicsUpdateInternal(deltaTime);
// search for the AgentState
- boost::shared_ptr<AgentState> state = shared_static_cast<AgentState>
+ boost::shared_ptr<AgentState> state = static_pointer_cast<AgentState>
(mAgentAspect->GetChildOfClass("AgentState",true));
if (state.get() == 0)
@@ -86,7 +86,7 @@
string unumMat = "matNum" + lexical_cast<string>(unum);
// get parent of the agent aspect
- boost::shared_ptr<Node> parent = shared_dynamic_cast<Node>
+ boost::shared_ptr<Node> parent = dynamic_pointer_cast<Node>
(mAgentAspect->GetParent().lock());
if (parent.get() == 0)
@@ -107,14 +107,14 @@
++iter
)
{
- boost::shared_ptr<StaticMesh> m = shared_static_cast<StaticMesh>(*iter);
+ boost::shared_ptr<StaticMesh> m = static_pointer_cast<StaticMesh>(*iter);
m->ChangeMaterial("matTeam",teamMat);
m->ChangeMaterial("matNum",unumMat);
}
// set the scene modified, the monitor will update
boost::shared_ptr<SceneServer> sceneServer =
- shared_dynamic_cast<SceneServer>(GetCore()->Get("/sys/server/scene"));
+ dynamic_pointer_cast<SceneServer>(GetCore()->Get("/sys/server/scene"));
if (sceneServer.get() ==0)
{
Modified: trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -66,7 +66,7 @@
scriptServer->CreateVariable("Command.PreviousCamera", CmdPreviousCamera);
// get the GameStateAspect
- mGameState = shared_dynamic_cast<GameStateAspect>
+ mGameState = dynamic_pointer_cast<GameStateAspect>
(GetCore()->Get("/sys/server/gamecontrol/GameStateAspect"));
if (mGameState.get() == 0)
@@ -75,7 +75,7 @@
}
// get the SoccerRuleAspect
- mSoccerRule = shared_dynamic_cast<SoccerRuleAspect>
+ mSoccerRule = dynamic_pointer_cast<SoccerRuleAspect>
(GetCore()->Get("/sys/server/gamecontrol/SoccerRuleAspect"));
if (mSoccerRule.get() == 0)
@@ -84,7 +84,7 @@
}
// get the GameControlServer
- mGameControl = shared_dynamic_cast<GameControlServer>
+ mGameControl = dynamic_pointer_cast<GameControlServer>
(GetCore()->Get("/sys/server/gamecontrol"));
if (mGameControl.get() == 0)
@@ -93,7 +93,7 @@
}
// get camera body
- mCameraBody = shared_dynamic_cast<RigidBody>
+ mCameraBody = dynamic_pointer_cast<RigidBody>
(GetCore()->Get("/usr/scene/camera/physics"));
if (mCameraBody.get() == 0)
@@ -103,7 +103,7 @@
}
// get fps controller
- mFPS = shared_dynamic_cast<FPSController>
+ mFPS = dynamic_pointer_cast<FPSController>
(GetCore()->Get("/usr/scene/camera/physics/controller"));
if (mFPS.get() == 0)
@@ -113,7 +113,7 @@
}
// get render server
- mRenderServer = shared_dynamic_cast<RenderServer>
+ mRenderServer = dynamic_pointer_cast<RenderServer>
(GetCore()->Get("/sys/server/render"));
if (mRenderServer.get() == 0)
@@ -271,7 +271,7 @@
{
// search for the first agent of the left/right side
boost::shared_ptr<AgentState> agentState =
- shared_dynamic_cast<AgentState>((*iter)->GetChild("AgentState", true));
+ dynamic_pointer_cast<AgentState>((*iter)->GetChild("AgentState", true));
if (agentState.get() == 0)
{
@@ -306,7 +306,7 @@
{
// search for the first agent of the left/right side
boost::shared_ptr<AgentState> agentState =
- shared_dynamic_cast<AgentState>((*iter)->GetChild("AgentState", true));
+ dynamic_pointer_cast<AgentState>((*iter)->GetChild("AgentState", true));
if (agentState.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -46,7 +46,7 @@
{
// get the FontServer
mFontServer =
- shared_static_cast<FontServer>(GetCore()->Get("/sys/server/font"));
+ static_pointer_cast<FontServer>(GetCore()->Get("/sys/server/font"));
if (mFontServer.get() == 0)
{
@@ -65,7 +65,7 @@
}
// get the TextureServer
- mTextureServer = shared_static_cast<TextureServer>(GetCore()->Get("/sys/server/texture"));
+ mTextureServer = static_pointer_cast<TextureServer>(GetCore()->Get("/sys/server/texture"));
if (mTextureServer.get() == 0)
{
@@ -73,7 +73,7 @@
}
// get the GameStateAspect
- mGameState = shared_dynamic_cast<GameStateAspect>
+ mGameState = dynamic_pointer_cast<GameStateAspect>
(SoccerBase::GetControlAspect(*this, "GameStateAspect"));
if (mGameState.get() == 0)
@@ -199,7 +199,7 @@
#if 0
// get texture -- has to be square and power of 2 in size!!!
- boost::shared_ptr<Texture2D> tex = shared_static_cast<Texture2D>
+ boost::shared_ptr<Texture2D> tex = static_pointer_cast<Texture2D>
(mTextureServer->GetTexture("test.tga"));
glEnable2D();
Modified: trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -64,7 +64,7 @@
}
boost::shared_ptr<KickAction> kickAction =
- shared_dynamic_cast<KickAction>(mAction);
+ dynamic_pointer_cast<KickAction>(mAction);
mAction.reset();
if (kickAction.get() == 0)
@@ -181,7 +181,7 @@
SoccerBase::GetBall(*this,mBall);
SoccerBase::GetBallBody(*this,mBallBody);
- mAgent = shared_dynamic_cast<AgentAspect>(GetParent().lock());
+ mAgent = dynamic_pointer_cast<AgentAspect>(GetParent().lock());
if (mAgent.get() == 0)
{
@@ -191,7 +191,7 @@
}
boost::shared_ptr<SphereCollider> geom =
- shared_dynamic_cast<SphereCollider>(mAgent->GetChild("geometry"));
+ dynamic_pointer_cast<SphereCollider>(mAgent->GetChild("geometry"));
if (geom.get() == 0)
{
GetLog()->Error()
@@ -212,7 +212,7 @@
if (mBallStateAspect.get() == 0)
{
- mBallStateAspect = shared_dynamic_cast<BallStateAspect>
+ mBallStateAspect = dynamic_pointer_cast<BallStateAspect>
(GetCore()->Get("/sys/server/gamecontrol/BallStateAspect"));
if (mBallStateAspect.get() == 0) return;
}
Modified: trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -50,7 +50,7 @@
}
boost::shared_ptr<BaseNode> parent =
- shared_dynamic_cast<BaseNode>(GetParent().lock());
+ dynamic_pointer_cast<BaseNode>(GetParent().lock());
if (parent.get() == 0)
{
@@ -60,7 +60,7 @@
}
boost::shared_ptr<PanTiltAction> panTiltAction =
- shared_dynamic_cast<PanTiltAction>(mAction);
+ dynamic_pointer_cast<PanTiltAction>(mAction);
mAction.reset();
if (panTiltAction.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -57,7 +57,7 @@
void RCS3DMonitor::OnLink()
{
// setup SceneServer reference
- mSceneServer = shared_dynamic_cast<SceneServer>
+ mSceneServer = dynamic_pointer_cast<SceneServer>
(GetCore()->Get("/sys/server/scene"));
if (mSceneServer.get() == 0)
@@ -86,7 +86,7 @@
++iter
)
{
- shared_static_cast<MonitorCmdParser>(*iter)
+ static_pointer_cast<MonitorCmdParser>(*iter)
->ParseMonitorMessage(data);
}
}
@@ -156,7 +156,7 @@
ss << "(nd";
}
- DescribeTransform(ss, entry, boost::shared_static_cast<Transform>(ball), false);
+ DescribeTransform(ss, entry, boost::static_pointer_cast<Transform>(ball), false);
}
void RCS3DMonitor::DescribeBaseNode(stringstream& ss)
@@ -248,7 +248,7 @@
void RCS3DMonitor::DescribeMesh(stringstream& ss, boost::shared_ptr<StaticMesh> mesh)
{
boost::shared_ptr<SingleMatNode> singleMat =
- shared_dynamic_cast<SingleMatNode>(mesh);
+ dynamic_pointer_cast<SingleMatNode>(mesh);
if (singleMat.get() != 0)
{
@@ -333,7 +333,7 @@
// Ball
boost::shared_ptr<Ball> ball
- = shared_dynamic_cast<Ball>(node);
+ = dynamic_pointer_cast<Ball>(node);
if (ball.get() != 0)
{
mNodeCache[node]
@@ -344,7 +344,7 @@
// Transform
boost::shared_ptr<Transform> transform
- = shared_dynamic_cast<Transform>(node);
+ = dynamic_pointer_cast<Transform>(node);
if (transform.get() != 0)
{
mNodeCache[node]
@@ -354,7 +354,7 @@
}
boost::shared_ptr<StaticMesh> mesh
- = shared_dynamic_cast<StaticMesh>(node);
+ = dynamic_pointer_cast<StaticMesh>(node);
if (mesh.get() != 0)
{
mNodeCache[node] = NodeCache(NT_STATICMESH);
@@ -362,7 +362,7 @@
}
boost::shared_ptr<Light> light
- = shared_dynamic_cast<Light>(node);
+ = dynamic_pointer_cast<Light>(node);
if (light.get() != 0)
{
mNodeCache[node] = NodeCache(NT_LIGHT);
@@ -397,21 +397,21 @@
case NT_BALL:
DescribeBall
- (ss, (*entry), shared_static_cast<Ball>(node));
+ (ss, (*entry), static_pointer_cast<Ball>(node));
case NT_TRANSFORM:
DescribeTransform
- (ss, (*entry), shared_static_cast<Transform>(node));
+ (ss, (*entry), static_pointer_cast<Transform>(node));
return true;
case NT_STATICMESH:
DescribeMesh
- (ss, shared_static_cast<StaticMesh>(node));
+ (ss, static_pointer_cast<StaticMesh>(node));
return true;
case NT_LIGHT:
DescribeLight
- (ss, shared_static_cast<Light>(node));
+ (ss, static_pointer_cast<Light>(node));
return true;
}
}
@@ -448,7 +448,7 @@
TLeafList baseNodes = node->GetBaseNodeChildren();
for (TLeafList::iterator i = baseNodes.begin(); i!= baseNodes.end(); ++i)
{
- boost::shared_ptr<BaseNode> baseNode = shared_dynamic_cast<BaseNode>(*i);
+ boost::shared_ptr<BaseNode> baseNode = dynamic_pointer_cast<BaseNode>(*i);
DescribeScene(ss,baseNode);
}
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -177,7 +177,7 @@
mAgentAspect = agent_aspect;
}
- mAgentState = shared_static_cast<AgentState>
+ mAgentState = static_pointer_cast<AgentState>
(mAgentAspect->GetChildOfClass("AgentState",true));
if (mAgentState == 0)
{
@@ -214,7 +214,7 @@
bool
RestrictedVisionPerceptor::ConstructInternal()
{
- mRay = shared_static_cast<RayCollider>
+ mRay = static_pointer_cast<RayCollider>
(GetCore()->New("oxygen/RayCollider"));
if (mRay.get() == 0)
@@ -240,9 +240,9 @@
{
ObjectData od;
- od.mObj = shared_static_cast<ObjectState>(*i);
+ od.mObj = static_pointer_cast<ObjectState>(*i);
- boost::shared_ptr<BaseNode> node = shared_dynamic_cast<BaseNode>(mActiveScene);
+ boost::shared_ptr<BaseNode> node = dynamic_pointer_cast<BaseNode>(mActiveScene);
boost::shared_ptr<AgentAspect> agent_aspect =
od.mObj->FindParentSupportingClass<AgentAspect>().lock();
if (agent_aspect != 0)
@@ -261,7 +261,7 @@
// GetLog()->Normal()
// << "skipping agentAspect " << agent_aspect->GetFullPath() << std::endl;
- node = shared_dynamic_cast<BaseNode>(agent_aspect);
+ node = dynamic_pointer_cast<BaseNode>(agent_aspect);
}
if (od.mObj.get() == 0)
@@ -296,7 +296,7 @@
}
boost::shared_ptr<AgentAspect> agent_aspect =
- shared_dynamic_cast<AgentAspect>(node);
+ dynamic_pointer_cast<AgentAspect>(node);
if (agent_aspect != 0)
{
boost::shared_ptr<AgentAspect> aspect =
@@ -306,7 +306,7 @@
agent_aspect = aspect;
}
- boost::shared_ptr<AgentState> agent_state = shared_static_cast<AgentState>
+ boost::shared_ptr<AgentState> agent_state = static_pointer_cast<AgentState>
(agent_aspect->GetChildOfClass("AgentState",true));
if (agent_state.get() == 0 ||
(agent_state->GetPerceptName(ObjectState::PT_Player).empty())
@@ -646,7 +646,7 @@
// dContactGeom contact;
-// boost::shared_ptr<Collider> collider = shared_static_cast<Collider>
+// boost::shared_ptr<Collider> collider = static_pointer_cast<Collider>
// (i->mObj->GetChildSupportingClass("Collider"));
// if (mRay->Intersects(collider))
@@ -847,7 +847,7 @@
{
LineData ld;
- ld.mLine = shared_static_cast<Line > (*i);
+ ld.mLine = static_pointer_cast<Line > (*i);
if (ld.mLine.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -64,7 +64,7 @@
}
boost::shared_ptr<SayAction> sayAction =
- shared_dynamic_cast<SayAction>(action);
+ dynamic_pointer_cast<SayAction>(action);
if (sayAction.get() == 0)
{
@@ -142,7 +142,7 @@
SoccerBase::GetAgentState(*this,mAgentState);
SoccerBase::GetSoccerRuleAspect(*this,mSoccerRule);
- mAgent = shared_dynamic_cast<AgentAspect>(GetParent().lock());
+ mAgent = dynamic_pointer_cast<AgentAspect>(GetParent().lock());
if (mAgent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -119,15 +119,15 @@
for (TLeafList::iterator i = nodes.begin(); i != nodes.end(); ++i)
{
- boost::shared_ptr<AgentAspect> aspect = shared_static_cast<AgentAspect>(*i);
+ boost::shared_ptr<AgentAspect> aspect = static_pointer_cast<AgentAspect>(*i);
const salt::Vector3f& pos = aspect->GetWorldTransform().Pos();
ss << "(P ";
- boost::shared_ptr<AgentState> state = shared_static_cast<AgentState>
+ boost::shared_ptr<AgentState> state = static_pointer_cast<AgentState>
(aspect->GetChildOfClass("AgentState"));
- boost::shared_ptr<SayEffector> sayEff = shared_static_cast<SayEffector>
+ boost::shared_ptr<SayEffector> sayEff = static_pointer_cast<SayEffector>
(aspect->GetChildOfClass("SayEffector"));
if (state.get() != 0)
@@ -184,9 +184,9 @@
for (TLeafList::iterator i = nodes.begin(); i != nodes.end(); ++i)
{
- boost::shared_ptr<FieldFlag> flag = shared_static_cast<FieldFlag>(*i);
+ boost::shared_ptr<FieldFlag> flag = static_pointer_cast<FieldFlag>(*i);
const salt::Vector3f& pos = flag->GetWorldTransform().Pos();
- boost::shared_ptr<ObjectState> state = shared_dynamic_cast<ObjectState>
+ boost::shared_ptr<ObjectState> state = dynamic_pointer_cast<ObjectState>
(flag->GetChildOfClass("ObjectState"));
if (state.get() == 0) continue;
@@ -204,7 +204,7 @@
void
SexpMonitor::AddBall(boost::shared_ptr<Scene> activeScene, std::ostringstream& ss) const
{
- boost::shared_ptr<Ball> ball = shared_static_cast<Ball>(activeScene->GetChild("Ball"));
+ boost::shared_ptr<Ball> ball = static_pointer_cast<Ball>(activeScene->GetChild("Ball"));
const salt::Vector3f& pos = ball->GetWorldTransform().Pos();
ss << "(B ";
// pos
@@ -221,7 +221,7 @@
}
boost::shared_ptr<SceneServer> sceneServer =
- shared_dynamic_cast<SceneServer>(GetCore()->Get("/sys/server/scene"));
+ dynamic_pointer_cast<SceneServer>(GetCore()->Get("/sys/server/scene"));
if (sceneServer.get() == 0)
{
@@ -270,7 +270,7 @@
// we need the TrainerCommandParser to parse the predicates
// and interpret the commands
- mCommandParser = shared_dynamic_cast<TrainerCommandParser>
+ mCommandParser = dynamic_pointer_cast<TrainerCommandParser>
(GetCore()->New("TrainerCommandParser"));
if (mCommandParser.get() == 0)
@@ -288,7 +288,7 @@
void
SexpMonitor::UpdateCached()
{
- mBallState = shared_dynamic_cast<BallStateAspect>
+ mBallState = dynamic_pointer_cast<BallStateAspect>
(GetCore()->Get("/sys/server/gamecontrol/BallStateAspect"));
if (mBallState.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -46,7 +46,7 @@
SoccerBase::GetSceneServer(const Leaf& base,
boost::shared_ptr<SceneServer>& scene_server)
{
- scene_server = shared_static_cast<SceneServer>
+ scene_server = static_pointer_cast<SceneServer>
(base.GetCore()->Get("/sys/server/scene"));
if (scene_server.get() == 0)
@@ -64,7 +64,7 @@
SoccerBase::GetTransformParent(const Leaf& base,
boost::shared_ptr<Transform>& transform_parent)
{
- transform_parent = shared_dynamic_cast<Transform>
+ transform_parent = dynamic_pointer_cast<Transform>
((base.FindParentSupportingClass<Transform>()).lock());
if (transform_parent.get() == 0)
@@ -82,7 +82,7 @@
boost::shared_ptr<AgentState>& agent_state)
{
agent_state =
- shared_dynamic_cast<AgentState>(transform->GetChild("AgentState", true));
+ dynamic_pointer_cast<AgentState>(transform->GetChild("AgentState", true));
if (agent_state.get() == 0)
{
@@ -267,7 +267,7 @@
++iter
)
{
- agentState = shared_dynamic_cast<AgentState>((*iter)->GetChild("AgentState", true));
+ agentState = dynamic_pointer_cast<AgentState>((*iter)->GetChild("AgentState", true));
if (
agentState.get() != 0 &&
@@ -288,7 +288,7 @@
SoccerBase::GetGameState(const Leaf& base,
boost::shared_ptr<GameStateAspect>& game_state)
{
- game_state = shared_dynamic_cast<GameStateAspect>
+ game_state = dynamic_pointer_cast<GameStateAspect>
(base.GetCore()->Get("/sys/server/gamecontrol/GameStateAspect"));
if (game_state.get() == 0)
@@ -306,7 +306,7 @@
SoccerBase::GetSoccerRuleAspect(const Leaf& base,
boost::shared_ptr<SoccerRuleAspect> & soccer_rule_aspect)
{
- soccer_rule_aspect = shared_dynamic_cast<SoccerRuleAspect>
+ soccer_rule_aspect = dynamic_pointer_cast<SoccerRuleAspect>
(base.GetCore()->Get("/sys/server/gamecontrol/SoccerRuleAspect"));
if (soccer_rule_aspect.get() == 0)
@@ -329,7 +329,7 @@
if (gameControlServer.get() == 0)
{
- gameControlServer = shared_dynamic_cast<GameControlServer>
+ gameControlServer = dynamic_pointer_cast<GameControlServer>
(base.GetCore()->Get("/sys/server/gamecontrol"));
if (gameControlServer.get() == 0)
@@ -390,7 +390,7 @@
return false;
}
- body = shared_dynamic_cast<RigidBody>(parent->FindChildSupportingClass<RigidBody>());
+ body = dynamic_pointer_cast<RigidBody>(parent->FindChildSupportingClass<RigidBody>());
if (body.get() == 0)
{
@@ -424,7 +424,7 @@
if (ballRef.get() == 0)
{
- ballRef = shared_dynamic_cast<Ball>
+ ballRef = dynamic_pointer_cast<Ball>
(base.GetCore()->Get(scene->GetFullPath() + "Ball"));
if (ballRef.get() == 0)
@@ -462,7 +462,7 @@
if (bodyRef.get() == 0)
{
- bodyRef = shared_dynamic_cast<RigidBody>
+ bodyRef = dynamic_pointer_cast<RigidBody>
(base.GetCore()->Get(scene->GetFullPath() + "Ball/physics"));
if (bodyRef.get() == 0)
@@ -501,7 +501,7 @@
if (sphereRef.get() == 0)
{
- sphereRef = shared_dynamic_cast<SphereCollider>
+ sphereRef = dynamic_pointer_cast<SphereCollider>
(base.GetCore()->Get(scene->GetFullPath() + "Ball/geometry"));
if (sphereRef.get() == 0)
@@ -618,7 +618,7 @@
{
static const string gcsPath = "/sys/server/gamecontrol/";
- boost::shared_ptr<ControlAspect> aspect = shared_dynamic_cast<ControlAspect>
+ boost::shared_ptr<ControlAspect> aspect = dynamic_pointer_cast<ControlAspect>
(base.GetCore()->Get(gcsPath + name));
if (aspect.get() == 0)
@@ -636,7 +636,7 @@
{
Vector3f agentPos = agent_aspect->GetWorldTransform().Pos();
- boost::shared_ptr<Transform> parent = shared_dynamic_cast<Transform>
+ boost::shared_ptr<Transform> parent = dynamic_pointer_cast<Transform>
(agent_aspect->FindParentSupportingClass<Transform>().lock());
if (parent.get() == 0)
@@ -664,7 +664,7 @@
for (; iter != leafList.end(); ++iter)
{
boost::shared_ptr<RigidBody> childBody =
- shared_dynamic_cast<RigidBody>(*iter);
+ dynamic_pointer_cast<RigidBody>(*iter);
Vector3f childPos = childBody->GetPosition();
@@ -679,7 +679,7 @@
bool
SoccerBase::MoveAndRotateAgent(boost::shared_ptr<Transform> agent_aspect, const Vector3f& pos, float angle)
{
- boost::shared_ptr<Transform> parent = shared_dynamic_cast<Transform>
+ boost::shared_ptr<Transform> parent = dynamic_pointer_cast<Transform>
(agent_aspect->FindParentSupportingClass<Transform>().lock());
if (parent.get() == 0)
@@ -719,7 +719,7 @@
)
{
boost::shared_ptr<RigidBody> childBody =
- shared_dynamic_cast<RigidBody>(*iter);
+ dynamic_pointer_cast<RigidBody>(*iter);
Vector3f childPos = childBody->GetPosition();
Matrix childR = childBody->GetRotation();
@@ -764,7 +764,7 @@
for (Leaf::TLeafList::iterator i = baseNodes.begin(); i!= baseNodes.end(); ++i)
{
- boost::shared_ptr<BaseNode> node = shared_static_cast<BaseNode>(*i);
+ boost::shared_ptr<BaseNode> node = static_pointer_cast<BaseNode>(*i);
boundingBox.Encapsulate(node->GetWorldBoundingBox());
}
@@ -802,7 +802,7 @@
for (Leaf::TLeafList::iterator i = baseNodes.begin(); i!= baseNodes.end(); ++i)
{
- boost::shared_ptr<BaseNode> node = shared_static_cast<BaseNode>(*i);
+ boost::shared_ptr<BaseNode> node = static_pointer_cast<BaseNode>(*i);
const AABB3 &box = node->GetWorldBoundingBox();
boundingRect.Encapsulate(box.minVec.x(), box.minVec.y());
boundingRect.Encapsulate(box.maxVec.x(), box.maxVec.y());
Modified: trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -58,7 +58,7 @@
{
string ballRecorder;
SoccerBase::GetSoccerVar(*this,"BallRecorder",ballRecorder);
- boost::shared_ptr<RecorderHandler> node = shared_dynamic_cast<RecorderHandler>
+ boost::shared_ptr<RecorderHandler> node = dynamic_pointer_cast<RecorderHandler>
(GetCore()->Get(mScenePath + ballRecorder));
if (node.get() == 0)
@@ -74,7 +74,7 @@
{
string goalRecorder;
SoccerBase::GetSoccerVar(*this,"LeftGoalRecorder",goalRecorder);
- boost::shared_ptr<RecorderHandler> node = shared_dynamic_cast<RecorderHandler>
+ boost::shared_ptr<RecorderHandler> node = dynamic_pointer_cast<RecorderHandler>
(GetCore()->Get(mScenePath + goalRecorder));
if (node.get() == 0)
@@ -90,7 +90,7 @@
{
string goalRecorder;
SoccerBase::GetSoccerVar(*this,"RightGoalRecorder",goalRecorder);
- boost::shared_ptr<RecorderHandler> node = shared_dynamic_cast<RecorderHandler>
+ boost::shared_ptr<RecorderHandler> node = dynamic_pointer_cast<RecorderHandler>
(GetCore()->Get(mScenePath + goalRecorder));
if (node.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccer/soccernode/soccernode.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccernode/soccernode.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/soccernode/soccernode.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -45,7 +45,7 @@
{
BaseNode::UpdateCached();
- mTransformParent = shared_dynamic_cast<Transform>
+ mTransformParent = dynamic_pointer_cast<Transform>
(GetParentSupportingClass("Transform").lock());
if (mTransformParent.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -1284,7 +1284,7 @@
if (mGameState->GetModeTime() >= 10)
{
boost::shared_ptr<GameControlServer> gameControlServer =
- shared_dynamic_cast<GameControlServer>(GetCore()->Get("/sys/server/gamecontrol"));
+ dynamic_pointer_cast<GameControlServer>(GetCore()->Get("/sys/server/gamecontrol"));
gameControlServer->Quit();
}
}
Modified: trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -106,7 +106,7 @@
{
// we need the SexpParser to generate the predicates
// from S-Expressions
- mSexpParser = shared_dynamic_cast<oxygen::BaseParser>(GetCore()->New("SexpParser"));
+ mSexpParser = dynamic_pointer_cast<oxygen::BaseParser>(GetCore()->New("SexpParser"));
if (mSexpParser.get() == 0)
{
@@ -114,7 +114,7 @@
return;
}
- mGameControl = shared_dynamic_cast<GameControlServer>
+ mGameControl = dynamic_pointer_cast<GameControlServer>
(GetCore()->Get("/sys/server/gamecontrol"));
if (mGameControl.get() == 0)
@@ -122,7 +122,7 @@
GetLog()->Error() << "ERROR: (TrainerCommandParser) Unable to get GameControlServer\n";
}
- mSimServer = shared_dynamic_cast<SimulationServer>
+ mSimServer = dynamic_pointer_cast<SimulationServer>
(GetCore()->Get("/sys/server/simulation"));
if (mSimServer.get() == 0)
@@ -130,7 +130,7 @@
GetLog()->Error() << "ERROR: (TrainerCommandParser) Unable to get SimulationServer\n";
}
- mMonitorControl = shared_dynamic_cast<MonitorControl>
+ mMonitorControl = dynamic_pointer_cast<MonitorControl>
(mSimServer->GetControlNode("MonitorControl"));
if (mMonitorControl.get() == 0)
@@ -648,7 +648,7 @@
{
// search for the first agent of the left/right side
boost::shared_ptr<AgentState> agentState =
- shared_dynamic_cast<AgentState>((*aaiter)->GetChild("AgentState", true));
+ dynamic_pointer_cast<AgentState>((*aaiter)->GetChild("AgentState", true));
if ((specified && agentState->GetUniformNumber() == unum && agentState->GetTeamIndex() == idx) ||
(!specified && agentState->IsSelected()))
Modified: trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -92,7 +92,7 @@
mAgentAspect = agent_aspect;
}
- mAgentState = shared_static_cast<AgentState>
+ mAgentState = static_pointer_cast<AgentState>
(mAgentAspect->GetChildOfClass("AgentState",true));
if (mAgentState == 0)
{
@@ -135,7 +135,7 @@
bool
VisionPerceptor::ConstructInternal()
{
- mRay = shared_static_cast<oxygen::RayCollider>
+ mRay = static_pointer_cast<oxygen::RayCollider>
(GetCore()->New("oxygen/RayCollider"));
if (mRay.get() == 0)
@@ -159,7 +159,7 @@
i != objectList.end(); ++i)
{
ObjectData od;
- od.mObj = shared_static_cast<ObjectState>(*i);
+ od.mObj = static_pointer_cast<ObjectState>(*i);
if (od.mObj.get() == 0)
{
@@ -411,7 +411,7 @@
// dContactGeom contact;
-// boost::shared_ptr<Collider> collider = shared_static_cast<Collider>
+// boost::shared_ptr<Collider> collider = static_pointer_cast<Collider>
// (i->mObj->GetChildSupportingClass("Collider"));
// if (mRay->Intersects(collider))
Modified: trunk/rcssserver3d/plugin/soccermonitor/soccerinput.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/soccerinput.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccermonitor/soccerinput.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -76,7 +76,7 @@
scriptServer->CreateVariable("Command.KillSelection", CmdKillSelection);
scriptServer->CreateVariable("Command.ReposSelection", CmdReposSelection);
- mMonitorClient = shared_dynamic_cast<NetClient>
+ mMonitorClient = dynamic_pointer_cast<NetClient>
(GetCore()->Get("/sys/server/simulation/SparkMonitorClient"));
if (mMonitorClient.get() == 0)
@@ -86,7 +86,7 @@
}
// get camera body
- mCameraBody = shared_dynamic_cast<RigidBody>
+ mCameraBody = dynamic_pointer_cast<RigidBody>
(GetCore()->Get("/usr/scene/camera/physics"));
if (mCameraBody.get() == 0)
@@ -96,7 +96,7 @@
}
// get fps controller
- mFPS = shared_dynamic_cast<FPSController>
+ mFPS = dynamic_pointer_cast<FPSController>
(GetCore()->Get("/usr/scene/camera/physics/controller"));
if (mFPS.get() == 0)
@@ -271,7 +271,7 @@
}
boost::shared_ptr<SoccerMonitor> soccerMonitor =
- shared_static_cast<SoccerMonitor>(soccerMonitorList.front());
+ static_pointer_cast<SoccerMonitor>(soccerMonitorList.front());
salt::Vector2f fieldSize = soccerMonitor->GetFieldSize();
Modified: trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -51,7 +51,7 @@
mScriptServer->CreateVariable("Command.CameraRightCorner", CmdCameraRightCorner);
mScriptServer->CreateVariable("Command.CameraRightGoal", CmdCameraRightGoal);
- mMonitorClient = shared_dynamic_cast<SimControlNode>
+ mMonitorClient = dynamic_pointer_cast<SimControlNode>
(GetCore()->Get("/sys/server/simulation/SparkMonitorLogFileServer"));
if (mMonitorClient.get() == 0)
@@ -61,7 +61,7 @@
}
// get fps controller
- mFPS = shared_dynamic_cast<FPSController>
+ mFPS = dynamic_pointer_cast<FPSController>
(GetCore()->Get("/usr/scene/camera/physics/controller"));
if (mFPS.get() == 0)
@@ -71,7 +71,7 @@
}
// get camera body
- mCameraBody = shared_dynamic_cast<RigidBody>
+ mCameraBody = dynamic_pointer_cast<RigidBody>
(GetCore()->Get("/usr/scene/camera/physics"));
if (mCameraBody.get() == 0)
Modified: trunk/rcssserver3d/plugin/soccermonitor/soccerrender.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/soccerrender.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/plugin/soccermonitor/soccerrender.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -45,7 +45,7 @@
{
// get the FontServer
mFontServer =
- shared_static_cast<FontServer>(GetCore()->Get("/sys/server/font"));
+ static_pointer_cast<FontServer>(GetCore()->Get("/sys/server/font"));
if (mFontServer.get() == 0)
{
GetLog()->Error() << "ERROR: (SoccerRender) Unable to get FontServer\n";
@@ -63,14 +63,14 @@
}
// get the SoccerMonitor
- mMonitor = shared_static_cast<SoccerMonitor>
+ mMonitor = static_pointer_cast<SoccerMonitor>
(GetCore()->Get("/sys/server/simulation/SparkMonitorClient/SoccerMonitor"));
if (mMonitor.get() == 0)
{
GetLog()->Error() << "ERROR: (SoccerRender) Unable to get SoccerMonitor\n";
}
- mInput = shared_static_cast<SoccerInput>
+ mInput = static_pointer_cast<SoccerInput>
(GetCore()->Get("/sys/server/simulation/InputControl/SoccerInput"));
if (mInput.get() == 0)
Modified: trunk/rcssserver3d/rcssagent3d/hoap2behavior.cpp
===================================================================
--- trunk/rcssserver3d/rcssagent3d/hoap2behavior.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/rcssagent3d/hoap2behavior.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -58,7 +58,7 @@
{
mZG.GetCore()->ImportBundle("sexpparser");
- mParser = shared_static_cast<BaseParser>
+ mParser = static_pointer_cast<BaseParser>
(mZG.GetCore()->New("SexpParser"));
if (mParser.get() == 0)
Modified: trunk/rcssserver3d/rcssagent3d/naobehavior.cpp
===================================================================
--- trunk/rcssserver3d/rcssagent3d/naobehavior.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/rcssagent3d/naobehavior.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -94,7 +94,7 @@
{
mZG.GetCore()->ImportBundle("sexpparser");
- mParser = shared_static_cast<BaseParser>
+ mParser = static_pointer_cast<BaseParser>
(mZG.GetCore()->New("SexpParser"));
if (mParser.get() == 0)
Modified: trunk/rcssserver3d/rcssagent3d/soccerbehavior.cpp
===================================================================
--- trunk/rcssserver3d/rcssagent3d/soccerbehavior.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/rcssagent3d/soccerbehavior.cpp 2013-02-13 08:31:45 UTC (rev 331)
@@ -44,7 +44,7 @@
string SoccerBehavior::Init()
{
mZG.GetCore()->ImportBundle("sexpparser");
- mParser = shared_static_cast<BaseParser>
+ mParser = static_pointer_cast<BaseParser>
(mZG.GetCore()->New("SexpParser"));
if (mParser.get() == 0)
Modified: trunk/rcssserver3d/rcssagent3d/soccerbotbehavior.cpp
===================================================================
--- trunk/rcssserver3d/rcssagent3d/soccerbotbehavior.cpp 2012-11-26 20:28:16 UTC (rev 330)
+++ trunk/rcssserver3d/rcssagent3d/soccerbotbehavior.cpp 2013-02-13 08:31...
[truncated message content] |
