Menu
▾
▴
simspark-svn
|
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/BallStateAspec...
[truncated message content] |
|
From: <he...@us...> - 2013-06-19 20:55:52
|
Revision: 370
http://sourceforge.net/p/simspark/svn/370
Author: hedayat
Date: 2013-06-19 20:55:49 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
Better support for cross-compiling using MinGW
Enhance file selection for creating Windows installer using file globs
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/AdditionalSearchPaths.cmake
trunk/spark/lib/zeitgeist/scriptserver/rubywrapper.h
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/rcssserver3d/CMakeLists.txt 2013-06-19 20:55:49 UTC (rev 370)
@@ -12,7 +12,7 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if (WIN32)
- set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/rcssserver3d/ChangeLog 2013-06-19 20:55:49 UTC (rev 370)
@@ -1,3 +1,13 @@
+2013-06-20 Hedayat Vatankhah <hed...@gm...>
+
+ * plugin/soccermonitor/CMakeLists.txt:
+ * plugin/soccer/CMakeLists.txt:
+ - link boost libraries
+
+ * CMakeLists.txt:
+ * cmake/AdditionalSearchPaths.cmake:
+ - support cross-compiling from multiple root dirs
+
2013-06-13 Hedayat Vatankhah <hed...@gm...>
* NEWS:
Modified: trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake
===================================================================
--- trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake 2013-06-19 20:55:49 UTC (rev 370)
@@ -1,3 +1,7 @@
+# useful for cross-compilation from multiple root directories
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH}
+ "$ENV{CMAKE_ALTERNATIVE_ROOT}")
+
if (WIN32)
set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/
"C:/Program Files/SDL/"
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2013-06-19 20:55:49 UTC (rev 370)
@@ -136,7 +136,8 @@
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
-target_link_libraries(soccer ${spark_libs} ${OPENGL_gl_LIBRARY})
+target_link_libraries(soccer ${spark_libs} ${OPENGL_gl_LIBRARY}
+ ${Boost_LIBRARIES})
if (NOT APPLE)
set_target_properties(soccer PROPERTIES VERSION 1.1.0 SOVERSION 1)
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2013-06-19 20:55:49 UTC (rev 370)
@@ -24,7 +24,8 @@
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
-target_link_libraries(soccermonitor ${spark_libs} ${OPENGL_LIBRARIES})
+target_link_libraries(soccermonitor ${spark_libs} ${OPENGL_LIBRARIES}
+ ${Boost_LIBRARIES})
if (NOT APPLE)
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/spark/CMakeLists.txt 2013-06-19 20:55:49 UTC (rev 370)
@@ -38,7 +38,7 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if (WIN32)
- set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
@@ -205,35 +205,42 @@
if (WIN32) # try to find and install third-party .dlls to lib/thirdparty directory
set(THLIBDIR ${LIBDIR}/thirdparty)
- # MinGW dll installation on a single root system
+ # MinGW dll installation on a single root system
if (${CMAKE_CXX_COMPILER} MATCHES "mingw")
- set(MINGW_BIN_DIR "${Boost_LIBRARY_DIRS}/../bin/")
- install(DIRECTORY ${MINGW_BIN_DIR} DESTINATION ${THLIBDIR}
- FILES_MATCHING
- PATTERN "libstdc++*.dll"
- PATTERN "libgcc_s_sjlj*.dll"
- PATTERN "libode*.dll"
- PATTERN "tbb*.dll"
- PATTERN "*boost*regex*mt*.dll"
- PATTERN "*boost*date_time*mt*.dll"
- PATTERN "*boost*thread*mt*.dll"
- PATTERN "libIL*.dll"
- PATTERN "libjpeg*.dll"
- PATTERN "libpng*.dll"
- PATTERN "*freetype*.dll"
- PATTERN "*SDL*.dll")
+ foreach(ROOT_DIR ${CMAKE_FIND_ROOT_PATH})
+ file(GLOB inst_lib_files "${ROOT_DIR}/*/libstdc++*.dll"
+ "${ROOT_DIR}/*/libstdc++*.dll"
+ "${ROOT_DIR}/*/libgcc_s_sjlj*.dll"
+ "${ROOT_DIR}/*/libode*.dll"
+ "${ROOT_DIR}/*/tbb*.dll"
+ "${ROOT_DIR}/*/*boost*system*mt*.dll"
+ "${ROOT_DIR}/*/*boost*chrono*mt*.dll"
+ "${ROOT_DIR}/*/*boost*regex*mt*.dll"
+ "${ROOT_DIR}/*/*boost*date_time*mt*.dll"
+ "${ROOT_DIR}/*/*boost*thread*mt*.dll"
+ "${ROOT_DIR}/*/libIL*.dll"
+ "${ROOT_DIR}/*/libjpeg*.dll"
+ "${ROOT_DIR}/*/libpng*.dll"
+ "${ROOT_DIR}/*/libbz2*.dll"
+ "${ROOT_DIR}/*/*freetype*.dll"
+ "${ROOT_DIR}/*/*ruby*.dll"
+ "${ROOT_DIR}/*/*SDL*.dll")
+ install(PROGRAMS ${inst_lib_files} DESTINATION ${THLIBDIR})
+ endforeach(ROOT_DIR)
endif (${CMAKE_CXX_COMPILER} MATCHES "mingw")
string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
if (EXISTS ${ODEDLL} AND ${ODEDLL} MATCHES ".dll$")
install(PROGRAMS ${ODEDLL} DESTINATION ${THLIBDIR})
endif (EXISTS ${ODEDLL} AND ${ODEDLL} MATCHES ".dll$")
+
+ file(GLOB INST_BOOST "${Boost_LIBRARY_DIRS}/*boost*system*mt*.dll"
+ "${Boost_LIBRARY_DIRS}/*boost*chrono*mt*.dll"
+ "${Boost_LIBRARY_DIRS}/*boost*regex*mt*.dll"
+ "${Boost_LIBRARY_DIRS}/*boost*date_time*mt*.dll"
+ "${Boost_LIBRARY_DIRS}/*boost*thread*mt*.dll")
+ install(PROGRAMS ${INST_BOOST} DESTINATION ${THLIBDIR})
- install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${THLIBDIR}
- FILES_MATCHING PATTERN "*boost*regex*mt*.dll"
- PATTERN "*boost*date_time*mt*.dll"
- PATTERN "*boost*thread*mt*.dll")
-
string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${IL_LIBRARIES}")
if (EXISTS ${DevIL_DLL} AND ${DevIL_DLL} MATCHES ".dll$")
install(PROGRAMS ${DevIL_DLL} DESTINATION ${THLIBDIR})
@@ -242,10 +249,11 @@
string(REGEX REPLACE "(.*)/ruby(.exe)?" "\\1/" RUBY_BINDIR "${RUBY_EXECUTABLE}")
install(DIRECTORY "${RUBY_BINDIR}"
DESTINATION ${THLIBDIR} FILES_MATCHING PATTERN "*.dll")
-
- install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/"
- DESTINATION ${THLIBDIR} FILES_MATCHING
- PATTERN "*freetype*.dll" PATTERN "*zlib*.dll")
+
+ set(FREETYPE_BIN_DIR "${FREETYPE_INCLUDE_DIR_ft2build}/../bin")
+ file(GLOB INST_FREETYPE "${FREETYPE_BIN_DIR}/*freetype*.dll"
+ "${FREETYPE_BIN_DIR}/*zlib*.dll")
+ install(PROGRAMS ${INST_FREETYPE} DESTINATION ${THLIBDIR})
set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
if (EXISTS ${SDL_DLL})
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/spark/ChangeLog 2013-06-19 20:55:49 UTC (rev 370)
@@ -1,3 +1,15 @@
+2013-06-20 Hedayat Vatankhah <hed...@gm...>
+
+ * lib/zeitgeist/scriptserver/rubywrapper.h:
+ - disalbed unsupported pragmas for MinGW
+
+ * lib/zeitgeist/scriptserver/scriptserver.cpp:
+ - fixed a bug in changing current directory in Windows
+
+ * CMakeLists.txt:
+ * cmake/AdditionalSearchPaths.cmake:
+ - fixed some problems in building Windows installer (with MinGW)
+
2013-06-12 Hedayat Vatankhah <hed...@gm...>
* NEWS:
Modified: trunk/spark/cmake/AdditionalSearchPaths.cmake
===================================================================
--- trunk/spark/cmake/AdditionalSearchPaths.cmake 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/spark/cmake/AdditionalSearchPaths.cmake 2013-06-19 20:55:49 UTC (rev 370)
@@ -1,3 +1,7 @@
+# useful for cross-compilation from multiple root directories
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH}
+ "$ENV{CMAKE_ALTERNATIVE_ROOT}")
+
if (WIN32)
set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/
"C:/Program Files/SDL/"
Modified: trunk/spark/lib/zeitgeist/scriptserver/rubywrapper.h
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/rubywrapper.h 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/spark/lib/zeitgeist/scriptserver/rubywrapper.h 2013-06-19 20:55:49 UTC (rev 370)
@@ -41,9 +41,11 @@
#ifdef WIN32
#include <winsock2.h>
+#ifndef __MINGW32__
// disable compiler warning about type cast from VALUE to RBasic*
#pragma warning (disable : 4312)
#endif
+#endif
#include <ruby.h>
@@ -59,9 +61,11 @@
#undef read
#undef write
+#ifndef __MINGW32__
// reenable compiler warning
#pragma warning (default : 4312)
#endif
+#endif
#undef EXTERN
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2013-06-19 20:40:54 UTC (rev 369)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2013-06-19 20:55:49 UTC (rev 370)
@@ -563,7 +563,7 @@
}
#if WIN32
- if (! SetCurrentDirectory(dotDir.c_str()))
+ if (SetCurrentDirectory(dotDir.c_str()))
#else
if (chdir(dotDir.c_str()) == 0)
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2015-09-12 01:48:26
|
Revision: 399
http://sourceforge.net/p/simspark/svn/399
Author: hedayat
Date: 2015-09-12 01:48:23 +0000 (Sat, 12 Sep 2015)
Log Message:
-----------
Add sparkgui and guiplugin to rcssserver3d and update CMake files
Modified Paths:
--------------
trunk/rcssserver3d/AUTHORS
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/cmake/FindSpark.cmake
trunk/rcssserver3d/data/scripts/bindings.rb
trunk/rcssserver3d/doc/Doxyfile.in
trunk/rcssserver3d/plugin/CMakeLists.txt
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h
trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/simspark-utilities/cmake/FindSpark.cmake
Added Paths:
-----------
trunk/rcssserver3d/cmake/FindCarbon.cmake
trunk/rcssserver3d/guiplugin/
trunk/rcssserver3d/guiplugin/CMakeLists.txt
trunk/rcssserver3d/guiplugin/soccercontrolframe/
trunk/rcssserver3d/guiplugin/soccercontrolframe/CMakeLists.txt
trunk/rcssserver3d/guiplugin/soccercontrolframe/export.h
trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp
trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.h
trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.ui
trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.cpp
trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.h
trunk/rcssserver3d/sparkgui/
trunk/rcssserver3d/sparkgui/CMakeLists.txt
trunk/rcssserver3d/sparkgui/internalsoccerbindingsgui.rb
trunk/rcssserver3d/sparkgui/internalsoccermonitorgui.rb
trunk/rcssserver3d/sparkgui/main.cpp
trunk/rcssserver3d/sparkgui/naosoccersimgui.rb
trunk/rcssserver3d/sparkgui/rcssserver3dintegrated.rb
trunk/rcssserver3d/sparkgui/rcssserver3dinternal.rb
trunk/rcssserver3d/sparkgui/soccersimgui.rb
trunk/rcssserver3d/sparkgui/sparkgui_config.h.cmake
Modified: trunk/rcssserver3d/AUTHORS
===================================================================
--- trunk/rcssserver3d/AUTHORS 2015-09-12 01:47:34 UTC (rev 398)
+++ trunk/rcssserver3d/AUTHORS 2015-09-12 01:48:23 UTC (rev 399)
@@ -11,6 +11,7 @@
Joschka Bödecker <jbo...@un...>
Christoph Ringelstein <cr...@un...>
Hesham Ebrahimi <hes...@gm...>
+Patrick Geib <pg...@un...>
Also see files ChangeLog and THANKS.
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2015-09-12 01:47:34 UTC (rev 398)
+++ trunk/rcssserver3d/CMakeLists.txt 2015-09-12 01:48:23 UTC (rev 399)
@@ -31,6 +31,8 @@
find_package(DevIL REQUIRED)
find_package(ODE REQUIRED)
find_package(OpenGL REQUIRED)
+find_package(Carbon)
+find_package(Qt4 COMPONENTS QtXml QtOpenGl QtGui QtCore)
########## add extra flags ##########
if(NOT CMAKE_BUILD_TYPE)
@@ -40,11 +42,11 @@
add_definitions(-DHAVE_CONFIG_H ${ODE_CFLAGS})
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR}
- ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+ ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR} ${CARBON_INCLUDE_DIR})
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
- set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
+ set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} "-std=gnu++11" CACHE
STRING "Common C++ compiler flags" FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
STRING "C++ compiler flags for Debug builds" FORCE)
@@ -69,6 +71,8 @@
set(CMAKE_SHARED_MODULE_PREFIX "")
mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR)
+
+set(GUI_DATA_DIR ${DATADIR}/carbon)
########## generate configuration file ##########
if (APPLE)
@@ -82,15 +86,34 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rcssserver3d_config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/rcssserver3d_config.h)
+
+########## Additional variables for config files ##########
+if (CARBON_FOUND)
+ set(carbondatadir ${CARBON_DATA_DIR})
+ set(carbonlayoutlibdir ${CARBON_ROOT_DIR}/lib/guilayout)
+ set(carbonpluginlibdir ${CARBON_ROOT_DIR}/lib/guiplugin)
+ set(guipluginlibdir ${CMAKE_INSTALL_PREFIX}/lib/guiplugin)
+ set(GUI_PLUGIN_INCLUDE_DIR include/guiplugin)
+
+ set(carbonsetupdir ${carbondatadir}/setups)
+ set(carbonscriptdir ${carbondatadir}/scripts)
+ set(sparkscriptdir ${CARBON_ROOT_DIR}/${DATADIR}/simspark)
+endif (CARBON_FOUND)
+
########## add subdirectories ############
+set(PLUGIN_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/plugin)
+
add_subdirectory(data)
add_subdirectory(doc)
add_subdirectory(plugin)
add_subdirectory(rcssagent3d)
add_subdirectory(rcssmonitor3d)
add_subdirectory(rcssserver3d)
+if (CARBON_FOUND)
+ add_subdirectory(guiplugin)
+ add_subdirectory(sparkgui)
+endif (CARBON_FOUND)
-
########### install files ###############
install(FILES AUTHORS ChangeLog COPYING NEWS README THANKS TODO
Added: trunk/rcssserver3d/cmake/FindCarbon.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindCarbon.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/FindCarbon.cmake 2015-09-12 01:48:23 UTC (rev 399)
@@ -0,0 +1,51 @@
+# - Find Carbon
+# Find the native Carbon includes and libraries
+#
+# CARBON_INCLUDE_DIR - where to find carbon include files
+# CARBON_LIB_DIR - where to find carbon libraries
+# CARBON_LIBRARIES - list of libraries when using carbon (contains first found carbon lib, debug or release)
+# CARBON_LIBRARY_DEBUG - carbon debug library
+# CARBON_LIBRARY_RELEASE - carbon release library
+# CARBON_FOUND - true if a carbon library was found
+
+# Carbon section
+IF (CARBON_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(CARBON_FIND_QUIETLY TRUE)
+ENDIF (CARBON_INCLUDE_DIR)
+
+SET(CARBON_DIR $ENV{CARBON_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
+
+FIND_PATH(CARBON_INCLUDE_DIR carbon/carbon.h
+ PATHS ${CARBON_DIR}
+ PATH_SUFFIXES simspark include/simspark)
+
+FIND_PATH(CARBON_ROOT_DIR share/carbon/setups/DefaultSetupGrid.xml
+ PATHS ${CARBON_DIR})
+
+FIND_PATH(CARBON_DATA_DIR setups/DefaultSetupGrid.xml
+ PATHS ${CARBON_DIR}
+ PATH_SUFFIXES share/carbon)
+
+SET(CARBON_NAMES carbon carbon_debug)
+FIND_LIBRARY(CARBON_LIBRARY NAMES ${CARBON_NAMES}
+ PATHS ${CARBON_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
+
+GET_FILENAME_COMPONENT(CARBON_LIB_DIR ${CARBON_LIBRARY} PATH)
+
+# handle the QUIETLY and REQUIRED arguments and set CARBON_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CARBON DEFAULT_MSG CARBON_LIBRARY
+ CARBON_INCLUDE_DIR)
+
+IF(CARBON_FOUND)
+ SET( CARBON_LIBRARIES ${CARBON_LIBRARY} )
+ STRING(REPLACE "carbon." "carbon_debug." CARBON_LIBRARY_DEBUG ${CARBON_LIBRARY})
+ STRING(REPLACE "carbon_debug." "carbon." CARBON_LIBRARY_RELEASE ${CARBON_LIBRARY})
+ELSE(CARBON_FOUND)
+ SET( CARBON_LIBRARIES )
+ENDIF(CARBON_FOUND)
+
+MARK_AS_ADVANCED( CARBON_PLUGIN_LIB_DIR CARBON_LAYOUT_LIB_DIR CARBON_DIR CARBON_LIBRARY CARBON_LIBRARY_RELEASE CARBON_LIBRARY_DEBUG CARBON_INCLUDE_DIR )
Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake 2015-09-12 01:47:34 UTC (rev 398)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake 2015-09-12 01:48:23 UTC (rev 399)
@@ -1,25 +1,39 @@
# - Find Spark
# Find the native Spark includes and libraries
#
-# SPARK_INCLUDE_DIR - where to find spark include files
-# SPARK_LIB_DIR - where to find spark libraries
-# SPARK_LIBRARIES - List of libraries when using spark.
-# SPARK_FOUND - True if spark found.
-# SALT_INCLUDE_DIR - where to find salt include files
-# SALT_LIBRARIES - List of libraries when using salt.
-# SALT_FOUND - True if salt found.
-# ZEITGEIST_INCLUDE_DIR - where to find zeitgeist include files
-# ZEITGEIST_LIBRARIES - List of libraries when using zeitgeist.
-# ZEITGEIST_FOUND - True if zeitgeist found.
-# OXYGEN_INCLUDE_DIR - where to find oxygen include files
-# OXYGEN_LIBRARIES - List of libraries when using oxygen.
-# OXYGEN_FOUND - True if oxygen found.
-# KEROSIN_INCLUDE_DIR - where to find kerosin include files
-# KEROSIN_LIBRARIES - List of libraries when using kerosin.
-# KEROSIN_FOUND - True if kerosin found.
-# RCSSNET3D_INCLUDE_DIR - where to find kerosin include files
-# RCSSNET3D_LIBRARIES - List of libraries when using kerosin.
-# RCSSNET3D_FOUND - True if kerosin found.
+# SPARK_INCLUDE_DIR - where to find spark include files
+# SPARK_LIB_DIR - where to find spark libraries
+# SPARK_LIBRARIES - list of libraries when using spark (contains first found spark lib, debug or release)
+# SPARK_LIBRARY_DEBUG - spark debug library
+# SPARK_LIBRARY_RELEASE - spark release library
+# SPARK_FOUND - true if a spark library was found
+# SALT_INCLUDE_DIR - where to find salt include files
+# SALT_LIB_DIR - where to find salt libraries
+# SALT_LIBRARIES - list of libraries when using salt (contains first found salt lib, debug or release)
+# SALT_LIBRARY_DEBUG - salt debug library
+# SALT_LIBRARY_RELEASE - salt release library
+# SALT_FOUND - true if a salt library was found
+# KEROSIN_INCLUDE_DIR - where to find spark include files
+# KEROSIN_LIB_DIR - where to find spark libraries
+# KEROSIN_LIBRARIES - list of libraries when using spark (contains first found spark lib, debug or release)
+# KEROSIN_LIBRARY_DEBUG - spark debug library
+# KEROSIN_LIBRARY_RELEASE - spark release library
+# KEROSIN_FOUND - true if a spark library was found
+# ZEITGEIST_INCLUDE_DIR - where to find zeitgeist include files
+# ZEITGEIST_LIB_DIR - where to find zeitgeist libraries
+# ZEITGEIST_LIBRARIES - list of libraries when using zeitgeist (contains first found zeitgeist lib, debug or release)
+# ZEITGEIST_LIBRARY_DEBUG - zeitgeist debug library
+# ZEITGEIST_LIBRARY_RELEASE - zeitgeist release library
+# ZEITGEIST_FOUND - true if a zeitgeist library was found
+# OXYGEN_INCLUDE_DIR - where to find oxygen include files
+# OXYGEN_LIB_DIR - where to find oxygen libraries
+# OXYGEN_LIBRARIES - list of libraries when using oxygen (contains first found oxygen lib, debug or release)
+# OXYGEN_LIBRARY_DEBUG - oxygen debug library
+# OXYGEN_LIBRARY_RELEASE - oxygen release library
+# OXYGEN_FOUND - true if a oxygen library was found
+# RCSSNET3D_INCLUDE_DIR - where to find rcssnet include files
+# RCSSNET3D_LIBRARIES - List of libraries when using rcssnet.
+# RCSSNET3D_FOUND - True if rcssnet found.
# Spark section
IF (SPARK_INCLUDE_DIR)
@@ -30,16 +44,16 @@
SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark include/simspark)
SET(SPARK_NAMES spark spark_debug)
FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark lib/simspark)
GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
-# handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SPARK DEFAULT_MSG SPARK_LIBRARY
@@ -47,11 +61,13 @@
IF(SPARK_FOUND)
SET( SPARK_LIBRARIES ${SPARK_LIBRARY} )
+ STRING(REPLACE "spark." "spark_debug." SPARK_LIBRARY_DEBUG ${SPARK_LIBRARY})
+ STRING(REPLACE "spark_debug." "spark." SPARK_LIBRARY_RELEASE ${SPARK_LIBRARY})
ELSE(SPARK_FOUND)
SET( SPARK_LIBRARIES )
ENDIF(SPARK_FOUND)
-MARK_AS_ADVANCED( SPARK_LIBRARY SPARK_INCLUDE_DIR )
+MARK_AS_ADVANCED( SPARK_LIBRARY SPARK_LIBRARY_RELEASE SPARK_LIBRARY_DEBUG SPARK_INCLUDE_DIR )
# Salt section
IF (SALT_INCLUDE_DIR)
@@ -60,15 +76,15 @@
ENDIF (SALT_INCLUDE_DIR)
FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark include/simspark)
SET(SALT_NAMES salt salt_debug)
FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark lib/simspark)
-# handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SALT DEFAULT_MSG SALT_LIBRARY
@@ -76,11 +92,13 @@
IF(SALT_FOUND)
SET( SALT_LIBRARIES ${SALT_LIBRARY} )
+ STRING(REPLACE "salt." "salt_debug." SALT_LIBRARY_DEBUG ${SALT_LIBRARY})
+ STRING(REPLACE "salt_debug." "salt." SALT_LIBRARY_RELEASE ${SALT_LIBRARY})
ELSE(SALT_FOUND)
SET( SALT_LIBRARIES )
ENDIF(SALT_FOUND)
-MARK_AS_ADVANCED( SALT_LIBRARY SALT_INCLUDE_DIR )
+MARK_AS_ADVANCED( SALT_LIBRARY SALT_LIBRARY_RELEASE SALT_LIBRARY_DEBUG SALT_INCLUDE_DIR )
# Zeitgeist section
IF (ZEITGEIST_INCLUDE_DIR)
@@ -89,15 +107,15 @@
ENDIF (ZEITGEIST_INCLUDE_DIR)
FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark include/simspark)
SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark lib/simspark)
-# handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZEITGEIST DEFAULT_MSG ZEITGEIST_LIBRARY
@@ -105,11 +123,13 @@
IF(ZEITGEIST_FOUND)
SET( ZEITGEIST_LIBRARIES ${ZEITGEIST_LIBRARY} )
+ STRING(REPLACE "zeitgeist." "zeitgeist_debug." ZEITGEIST_LIBRARY_DEBUG ${ZEITGEIST_LIBRARY})
+ STRING(REPLACE "zeitgeist_debug." "zeitgeist." ZEITGEIST_LIBRARY_RELEASE ${ZEITGEIST_LIBRARY})
ELSE(ZEITGEIST_FOUND)
SET( ZEITGEIST_LIBRARIES )
ENDIF(ZEITGEIST_FOUND)
-MARK_AS_ADVANCED( ZEITGEIST_LIBRARY ZEITGEIST_INCLUDE_DIR )
+MARK_AS_ADVANCED( ZEITGEIST_LIBRARY ZEITGEIST_LIBRARY_RELEASE ZEITGEIST_LIBRARY_DEBUG ZEITGEIST_INCLUDE_DIR )
# Oxygen section
IF (OXYGEN_INCLUDE_DIR)
@@ -118,15 +138,15 @@
ENDIF (OXYGEN_INCLUDE_DIR)
FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark include/simspark)
SET(OXYGEN_NAMES oxygen oxygen_debug)
FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark lib/simspark)
-# handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OXYGEN DEFAULT_MSG OXYGEN_LIBRARY
@@ -134,11 +154,13 @@
IF(OXYGEN_FOUND)
SET( OXYGEN_LIBRARIES ${OXYGEN_LIBRARY} )
+ STRING(REPLACE "oxygen." "oxygen_debug." OXYGEN_LIBRARY_DEBUG ${OXYGEN_LIBRARY})
+ STRING(REPLACE "oxygen_debug." "oxygen." OXYGEN_LIBRARY_RELEASE ${OXYGEN_LIBRARY})
ELSE(OXYGEN_FOUND)
SET( OXYGEN_LIBRARIES )
ENDIF(OXYGEN_FOUND)
-MARK_AS_ADVANCED( OXYGEN_LIBRARY OXYGEN_INCLUDE_DIR )
+MARK_AS_ADVANCED( OXYGEN_LIBRARY OXYGEN_LIBRARY_RELEASE OXYGEN_LIBRARY_DEBUG OXYGEN_INCLUDE_DIR )
# Kerosin section
IF (KEROSIN_INCLUDE_DIR)
@@ -147,15 +169,15 @@
ENDIF (KEROSIN_INCLUDE_DIR)
FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark include/simspark)
SET(KEROSIN_NAMES kerosin kerosin_debug)
FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark lib/simspark)
-# handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEROSIN DEFAULT_MSG KEROSIN_LIBRARY
@@ -163,11 +185,13 @@
IF(KEROSIN_FOUND)
SET( KEROSIN_LIBRARIES ${KEROSIN_LIBRARY} )
+ STRING(REPLACE "kerosin." "kerosin_debug." KEROSIN_LIBRARY_DEBUG ${KEROSIN_LIBRARY})
+ STRING(REPLACE "kerosin_debug." "kerosin." KEROSIN_LIBRARY_RELEASE ${KEROSIN_LIBRARY})
ELSE(KEROSIN_FOUND)
SET( KEROSIN_LIBRARIES )
ENDIF(KEROSIN_FOUND)
-MARK_AS_ADVANCED( KEROSIN_LIBRARY KEROSIN_INCLUDE_DIR )
+MARK_AS_ADVANCED( KEROSIN_LIBRARY KEROSIN_LIBRARY_RELEASE KEROSIN_LIBRARY_DEBUG KEROSIN_INCLUDE_DIR )
# rcssnet3D
IF (RCSSNET3D_INCLUDE_DIR)
@@ -176,15 +200,15 @@
ENDIF (RCSSNET3D_INCLUDE_DIR)
FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark include/simspark)
SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES}
- HINTS ${SPARK_DIR}
+ PATHS ${SPARK_DIR}
PATH_SUFFIXES simspark lib/simspark)
-# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(RCSSNET3D DEFAULT_MSG RCSSNET3D_LIBRARY
Modified: trunk/rcssserver3d/data/scripts/bindings.rb
===================================================================
--- trunk/rcssserver3d/data/scripts/bindings.rb 2015-09-12 01:47:34 UTC (rev 398)
+++ trunk/rcssserver3d/data/scripts/bindings.rb 2015-09-12 01:48:23 UTC (rev 399)
@@ -14,9 +14,10 @@
inputServer.bindCommand('axisy', Command.MouseY);
inputServer.bindCommand('mouse_left', Command.Mouselook);
inputServer.bindCommand('mouse_right',Command.Up);
+ inputServer.bindCommand('mouse_middle',Command.Down);
inputServer.bindCommand('pagedown', Command.Down);
- inputServer.bindCommand('kp_minus', Command.Down);
- inputServer.bindCommand('kp_plus',Command.Up);
+ inputServer.bindCommand('kp_minus', Command.Down);
+ inputServer.bindCommand('kp_plus', Command.Up);
inputServer.bindCommand('pageup', Command.Up);
inputServer.bindCommand('q', Command.Quit)
inputServer.bindCommand('a', Command.Left)
Modified: trunk/rcssserver3d/doc/Doxyfile.in
===================================================================
--- trunk/rcssserver3d/doc/Doxyfile.in 2015-09-12 01:47:34 UTC (rev 398)
+++ trunk/rcssserver3d/doc/Doxyfile.in 2015-09-12 01:48:23 UTC (rev 399)
@@ -58,7 +58,9 @@
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = @top_srcdir@/plugin
+INPUT = @top_srcdir@/plugin \
+ @top_srcdir@/guiplugin \
+ @top_srcdir@/sparkgui
FILE_PATTERNS = *.h \
*.cpp
RECURSIVE = YES
Added: trunk/rcssserver3d/guiplugin/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/guiplugin/CMakeLists.txt (rev 0)
+++ trunk/rcssserver3d/guiplugin/CMakeLists.txt 2015-09-12 01:48:23 UTC (rev 399)
@@ -0,0 +1,9 @@
+if (WIN32 OR APPLE)
+ set(spark_gui_debug_libs ${SALT_LIBRARY_DEBUG} ${OXYGEN_LIBRARY_DEBUG} ${ZEITGEIST_LIBRARY_DEBUG}
+ ${KEROSIN_LIBRARY_DEBUG} ${SPARK_LIBRARY_DEBUG} ${CARBON_LIBRARY_DEBUG} ${RCSSNET3D_LIBRARY})
+ set(spark_gui_release_libs ${SALT_LIBRARY_RELEASE} ${OXYGEN_LIBRARY_RELEASE} ${ZEITGEIST_LIBRARY_RELEASE}
+ ${KEROSIN_LIBRARY_RELEASE} ${SPARK_LIBRARY_RELEASE} ${CARBON_LIBRARY_RELEASE} ${RCSSNET3D_LIBRARY})
+endif (WIN32 OR APPLE)
+
+add_subdirectory(soccercontrolframe)
+
Added: trunk/rcssserver3d/guiplugin/soccercontrolframe/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/guiplugin/soccercontrolframe/CMakeLists.txt (rev 0)
+++ trunk/rcssserver3d/guiplugin/soccercontrolframe/CMakeLists.txt 2015-09-12 01:48:23 UTC (rev 399)
@@ -0,0 +1,105 @@
+########### target files ###############
+set(soccercontrolframe_QOBJECT_HEADERS
+ soccercontrolframe.h
+)
+
+set(soccercontrolframe_HEADERS
+ soccercontrolframe_soccercommands.h
+ export.h
+
+ ${PLUGIN_INCLUDE_DIR}/soccer/agentstate/agentstate.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/ballstateaspect/ballstateaspect.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/gamestateaspect/gamestateaspect.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/gamestateaspect/gamestateitem.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/objectstate/objectstate.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccerbase/soccerbase.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccercontrolaspect/soccercontrolaspect.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccernode/soccernode.h
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccertypes.h
+)
+
+set(soccercontrolframe_SOURCES
+ soccercontrolframe.cpp
+ soccercontrolframe_soccercommands.cpp
+
+ ${PLUGIN_INCLUDE_DIR}/soccer/agentstate/agentstate.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/agentstate/agentstate_c.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/ballstateaspect/ballstateaspect.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/ballstateaspect/ballstateaspect_c.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/gamestateaspect/gamestateaspect.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/gamestateaspect/gamestateaspect_c.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/gamestateaspect/gamestateitem.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/gamestateaspect/gamestateitem_c.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/objectstate/objectstate.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/objectstate/objectstate_c.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccerbase/soccerbase.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccercontrolaspect/soccercontrolaspect.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccercontrolaspect/soccercontrolaspect_c.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccernode/soccernode.cpp
+ ${PLUGIN_INCLUDE_DIR}/soccer/soccernode/soccernode_c.cpp
+)
+
+set(soccercontrolframe_FORMS
+ soccercontrolframe.ui
+)
+
+#set(soccercontrolframe_RESOURCES)
+
+########### qt properties ###############
+
+#Additional used libraries
+set(QT_USE_QTOPENGL TRUE)
+set(QT_USE_QTXML TRUE)
+
+#Include qt properties
+include(${QT_USE_FILE})
+add_definitions(${QT_DEFINITIONS})
+
+########### create library ###############
+
+#Meta object compiler wrapping of header files, forms and resources
+QT4_WRAP_CPP(soccercontrolframe_QOBJECT_HEADERS_MOC ${soccercontrolframe_QOBJECT_HEADERS})
+QT4_WRAP_UI(soccercontrolframe_FORMS_HEADERS ${soccercontrolframe_FORMS})
+#QT4_ADD_RESOURCES(soccercontrolframe_RESOURCES_RCC ${soccercontrolframe_RESOURCES})
+
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CARBON_INCLUDE_DIR}/carbon
+ ${FREETYPE_INCLUDE_DIRS}
+ ${IL_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${PLUGIN_INCLUDE_DIR}/soccer
+ ${PLUGIN_INCLUDE_DIR})
+
+add_library(
+ soccercontrolframe MODULE
+ ${soccercontrolframe_SOURCES}
+ ${soccercontrolframe_QOBJECT_HEADERS}
+ ${soccercontrolframe_QOBJECT_HEADERS_MOC}
+ ${soccercontrolframe_HEADERS}
+ ${soccercontrolframe_FORMS_HEADERS})
+ #${soccercontrolframe_RESOURCES_RCC})
+
+set(soccercontrolframe_LIBS ${OPENGL_LIBRARIES} ${QT_LIBRARIES})
+set(soccercontrolframe_DEBUG_LIBS ${spark_gui_debug_libs})
+set(soccercontrolframe_RELEASE_LIBS ${spark_gui_release_libs})
+
+target_link_libraries(soccercontrolframe ${soccercontrolframe_LIBS})
+FOREACH(LIB ${soccercontrolframe_DEBUG_LIBS})
+ target_link_libraries(soccercontrolframe debug ${LIB})
+ENDFOREACH(LIB)
+FOREACH(LIB ${soccercontrolframe_RELEASE_LIBS})
+ target_link_libraries(soccercontrolframe optimized ${LIB})
+ENDFOREACH(LIB)
+
+if (NOT APPLE)
+ set_target_properties(soccercontrolframe PROPERTIES VERSION 1.0.0 SOVERSION 1)
+endif (NOT APPLE)
+
+install(TARGETS soccercontrolframe DESTINATION ${guipluginlibdir})
+
+########### install files ###############
+
+install(DIRECTORY ./ DESTINATION ${GUI_PLUGIN_INCLUDE_DIR}/soccercontrolframe
+ FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
Added: trunk/rcssserver3d/guiplugin/soccercontrolframe/export.h
===================================================================
--- trunk/rcssserver3d/guiplugin/soccercontrolframe/export.h (rev 0)
+++ trunk/rcssserver3d/guiplugin/soccercontrolframe/export.h 2015-09-12 01:48:23 UTC (rev 399)
@@ -0,0 +1,14 @@
+#ifndef EXPORT_LIB
+#define EXPORT_LIB
+/**
+ * \file soccercontrolframe/export.h
+ * \brief Exports the SoccerControlFrame class as a plugin from a shared library.
+ */
+
+#include "soccercontrolframe.h"
+
+PLUGINS_EXPORT_BEGIN()
+PLUGIN_EXPORT(SoccerControlFrame)
+PLUGINS_EXPORT_END()
+
+#endif
\ No newline at end of file
Added: trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp
===================================================================
--- trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp (rev 0)
+++ trunk/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp 2015-09-12 01:48:23 UTC (rev 399)
@@ -0,0 +1,610 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Author: Patrick Geib
+ Copyright (C) 2012 RoboCup Soccer Server 3D Maintenance Group
+ $Id$
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+//Local
+#include "soccercontrolframe.h"
+#include "soccercontrolframe_soccercommands.h"
+#include "export.h"
+
+//Carbon
+#include <pluginmanager.h>
+#include <carbon.h>
+#include <simulationmanager.h>
+#include <simulation.h>
+#include <sparkcontroller.h>
+#include <guisimcontrol.h>
+#include <serverthread.h>
+#include <simspark.h>
+#include <settings.h>
+
+//SimSpark
+#include <oxygen/gamecontrolserver/gamecontrolserver.h>
+#include <zeitgeist/leaf.h>
+
+//Soccer
+#include "soccer/gamestateaspect/gamestateaspect.h"
+#include "soccer/soccerruleaspect/soccerruleaspect.h"
+#include "soccer/ballstateaspect/ballstateaspect.h"
+//#include <agentstate/agentstate.h>
+
+//Boost
+#include <boost/make_shared.hpp>
+
+//Qt
+#include <QValidator>
+
+using namespace boost;
+using namespace oxygen;
+using namespace SoccerControlFrameUtil;
+
+//--------------------------------------------------------------
+// Static
+//--------------------------------------------------------------
+
+//Factory registration
+REGISTER_EXPORT_FRAME(SoccerControlFrame, "soccercontrolframe", "Soccer", 1000)
+
+//Static class information
+void SoccerControlFrame::saveClassInfo()
+{
+ //Description
+ setClassInfo(mClassId, AbstractPlugin::PI_DESCRIPTION,
+ tr("The soccer control frame can be used to monitor and control the state of a simspark soccer simulation."));
+
+ //Icon
+ setClassInfo(mClassId, AbstractPlugin::PI_ICON_NAME, ":soccer");
+
+ //Tags
+ QStringList tags;
+ tags << "soccer" << "spark" << "rcssserver3d";
+ setClassInfo(mClassId, AbstractPlugin::PI_TAGS, tags);
+}
+
+//--------------------------------------------------------------
+// SoccerFrameUpdateControl
+//--------------------------------------------------------------
+
+SoccerFrameUpdateControl::SoccerFrameUpdateControl(SoccerControlFrame* parent)
+ : mParent(parent), CommandQueue(0)
+{
+}
+SoccerFrameUpdateControl::~SoccerFrameUpdateControl()
+{
+}
+
+void SoccerFrameUpdateControl::startCycle()
+{
+ emit stateStartCycle();
+}
+
+void SoccerFrameUpdateControl::endCycle()
+{
+ SparkCommand::CommandQueue::endCycle();
+ emit stateEndCycle();
+}
+
+void SoccerFrameUpdateControl::waitCycle()
+{
+ SparkCommand::CommandQueue::waitCycle();
+ emit stateWaitCycle();
+}
+
+//--------------------------------------------------------------
+// SoccerFrame
+//--------------------------------------------------------------
+// Public
+//--------------------------------------------------------------
+
+SoccerControlFrame::SoccerControlFrame() :
+ mSettings(getCarbon()->getSettings())
+{
+ //----------------
+ //Layout
+ ui.setupUi(this);
+ loadFrameDesign();
+
+ //----------------
+ //Variables
+ mInit = false;
+ mLastInitState = true; //--> 1 display update during initialization
+ mReadyUpdate = true;
+ mSelectedPlayer = -1;
+ mSelectedPlayMode = PM_NONE;
+ mUpdateTimer.setInterval(100);
+
+ //----------------
+ //Gui-Field init
+ ui.gameTimeEdit->setValidator(new QDoubleValidator(0.0, INT_MAX, 4, ui.gameTimeEdit));
+ ui.team1GoalsEdit->setValidator(new QIntValidator(0, INT_MAX, ui.team1GoalsEdit));
+ ui.team2GoalsEdit->setValidator(new QIntValidator(0, INT_MAX, ui.team2GoalsEdit));
+ ui.team1PenaltiesEdit->setValidator(new QIntValidator(0, INT_MAX, ui.team1PenaltiesEdit));
+ ui.team2PenaltiesEdit->setValidator(new QIntValidator(0, INT_MAX, ui.team2PenaltiesEdit));
+ ui.b...
[truncated message content] |
|
From: <he...@us...> - 2015-09-12 01:49:01
|
Revision: 404
http://sourceforge.net/p/simspark/svn/404
Author: hedayat
Date: 2015-09-12 01:48:59 +0000 (Sat, 12 Sep 2015)
Log Message:
-----------
Undo some weird changes in GUI branch
Modified Paths:
--------------
trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h
trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
Modified: trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h 2015-09-12 01:48:50 UTC (rev 403)
+++ trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h 2015-09-12 01:48:59 UTC (rev 404)
@@ -144,7 +144,7 @@
TNodeCacheMap mNodeCache;
};
-DECLARE_ABSTRACTCLASS(RCS3DMonitor);
+DECLARE_CLASS(RCS3DMonitor);
#endif // RCS3DMONITOR_H__
Modified: trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h 2015-09-12 01:48:50 UTC (rev 403)
+++ trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h 2015-09-12 01:48:59 UTC (rev 404)
@@ -124,6 +124,6 @@
bool mSentFlags;
};
-DECLARE_ABSTRACTCLASS(SexpMonitor);
+DECLARE_CLASS(SexpMonitor);
#endif // SEXPMONITOR_H__
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2015-09-12 01:48:50 UTC (rev 403)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2015-09-12 01:48:59 UTC (rev 404)
@@ -614,6 +614,25 @@
ERunScriptErrorType result = eNotFound;
+ // Trying directory given in mRelPathPrefix
+ if (!mRelPathPrefix.empty())
+ {
+ result = RunInitScriptInternal(mRelPathPrefix, fileName, validDotDir, dotDir);
+ if (result == eOK)
+ {
+ GetLog()->Debug() << "(ScriptServer) : Ran init script '"
+ << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+ return true;
+ }
+ else if (result == eError)
+ {
+ GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
+ << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+ return false;
+ }
+ }
+
+
if (validDotDir)
{
// Trying dot-dir in home directory
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2017-03-24 21:15:12
|
Revision: 413
http://sourceforge.net/p/simspark/svn/413
Author: hedayat
Date: 2017-03-24 21:15:10 +0000 (Fri, 24 Mar 2017)
Log Message:
-----------
Use TXZ as default source format rather than TGZ
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/spark/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2017-03-24 17:16:19 UTC (rev 412)
+++ trunk/rcssserver3d/CMakeLists.txt 2017-03-24 21:15:10 UTC (rev 413)
@@ -138,7 +138,7 @@
########### CPack section #############
include(InstallRequiredSystemLibraries)
-set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_SOURCE_GENERATOR TXZ)
set(CPACK_SOURCE_IGNORE_FILES
/CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
/RELEASE /rpm.am /msi.am)
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2017-03-24 17:16:19 UTC (rev 412)
+++ trunk/spark/CMakeLists.txt 2017-03-24 21:15:10 UTC (rev 413)
@@ -290,7 +290,7 @@
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
########### CPack section #############
-set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_SOURCE_GENERATOR TXZ)
set(CPACK_SOURCE_IGNORE_FILES
/CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
/RELEASE /styles/ /papers/ /rpm.am /msi.am /codingstyle.txt)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X