Menu
▾
▴
simspark-svn — SimSpark SVN commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(20) |
Feb
(11) |
Mar
(6) |
Apr
(5) |
May
(4) |
Jun
(7) |
Jul
(9) |
Aug
(11) |
Sep
|
Oct
(4) |
Nov
(13) |
Dec
(21) |
| 2010 |
Jan
(23) |
Feb
(32) |
Mar
(6) |
Apr
(2) |
May
(10) |
Jun
(15) |
Jul
(1) |
Aug
(1) |
Sep
(3) |
Oct
|
Nov
(1) |
Dec
(16) |
| 2011 |
Jan
(1) |
Feb
(5) |
Mar
(19) |
Apr
(13) |
May
(4) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(4) |
Feb
(8) |
Mar
(2) |
Apr
(6) |
May
(13) |
Jun
(1) |
Jul
|
Aug
|
Sep
(5) |
Oct
|
Nov
(4) |
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(15) |
Apr
(2) |
May
(4) |
Jun
(17) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
(6) |
Jun
(6) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(6) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(7) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <yx...@us...> - 2010-03-30 13:50:50
|
Revision: 191
http://simspark.svn.sourceforge.net/simspark/?rev=191&view=rev
Author: yxu
Date: 2010-03-30 13:50:44 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
convenient function name
Modified Paths:
--------------
trunk/spark/lib/salt/linesegment2.h
Modified: trunk/spark/lib/salt/linesegment2.h
===================================================================
--- trunk/spark/lib/salt/linesegment2.h 2010-03-30 11:33:03 UTC (rev 190)
+++ trunk/spark/lib/salt/linesegment2.h 2010-03-30 13:50:44 UTC (rev 191)
@@ -81,7 +81,7 @@
*
* @return if the segment and line have intersection
*/
- bool IntersectionWithLine(const TLine2<DATATYPE>& line,
+ bool Intersection(const TLine2<DATATYPE>& line,
P_T & intersection)const
{
if ( TLine2<DATATYPE>::Intersection(line, intersection) )
@@ -102,8 +102,8 @@
bool Intersection(const TLineSegment2& seg2,
P_T & intersection)const
{
- if (IntersectionWithLine(seg2, intersection)) {
- return seg2.IsBetween(intersection);
+ if (TLine2<DATATYPE>::Intersection(seg2, intersection)) {
+ return IsBetween(intersection) && seg2.IsBetween(intersection);
}
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yx...@us...> - 2010-03-30 11:33:09
|
Revision: 190
http://simspark.svn.sourceforge.net/simspark/?rev=190&view=rev
Author: yxu
Date: 2010-03-30 11:33:03 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
Sense lines on the field (the first working version)
Modified Paths:
--------------
trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccer/export.cpp
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor_c.cpp
trunk/spark/lib/salt/CMakeLists.txt
Added Paths:
-----------
trunk/rcssserver3d/data/rsg/agent/fieldline.rsg
trunk/rcssserver3d/data/rsg/agent/fieldring.rsg
trunk/rcssserver3d/plugin/soccer/line/
trunk/rcssserver3d/plugin/soccer/line/line.cpp
trunk/rcssserver3d/plugin/soccer/line/line.h
trunk/rcssserver3d/plugin/soccer/line/line_c.cpp
trunk/spark/lib/salt/line2.h
trunk/spark/lib/salt/linesegment2.h
Added: trunk/rcssserver3d/data/rsg/agent/fieldline.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/fieldline.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/fieldline.rsg 2010-03-30 11:33:03 UTC (rev 190)
@@ -0,0 +1,27 @@
+; -*- mode: lisp; -*-
+;
+; create a field line from ($BegX $BegY) to ($EndX $EndY)
+;
+
+(RSG 0 1)
+(
+ (templ $BegX $BegY $EndX $EndY)
+
+ (nd Transform
+ (nd Line
+ (setBeginPoint $BegX $BegY 0)
+ (setEndPoint $EndX $EndY 0)
+ )
+ )
+
+ ;; (def $centerX (eval (eval $BegX + $EndX) / 2.0))
+ ;; (def $centerY (eval (eval $BegY + $EndY) / 2.0))
+ ;; (def $lengthY (eval (eval $EndY - $BegY) / 2.0))
+
+ ;; (nd Transform
+ ;; (setLocalPos $centerX $centerY 0)
+ ;; (nd Box
+ ;; (setExtents 0.1 $lengthY 0.1)
+ ;; )
+ ;; )
+ )
\ No newline at end of file
Added: trunk/rcssserver3d/data/rsg/agent/fieldring.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/fieldring.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/fieldring.rsg 2010-03-30 11:33:03 UTC (rev 190)
@@ -0,0 +1,89 @@
+; -*- mode: lisp; -*-
+;
+; create a field ring with radius $Radius
+;
+
+(RSG 0 1)
+(
+ (templ $Radius)
+
+ (def $px0 1.0)
+ (def $py0 0.0)
+
+ (def $px36 0.80901699437494745)
+ (def $py36 0.58778525229247314)
+
+ (def $px72 0.30901699437494745)
+ (def $py72 0.95105651629515353)
+
+ (def $px108 -0.30901699437494734)
+ (def $py108 0.95105651629515364)
+
+ (def $px144 -0.80901699437494734)
+ (def $py144 0.58778525229247325)
+
+ (def $px180 -1.0)
+ (def $py180 0.0)
+
+ (def $px216 $px144)
+ (def $py216 (eval -1 * $py144))
+
+ (def $px252 $px108)
+ (def $py252 (eval -1 * $py108))
+
+ (def $px288 $px72)
+ (def $py288 (eval -1 * $py72))
+
+ (def $px324 $px36)
+ (def $py324 (eval -1 * $py36))
+
+ (importScene rsg/agent/fieldline.rsg
+ $px0 $py0
+ $px36 $py36
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px36 $py36
+ $px72 $py72
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px72 $py72
+ $px108 $py108
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px108 $py108
+ $px144 $py144
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px144 $py144
+ $px180 $py180
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px180 $py180
+ $px216 $py216
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px216 $py216
+ $px252 $py252
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px252 $py252
+ $px288 $py288
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px288 $py288
+ $px324 $py324
+ )
+
+ (importScene rsg/agent/fieldline.rsg
+ $px324 $py324
+ $px0 $py0
+ )
+ )
Modified: trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg 2010-03-28 08:27:22 UTC (rev 189)
+++ trunk/rcssserver3d/data/rsg/agent/nao/soccer.rsg 2010-03-30 11:33:03 UTC (rev 190)
@@ -10,6 +10,8 @@
(def $FieldWidth (eval Soccer.FieldWidth))
(def $FieldHeight (eval Soccer.FieldHeight))
(def $GoalDepth (eval Soccer.GoalDepth))
+ (def $PenaltyLength (eval Soccer.PenaltyLength))
+ (def $PenaltyWidth (eval Soccer.PenaltyWidth))
;; height of the field ground plane
(def $FieldMaterial matGrass)
@@ -22,6 +24,8 @@
(def $GoalHalfDepth (eval $GoalDepth / 2.0))
(def $FieldLengthTextureSize (eval $FieldLength / 12.0 ))
(def $FieldWidthTextureSize (eval $FieldWidth / 8.0 ))
+ (def $PenaltyX (eval $FieldHalfLength - $PenaltyLength ))
+ (def $PenaltyHalfWidth (eval $PenaltyWidth * 0.5 ))
(def $BorderLength (eval $FieldLength * 0.333))
(def $BorderWidth (eval $FieldWidth * 0.75))
@@ -193,7 +197,72 @@
0
F2R
)
+;;
+;; add field lines
+;;
+;; middle line
+(importScene rsg/agent/fieldline.rsg
+ 0 (eval -1 * $FieldHalfWidth)
+ 0 $FieldHalfWidth
+ )
+;; ground lines
+(importScene rsg/agent/fieldline.rsg
+ $FieldHalfLength (eval -1 * $FieldHalfWidth)
+ $FieldHalfLength $FieldHalfWidth
+ )
+
+(importScene rsg/agent/fieldline.rsg
+ (eval -1 * $FieldHalfLength) (eval -1 * $FieldHalfWidth)
+ (eval -1 * $FieldHalfLength) $FieldHalfWidth
+ )
+
+;; side lines
+(importScene rsg/agent/fieldline.rsg
+ $FieldHalfLength $FieldHalfWidth
+ (eval -1 * $FieldHalfLength) $FieldHalfWidth
+ )
+
+(importScene rsg/agent/fieldline.rsg
+ $FieldHalfLength (eval -1 * $FieldHalfWidth)
+ (eval -1 * $FieldHalfLength) (eval -1 * $FieldHalfWidth)
+ )
+
+;; penalty lines
+(importScene rsg/agent/fieldline.rsg
+ $PenaltyX $PenaltyHalfWidth
+ $PenaltyX (eval -1 * $PenaltyHalfWidth)
+ )
+
+(importScene rsg/agent/fieldline.rsg
+ $PenaltyX $PenaltyHalfWidth
+ $FieldHalfLength $PenaltyHalfWidth
+ )
+
+(importScene rsg/agent/fieldline.rsg
+ $PenaltyX (eval -1 * $PenaltyHalfWidth)
+ $FieldHalfLength (eval -1 * $PenaltyHalfWidth)
+ )
+
+(importScene rsg/agent/fieldline.rsg
+ (eval -1 * $PenaltyX) $PenaltyHalfWidth
+ (eval -1 * $PenaltyX) (eval -1 * $PenaltyHalfWidth)
+ )
+
+(importScene rsg/agent/fieldline.rsg
+ (eval -1 * $PenaltyX) $PenaltyHalfWidth
+ (eval -1 * $FieldHalfLength) $PenaltyHalfWidth
+ )
+
+(importScene rsg/agent/fieldline.rsg
+ (eval -1 * $PenaltyX) (eval -1 * $PenaltyHalfWidth)
+ (eval -1 * $FieldHalfLength) (eval -1 * $PenaltyHalfWidth)
+ )
+
+;; ring
+(importScene rsg/agent/fieldring.rsg
+ 1.8)
+
;;
;; add the ball
;;
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2010-03-28 08:27:22 UTC (rev 189)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2010-03-30 11:33:03 UTC (rev 190)
@@ -44,7 +44,8 @@
hmdp_effector/hmdpaction.h
hmdp_effector/hmdpeffector.h
hmdp_effector/hmdpperceptor.h
- hmdp_effector/naospecific.h
+ hmdp_effector/naospecific.h
+ line/line.h
)
set(soccer_LIB_SRCS
@@ -117,6 +118,8 @@
hmdp_effector/hmdpperceptor.cpp
hmdp_effector/hmdpwrapper.cpp
hmdp_effector/naospecific.cpp
+ line/line.cpp
+ line/line_c.cpp
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${FREETYPE_INCLUDE_DIRS}
Modified: trunk/rcssserver3d/plugin/soccer/export.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/export.cpp 2010-03-28 08:27:22 UTC (rev 189)
+++ trunk/rcssserver3d/plugin/soccer/export.cpp 2010-03-30 11:33:03 UTC (rev 190)
@@ -53,6 +53,7 @@
#include "agentintegration/soccerbotbehavior.h"
#include "hmdp_effector/hmdpeffector.h"
#include "hmdp_effector/hmdpperceptor.h"
+#include "line/line.h"
ZEITGEIST_EXPORT_BEGIN()
ZEITGEIST_EXPORT(SoccerControlAspect);
@@ -88,5 +89,6 @@
ZEITGEIST_EXPORT(SoccerbotBehavior);
ZEITGEIST_EXPORT(HMDPPerceptor);
ZEITGEIST_EXPORT(HMDPEffector);
+ ZEITGEIST_EXPORT(Line);
ZEITGEIST_EXPORT_END()
Added: trunk/rcssserver3d/plugin/soccer/line/line.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/line/line.cpp (rev 0)
+++ trunk/rcssserver3d/plugin/soccer/line/line.cpp 2010-03-30 11:33:03 UTC (rev 190)
@@ -0,0 +1,31 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2010 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.
+*/
+
+#include "line.h"
+
+Line::Line()
+{
+
+}
+
+Line::~Line()
+{
+
+}
Added: trunk/rcssserver3d/plugin/soccer/line/line.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/line/line.h (rev 0)
+++ trunk/rcssserver3d/plugin/soccer/line/line.h 2010-03-30 11:33:03 UTC (rev 190)
@@ -0,0 +1,44 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2010 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.
+*/
+#ifndef LINE_H
+#define LINE_H
+
+#include "../soccernode/soccernode.h"
+
+class Line : public SoccerNode
+{
+public:
+ Line();
+ virtual ~Line();
+
+ salt::Vector3f& BeginPoint() { return mBeginPoint; }
+ salt::Vector3f& EndPoint() { return mEndPoint; }
+ const salt::Vector3f& BeginPoint() const { return mBeginPoint; }
+ const salt::Vector3f& EndPoint() const { return mEndPoint; }
+
+protected:
+
+ salt::Vector3f mBeginPoint;
+ salt::Vector3f mEndPoint;
+};
+
+DECLARE_CLASS(Line);
+
+#endif // LINE_H
Added: trunk/rcssserver3d/plugin/soccer/line/line_c.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/line/line_c.cpp (rev 0)
+++ trunk/rcssserver3d/plugin/soccer/line/line_c.cpp 2010-03-30 11:33:03 UTC (rev 190)
@@ -0,0 +1,65 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2010 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.
+*/
+
+#include "line.h"
+
+using namespace boost;
+using namespace oxygen;
+using namespace std;
+
+FUNCTION(Line,setBeginPoint)
+{
+ salt::Vector3f& value = obj->BeginPoint();
+
+ if (
+ (in.GetSize() != 3) ||
+ (! in.GetValue(in[0], value[0])) ||
+ (! in.GetValue(in[1], value[1])) ||
+ (! in.GetValue(in[2], value[2]))
+ )
+ {
+ return false;
+ }
+ return true;
+}
+
+FUNCTION(Line,setEndPoint)
+{
+ salt::Vector3f& value = obj->EndPoint();
+
+ if (
+ (in.GetSize() != 3) ||
+ (! in.GetValue(in[0], value[0])) ||
+ (! in.GetValue(in[1], value[1])) ||
+ (! in.GetValue(in[2], value[2]))
+ )
+ {
+ return false;
+ }
+ return true;
+}
+
+void
+CLASS(Line)::DefineClass()
+{
+ DEFINE_BASECLASS(SoccerNode);
+ DEFINE_FUNCTION(setBeginPoint);
+ DEFINE_FUNCTION(setEndPoint);
+}
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2010-03-28 08:27:22 UTC (rev 189)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2010-03-30 11:33:03 UTC (rev 190)
@@ -25,6 +25,12 @@
#include <oxygen/sceneserver/transform.h>
#include <soccerbase/soccerbase.h>
#include <salt/gmath.h>
+#include <list>
+#include <X11/X.h>
+#include <math.h>
+#include <salt/linesegment2.h>
+#include <limits>
+#include <iostream>
using namespace zeitgeist;
using namespace oxygen;
@@ -34,7 +40,8 @@
RestrictedVisionPerceptor::RestrictedVisionPerceptor() : Perceptor(),
mSenseMyPos(false),
mAddNoise(true),
- mStaticSenseAxis(true)
+ mStaticSenseAxis(true),
+ mSenseLine(false)
{
// set predicate name
SetPredicateName("See");
@@ -454,6 +461,11 @@
element.AddValue(sensedMyPos[2]);
}
+ if (mSenseLine)
+ {
+ SenseLine(predicate);
+ }
+
return true;
}
@@ -551,6 +563,11 @@
element.AddValue(sensedMyPos[2]);
}
+ if (mSenseLine)
+ {
+ SenseLine(predicate);
+ }
+
return true;
}
@@ -616,3 +633,233 @@
{
mSenseMyPos = sense;
}
+
+bool RestrictedVisionPerceptor::checkVisuable(RestrictedVisionPerceptor::ObjectData& od) const
+{
+ // theta is the angle in horizontal plane, with fwAngle as 0 degree
+ od.mTheta = gNormalizeDeg(gRadToDeg(gNormalizeRad(
+ gArcTan2(od.mRelPos[1], od.mRelPos[0])
+ )) - 90);
+
+ // latitude with fwPhi as 0 degreee
+ od.mPhi = gRadToDeg(gNormalizeRad(
+ gArcTan2(od.mRelPos[2],
+ Vector2f(od.mRelPos[0], od.mRelPos[1]).Length()
+ )
+ )
+ );
+
+ od.mDist = od.mRelPos.Length();
+ if (od.mDist <= 0.1)
+ {
+ // object is too close
+ return false;
+ }
+
+ const int hAngle_2 = mHViewCone >> 1;
+ if (gAbs(od.mTheta) > hAngle_2)
+ {
+ // object is out of view range
+ return false;
+ }
+
+ const int vAngle_2 = mVViewCone >> 1;
+ if (gAbs(od.mPhi) > vAngle_2)
+ {
+ return false;
+ }
+
+ return true;
+}
+
+void RestrictedVisionPerceptor::SenseLine(Predicate& predicate)
+{
+ const float focalLength = 0.1f;
+ TLineList visibleLines;
+ SetupLines(visibleLines);
+
+ // TODO: precalculate it
+ // visual range
+ Vector2f ru(tan(gDegToRad<double>(mHViewCone*0.5))*focalLength, tan(gDegToRad<double>(mVViewCone*0.5))*focalLength);
+ Vector2f rb(ru.x(), -ru.y());
+ Vector2f lu(-ru.x(), ru.y());
+ Vector2f lb(-ru.x(), -ru.y());
+ LineSegment2f viewRangeLine[4];
+ viewRangeLine[0] = LineSegment2f(lu, ru);
+ viewRangeLine[1] = LineSegment2f(lb, rb);
+ viewRangeLine[2] = LineSegment2f(lu, lb);
+ viewRangeLine[3] = LineSegment2f(ru, rb);
+
+ for (TLineList::iterator i = visibleLines.begin(); i != visibleLines.end(); )
+ {
+ LineData& ld = (*i);
+
+ bool seeBeginPoint = checkVisuable(ld.mBeginPoint);
+ bool seeEndPoint = checkVisuable(ld.mEndPoint);
+
+ if (!(seeBeginPoint && seeEndPoint))
+ {
+ Vector3f bp3 = ld.mBeginPoint.mRelPos;
+ Vector3f ep3 = ld.mEndPoint.mRelPos;
+
+ if ( bp3.y() < focalLength && ep3.y() >= focalLength )
+ {
+ float t = ( focalLength - ep3.y() ) / ( bp3.y() - ep3.y() );
+ bp3 = ep3 + ( bp3 - ep3 ) * t;
+ }
+ else if ( ep3.y() < focalLength && bp3.y() >= focalLength )
+ {
+ float t = ( focalLength - bp3.y() ) / ( ep3.y() - bp3.y() );
+ ep3 = bp3 + ( ep3 - bp3 ) * t;
+ }
+
+ if ( bp3.y() > 0 && ep3.y() > 0 )
+ {
+ Vector2f bp = Vector2f(bp3.x(), bp3.z()) * focalLength / bp3.y();
+ Vector2f ep = Vector2f(ep3.x(), ep3.z()) * focalLength / ep3.y();
+ LineSegment2f l(bp, ep);
+
+ float CB = bp3.Length();
+ float CE = ep3.Length();
+ float BE = (bp3 - ep3).Length();
+ float CEB = acos((BE * BE + CE * CE - CB * CB) / (2 * BE * CE));
+ Vector3f Ef(ep.x(), focalLength, ep.y());
+ float CEf = Ef.Length();
+
+ Vector3f X[2];
+ int inum = 0;
+ for ( int i=0; i<4 && inum < 2; i++)
+ {
+ Vector2f ip;
+ if ( l.Intersection(viewRangeLine[i], ip) )
+ {
+ Vector3f Xf(ip.x(), focalLength, ip.y());
+ float CXf = Xf.Length();
+ float XfEf = (Xf - Ef).Length();
+ float XfCEf = acos((CXf * CXf + CEf * CEf - XfEf * XfEf) / (2 * CXf * CEf));
+ float CXE = gPI - CEB - XfCEf;
+ float EX = CE / sin(CXE) * sin(XfCEf);
+ X[inum] = ep3 + (bp3 - ep3) * (EX / BE);
+ inum++;
+ }
+ }
+
+ if ( inum == 2 )
+ {
+ ld.mBeginPoint.mRelPos = X[0];
+ checkVisuable(ld.mBeginPoint);
+ seeBeginPoint = true;
+
+ ld.mEndPoint.mRelPos = X[1];
+ checkVisuable(ld.mEndPoint);
+ seeEndPoint = true;
+ }
+ else if ( inum == 1 )
+ {
+ if ( !seeBeginPoint )
+ {
+ ld.mBeginPoint.mRelPos = X[0];
+ checkVisuable(ld.mBeginPoint);
+ seeBeginPoint = true;
+ }
+ else
+ {
+ ld.mEndPoint.mRelPos = X[0];
+ checkVisuable(ld.mEndPoint);
+ seeEndPoint = true;
+ }
+ }
+ }
+ }
+
+ if (seeBeginPoint && seeEndPoint)
+ {
+ // make some noise
+ ApplyNoise(ld.mBeginPoint);
+ ApplyNoise(ld.mEndPoint);
+
+ ++i;
+ }
+ else
+ {
+ i = visibleLines.erase(i);
+ }
+ }
+
+ // generate a sense entry
+ AddSense(predicate, visibleLines);
+}
+
+void
+RestrictedVisionPerceptor::SetupLines(TLineList& visibleLines)
+{
+ TLeafList lineList;
+ mActiveScene->GetChildrenOfClass("Line", lineList, true);
+
+ // determine position relative to the local reference frame
+ const Matrix& mat = mTransformParent->GetWorldTransform();
+
+ // get the transformation matrix describing the current orientation
+ Vector3f myPos = mat.Pos();
+ if (mAddNoise)
+ {
+ myPos -= mError;
+ }
+
+
+ for (TLeafList::iterator i = lineList.begin(); i != lineList.end(); ++i)
+ {
+ LineData ld;
+
+ ld.mLine = shared_static_cast<Line > (*i);
+
+ if (ld.mLine.get() == 0)
+ {
+ GetLog()->Error() << "Error: (RestrictedVisionPerceptor) skipped line: "
+ << (*i)->GetName() << "\n";
+ continue; // this should never happen
+ }
+
+ boost::shared_ptr<Transform> j = ld.mLine->GetTransformParent();
+
+ if (j.get() == 0)
+ {
+ GetLog()->Error() << "Error: (RestrictedVisionPerceptor) skipped line (2): "
+ << (*i)->GetName() << "\n";
+ continue; // this should never happen
+ }
+
+ const salt::Matrix& t = j->GetWorldTransform();
+ ld.mBeginPoint.mRelPos = mat.InverseRotate( t * ld.mLine->BeginPoint() - myPos );
+ ld.mEndPoint.mRelPos = mat.InverseRotate( t * ld.mLine->EndPoint() - myPos );
+
+ visibleLines.push_back(ld);
+ }
+}
+
+void RestrictedVisionPerceptor::AddSense(Predicate& predicate, const TLineList& lineList) const
+{
+ for (TLineList::const_iterator i = lineList.begin(); i != lineList.end(); ++i)
+ {
+ const LineData& ld = (*i);
+ ParameterList& element = predicate.parameter.AddList();
+ element.AddValue(std::string("L"));
+
+ ParameterList& begPos = element.AddList();
+ begPos.AddValue(std::string("pol"));
+ begPos.AddValue(ld.mBeginPoint.mDist);
+ begPos.AddValue(ld.mBeginPoint.mTheta);
+ begPos.AddValue(ld.mBeginPoint.mPhi);
+
+ ParameterList& endPos = element.AddList();
+ endPos.AddValue(std::string("pol"));
+ endPos.AddValue(ld.mEndPoint.mDist);
+ endPos.AddValue(ld.mEndPoint.mTheta);
+ endPos.AddValue(ld.mEndPoint.mPhi);
+ }
+}
+
+void RestrictedVisionPerceptor::SetSenseLine(bool sense)
+{
+ mSenseLine = sense;
+}
\ No newline at end of file
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h 2010-03-28 08:27:22 UTC (rev 189)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.h 2010-03-30 11:33:03 UTC (rev 190)
@@ -29,6 +29,7 @@
#include <oxygen/sceneserver/transform.h>
#include <oxygen/agentaspect/agentaspect.h>
#include <agentstate/agentstate.h>
+#include "../line/line.h"
class RestrictedVisionPerceptor : public oxygen::Perceptor
{
@@ -67,6 +68,15 @@
typedef std::map<boost::shared_ptr<oxygen::BaseNode>, TObjectList> TNodeObjectsMap;
+ struct LineData
+ {
+ boost::shared_ptr<Line> mLine;
+ ObjectData mBeginPoint;
+ ObjectData mEndPoint;
+ };
+
+ typedef std::list<LineData> TLineList;
+
public:
RestrictedVisionPerceptor();
virtual ~RestrictedVisionPerceptor();
@@ -94,6 +104,9 @@
//! Turn sensing of agent position on/off
void SetSenseMyPos(bool sense);
+ // turn sensing of lines on/off
+ void SetSenseLine(bool sense);
+
/** Turn noise off/on.
\param add_noise flag if noise should be used at all.
*/
@@ -162,6 +175,13 @@
*/
bool DynamicAxisPercept(boost::shared_ptr<oxygen::PredicateList> predList);
+ /** Percept lines in the world */
+ void SenseLine(oxygen::Predicate& predicate);
+
+ void SetupLines(TLineList& visibleLines);
+
+ bool checkVisuable(ObjectData& od) const;
+
/** Checks if the given object is occluded, seen from from my_pos */
bool CheckOcclusion(const salt::Vector3f& my_pos, const ObjectData& od) const;
@@ -172,6 +192,9 @@
boost::shared_ptr<BaseNode> node,
TObjectList& objectList) const;
+ void AddSense(oxygen::Predicate& predicate,
+ const TLineList& lineList) const;
+
/** applies noise to the setup ObjectData */
void ApplyNoise(ObjectData& od) const;
@@ -201,6 +224,9 @@
*/
bool mStaticSenseAxis;
+ /** flag if the lines can be sensed */
+ bool mSenseLine;
+
//! horizontal opening of the vision cone
unsigned int mHViewCone;
//! vertical opening of the vision cone
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor_c.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor_c.cpp 2010-03-28 08:27:22 UTC (rev 189)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor_c.cpp 2010-03-30 11:33:03 UTC (rev 190)
@@ -150,6 +150,22 @@
return true;
}
+FUNCTION(RestrictedVisionPerceptor,setSenseLine)
+{
+ bool inSenseLine;
+
+ if (
+ (in.GetSize() != 1) ||
+ (! in.GetValue(in.begin(),inSenseLine))
+ )
+ {
+ return false;
+ }
+
+ obj->SetSenseLine(inSenseLine);
+ return true;
+}
+
void CLASS(RestrictedVisionPerceptor)::DefineClass()
{
DEFINE_BASECLASS(oxygen/Perceptor);
@@ -160,4 +176,5 @@
DEFINE_FUNCTION(setViewCones);
DEFINE_FUNCTION(setPanRange);
DEFINE_FUNCTION(setTiltRange);
+ DEFINE_FUNCTION(setSenseLine);
}
Modified: trunk/spark/lib/salt/CMakeLists.txt
===================================================================
--- trunk/spark/lib/salt/CMakeLists.txt 2010-03-28 08:27:22 UTC (rev 189)
+++ trunk/spark/lib/salt/CMakeLists.txt 2010-03-30 11:33:03 UTC (rev 190)
@@ -15,6 +15,8 @@
sharedlibrary.h
vector.h
salt_defines.h
+ line2.h
+ linesegment2.h
)
set(salt_LIB_SRCS
Added: trunk/spark/lib/salt/line2.h
===================================================================
--- trunk/spark/lib/salt/line2.h (rev 0)
+++ trunk/spark/lib/salt/line2.h 2010-03-30 11:33:03 UTC (rev 190)
@@ -0,0 +1,305 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2008,2009 SEU RoboCup Simulation Team, Southeast University , Nanjing, China.
+ Copyright (C) 2010 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.
+ */
+
+#ifndef _LINE2_H
+#define _LINE2_H
+
+#include <limits>
+#include "tvector.h"
+
+namespace salt {
+
+template <typename DATATYPE>
+class TLine2
+{
+ // a line is defined by the formula: ay + bx + c = 0
+ DATATYPE mA;
+ DATATYPE mB;
+ DATATYPE mC;
+public:
+
+ /**
+ * create line by given coefficients
+ *
+ * @param a the a coefficients
+ * @param b the b coefficients
+ * @param c the c coefficients
+ */
+ TLine2(DATATYPE a = 1, DATATYPE b = 0, DATATYPE c = -1)
+ : mA(a), mB(b), mC(c)
+ {
+ }
+
+ /**
+ * create line from tow points
+ *
+ * @param pos1 the one point
+ * @param pos2 the other point
+ */
+ template <typename P_T>
+ TLine2(const P_T &pos1,
+ const P_T &pos2)
+ {
+ // 1*y + bx + c = 0 => y = -bx - c
+ // with -b the direction coefficient (or slope)
+ // and c = - y - bx
+ DATATYPE dTemp = pos2[0] - pos1[0]; // determine the slope
+ if (fabs(dTemp) < std::numeric_limits<DATATYPE>::epsilon() ) {
+ // ay + bx + c = 0 with vertical slope=> a = 0, b = 1
+ mA = 0.0;
+ mB = 1.0;
+ } else {
+ // y = (-b)x -c with -b the slope of the line
+ mA = 1.0;
+ mB = -(pos2[1] - pos1[1]) / dTemp;
+ }
+ // ay + bx + c = 0 ==> c = -a*y - b*x
+ mC = -mA * pos2.y() - mB * pos2.x();
+ }
+
+ /**
+ * create line from one point and an angle
+ *
+ * @param pos the point in line
+ * @param angle the sclope angle
+ */
+ template <typename P_T>
+ TLine2(const P_T &pos, DATATYPE angle)
+ {
+ // calculate point somewhat further in direction 'angle'
+ // and make line from these two points.
+ P_T pos2 = pos;
+ pos2.x() += cosDeg(angle);
+ pos2.y() += sinDeg(angle);
+ *this = TLine2(pos, pos2);
+ }
+
+ DATATYPE a() const
+ {
+ return mA;
+ }
+
+ DATATYPE b() const
+ {
+ return mB;
+ }
+
+ DATATYPE c() const
+ {
+ return mC;
+ }
+
+ DATATYPE& a()
+ {
+ return mA;
+ }
+
+ DATATYPE& b()
+ {
+ return mB;
+ }
+
+ DATATYPE& c()
+ {
+ return mC;
+ }
+
+ /**
+ * calculate the intersection of two lines
+ *
+ * @param line the other line
+ *
+ * @return the intersection
+ */
+ template <typename P_T>
+ bool Intersection(const TLine2 &line, P_T &p) const
+ {
+ DATATYPE L = line.a() * mB - mA * line.b();
+ if (abs(L) < std::numeric_limits<DATATYPE>::epsilon()) {
+ // lines are parallel, no intersection
+ return false;
+ }
+ if (mA == 0) {
+ // bx + c = 0 and a2*y + b2*x + c2 = 0 ==> x = -c/b
+ // calculate x using the current line
+ p.x() = -mC / mB; // and calculate the y using the second line
+ p.y() = line.YGivenX(p.x());
+ } else if (line.a() == 0) {
+ // ay + bx + c = 0 and b2*x + c2 = 0 ==> x = -c2/b2
+ p.x() = -line.c() / line.b();
+ // calculate x using
+ p.y() = YGivenX(p.x());
+ // 2nd line and calculate y using current line
+ } else {
+ // ay + bx + c = 0 and a2y + b2*x + c2 = 0
+ // y = (-b2/a2)x - c2/a2
+ // bx = -a*y - c => bx = -a*(-b2/a2)x -a*(-c2/a2) - c
+ // ==> a2*bx = a*b2*x + a*c2 - a2*c
+ // ==> x = (a*c2 - a2*c)/(a2*b - a*b2)
+ p.x() = (mA * line.c() - line.a() * mC) / L;
+ p.y() = YGivenX(p.x());
+ }
+ return true;
+ }
+
+ /**
+ * ay + bx + c = 0 -> y = (-b/a)x + (-c/a)
+ * tangent: y = (a/b)*x + C1 -> by - ax + C2 = 0 => C2 = ax - by
+ * with pos.y = y, pos.x = x
+ *
+ * @param pos the tangent intersection
+ *
+ * @return the tangent line of this line
+ */
+ template<typename P_T>
+ TLine2 TangentLine(const P_T &pos) const
+ {
+ return TLine2(mB, -mA, mA * pos.x() - mB * pos.y());
+ }
+
+ /**
+ * calculate the closest point of a given point to this line
+ *
+ * @param pos the given point
+ *
+ * @return the closest point
+ */
+ template<typename P_T>
+ P_T PointOnLineClosestTo(const P_T &pos) const
+ {
+ TLine2 l2 = TangentLine(pos); // get tangent line
+ // and intersection between the two lines
+ return Intersection(l2);
+ }
+
+ /**
+ * calculate the distance from a given point to this line
+ *
+ * @param pos the given point
+ *
+ * @return the distance from the pos to this line
+ */
+ template<typename P_T>
+ DATATYPE DistanceToPoint(const P_T &pos) const
+ {
+ return (PointOnLineClosestTo(pos) - pos).length();
+ }
+
+ /**
+ * calculate the Y value by given X value
+ *
+ * @param x the given x coordinate value
+ *
+ * @return the Y coordinate value
+ */
+ DATATYPE YGivenX(DATATYPE x) const
+ {
+ if (mA == 0) {
+ std::cerr << __FILE__ << __LINE__ << __FUNCTION__
+ << " Cannot calculate Y coordinate: " << std::endl;
+ return 0;
+ }
+ // ay + bx + c = 0 ==> y = -(b*x + c)/a
+ return -(mB * x + mC) / mA;
+ }
+
+ /**
+ * calculate the X value by given Y value
+ *
+ * @param y the given Y coordinate value
+ *
+ * @return the X coordinate value
+ */
+ DATATYPE XGivenY(DATATYPE y) const
+ {
+ if (mB == 0) {
+ std::cerr << __FILE__ << __LINE__ << __FUNCTION__
+ << "Cannot calculate X coordinate\n" << std::endl;
+ return 0;
+ }
+ // ay + bx + c = 0 ==> x = -(a*y + c)/b
+ return -(mA * y + mC) / mB;
+ }
+
+ /**
+ * calculate the location of point to the line
+ *
+ * @param p the given point
+ *
+ * @return +1 means upper the line
+ * 0 means on the line
+ * -1 means lower the line
+ */
+ template <typename P_T>
+ int Location(const P_T & p)const
+ {
+ return sign(mA * p.y() + mB * p.x() + mC);
+ }
+
+ /**
+ * calculate the ang for line
+ */
+ DATATYPE GetAngle()
+ {
+ return atan2(-mB, mA);
+ }
+
+ /**
+ * @param[in] pos1 first point
+ * @param pos2 second point
+ * @return
+ */
+ template<typename P_T>
+ static TLine2 MidperpendicularFromTwoPoints(const P_T &pos1, const P_T &pos2)
+ {
+ TLine2 l1(pos1, pos2);
+ P_T posMid = (pos1 + pos2)*0.5;
+ return l1.TangentLine(posMid);
+ }
+
+};
+
+/// dump
+
+template<typename DATATYPE>
+std::ostream & operator <<(std::ostream & os, TLine2<DATATYPE> l)
+{
+ DATATYPE a = l.a();
+ DATATYPE b = l.b();
+ DATATYPE c = l.c();
+ // ay + bx + c = 0 -> y = -b/a x - c/a
+ if (a == 0) {
+ os << "x = " << -c / b;
+ } else {
+ os << "y = ";
+ if (b != 0)
+ os << -b / a << "x ";
+ if (c > 0)
+ os << "- " << fabs(c / a);
+ else if (c < 0)
+ os << "+ " << fabs(c / a);
+ }
+ return os;
+}
+
+} // namespace salt
+#endif /* _LINE2_H */
+
Added: trunk/spark/lib/salt/linesegment2.h
===================================================================
--- trunk/spark/lib/salt/linesegment2.h (rev 0)
+++ trunk/spark/lib/salt/linesegment2.h 2010-03-30 11:33:03 UTC (rev 190)
@@ -0,0 +1,129 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2008,2009 SEU RoboCup Simulation Team, Southeast University , Nanjing, China.
+ Copyright (C) 2010 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.
+ */
+
+#ifndef _LINESEGMENT2_H
+#define _LINESEGMENT2_H
+
+#include "line2.h"
+
+namespace salt {
+
+template <typename DATATYPE, typename P_T>
+class TLineSegment2 : public TLine2<DATATYPE>
+{
+ /// endpoints
+ P_T mP[2];
+public:
+
+ TLineSegment2()
+ {
+ }
+
+ TLineSegment2(const P_T & p0, const P_T & p1)
+ : TLine2<DATATYPE>(p0, p1)
+ {
+ mP[0] = p0;
+ mP[1] = p1;
+ }
+
+ const P_T & p0() const
+ {
+ return mP[0];
+ }
+
+ const P_T & p1() const
+ {
+ return mP[1];
+ }
+
+ bool IsBetween(const P_T & p) const
+ {
+ return p[0] <= std::max(mP[0][0], mP[1][0])
+ && p[0] >= std::min(mP[0][0], mP[1][0])
+ && p[1] <= std::max(mP[0][1], mP[1][1])
+ && p[1] >= std::min(mP[0][1], mP[1][1]);
+ }
+
+ DATATYPE Length() const
+ {
+ return ( mP[0] - mP[1]).Length();
+ }
+
+ bool IsContain(const P_T & p) const
+ {
+ return (p - mP[0]).Length() + (p - mP[1]).Length()
+ < Length() + std::numeric_limits<DATATYPE>::epsilon();
+ }
+
+ /**
+ * calculate the intersection of the segment and a given line
+ *
+ * @param line the given line
+ * @param intersection retrun the intersection
+ *
+ * @return if the segment and line have intersection
+ */
+ bool IntersectionWithLine(const TLine2<DATATYPE>& line,
+ P_T & intersection)const
+ {
+ if ( TLine2<DATATYPE>::Intersection(line, intersection) )
+ {
+ return IsBetween(intersection);
+ }
+ return false;
+ }
+
+ /**
+ * calculate the interseciton of two segment
+ *
+ * @param seg2 the other segment
+ * @param intersection return the intersection
+ *
+ * @return if the tow segments have intersection
+ */
+ bool Intersection(const TLineSegment2& seg2,
+ P_T & intersection)const
+ {
+ if (IntersectionWithLine(seg2, intersection)) {
+ return seg2.IsBetween(intersection);
+ }
+ return false;
+ }
+
+ /**
+ * if there is an intersection of two segment
+ *
+ * @param seg2 the other segment
+ *
+ * @return if the tow segments have intersection
+ */
+ bool IsIntersect(const TLineSegment2& seg2) const
+ {
+ P_T intersection;
+ return Intersection(seg2, intersection);
+ }
+};
+
+typedef TLineSegment2<float, Vector2f> LineSegment2f;
+
+} // namespace salt
+#endif /* _LINESEGMENT2_H */
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2010-03-28 08:27:29
|
Revision: 189
http://simspark.svn.sourceforge.net/simspark/?rev=189&view=rev
Author: hedayat
Date: 2010-03-28 08:27:22 +0000 (Sun, 28 Mar 2010)
Log Message:
-----------
Fixed a race condition in MonitorServer->GetMonitorData()
Fixed the shared_ptr.hpp path
Removed some extra cin/cout
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
trunk/spark/lib/oxygen/monitorserver/monitorserver.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/plugin/odeimps/odejoint.cpp
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2010-03-10 06:24:22 UTC (rev 188)
+++ trunk/spark/ChangeLog 2010-03-28 08:27:22 UTC (rev 189)
@@ -1,3 +1,17 @@
+2010-03-28 Hedayat Vatankhah <he...@gr...>
+
+ * lib/oxygen/monitorserver/monitorserver.h (MonitorServer):
+ * lib/oxygen/monitorserver/monitorserver.cpp (MonitorServer::GetMonitorData):
+ - protect GetMonitorData() on simultaneous access
+
+ * lib/oxygen/physicsserver/int/sliderjointint.h:
+ * lib/oxygen/physicsserver/int/jointint.h:
+ * lib/oxygen/physicsserver/int/physicsobjectint.h:
+ - fixed the shared_ptr.hpp include path
+
+ * plugin/odeimps/odejoint.cpp (JointImp::EnableFeedback):
+ - removed extra cin/cout commands
+
2010-02-28 Marian Buchta <mar...@gm...>
* lib/kerosin/fontserver/fontserver.cpp:
Modified: trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp 2010-03-10 06:24:22 UTC (rev 188)
+++ trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp 2010-03-28 08:27:22 UTC (rev 189)
@@ -20,6 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <boost/thread/locks.hpp>
#include <zeitgeist/logserver/logserver.h>
#include <oxygen/simulationserver/simulationserver.h>
#include "monitorserver.h"
@@ -176,10 +177,12 @@
string MonitorServer::GetMonitorData()
{
int cycle = mSimulationServer->GetCycle();
+ boost::mutex::scoped_lock dataLock(mDataMutex);
+
if ( cycle == mDataCycle ){
return mData;
}
-
+
boost::shared_ptr<MonitorSystem> monitorSystem = GetMonitorSystem();
if (monitorSystem.get() == 0)
Modified: trunk/spark/lib/oxygen/monitorserver/monitorserver.h
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorserver.h 2010-03-10 06:24:22 UTC (rev 188)
+++ trunk/spark/lib/oxygen/monitorserver/monitorserver.h 2010-03-28 08:27:22 UTC (rev 189)
@@ -22,6 +22,7 @@
#ifndef OXYGEN_MONITORSERVER_H
#define OXYGEN_MONITORSERVER_H
+#include <boost/thread/mutex.hpp>
#include <oxygen/oxygen_defines.h>
#include <zeitgeist/class.h>
#include <zeitgeist/node.h>
@@ -90,6 +91,9 @@
/** the cycle of cacahed data */
int mDataCycle;
+
+ /** a mutex to protect mData and mDataCycle variables */
+ boost::mutex mDataMutex;
};
DECLARE_CLASS(MonitorServer);
Modified: trunk/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2010-03-10 06:24:22 UTC (rev 188)
+++ trunk/spark/lib/oxygen/physicsserver/int/jointint.h 2010-03-28 08:27:22 UTC (rev 189)
@@ -24,7 +24,7 @@
#define OXYGEN_JOINTINT_H
#include <oxygen/physicsserver/genericphysicsobjects.h>
-#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <salt/vector.h>
#include <oxygen/oxygen_defines.h>
#include <string>
@@ -41,22 +41,22 @@
specified by \param jointID.
*/
virtual Joint* GetJoint(long jointID) = 0;
-
- /** Checks if two bodies, specified by \param bodyID1 and
+
+ /** Checks if two bodies, specified by \param bodyID1 and
\param bodyID2, are connected by a joint.
*/
virtual bool AreConnected(long bodyID1, long bodyID2) = 0;
-
- /** Checks if two bodies, specified by \param bodyID1 and
+
+ /** Checks if two bodies, specified by \param bodyID1 and
\param bodyID2, are connected by a joint that is not of the type
specified by \param joint_type.
*/
virtual bool AreConnectedExcluding(long bodyID1, long bodyID2, int joint_type) = 0;
-
+
/** Destroys the Joint specified by \param jointID */
virtual void DestroyJoint(long jointID,
boost::shared_ptr<GenericJointFeedback> feedback) = 0;
-
+
/** attaches the joint to some new bodies. If the joint is already
attached, it will be detached from the old bodies first. To
attach this joint to only one body, set body1 or body2 to
@@ -65,21 +65,21 @@
have no effect on the simulation.
*/
virtual void Attach(long bodyID1, long bodiID2, long jointID) = 0;
-
+
/** returns the type of the managed joint, possible return
values from ODE are dJointTypeNone, dJointTypeBall, dJointTypeHinge,
dJointTypeSlider, dJointTypeContact, dJointTypeUniversal,
dJointTypeHinge2, dJointTypeFixed or dJointTypeAMotor.
*/
virtual int GetType(long jointID) const = 0;
-
- /** Returns the ID of one of the bodies the joint specified
+
+ /** Returns the ID of one of the bodies the joint specified
by \param jointID is connected to. Since a joint is always
connected to two bodies, use \param idx to address the first or
second body.
*/
virtual long GetBodyID(int idx, long jointID) = 0;
-
+
/** during the world time step, the forces that are applied by
each joint are added directly to the joined bodies, and the
user normally has no way of telling which joint contributed
@@ -89,80 +89,80 @@
*/
virtual void EnableFeedback(bool enable, long jointID,
boost::shared_ptr<GenericJointFeedback> feedback) = 0;
-
+
/** returns true if the joint is set to collect feedback
- information
+ information
*/
virtual bool FeedbackEnabled(long jointID) const = 0;
-
+
/** queries the force that the joint applied to one body attached
to it during the last timestep.
*/
virtual salt::Vector3f GetFeedbackForce(int idx,
boost::shared_ptr<GenericJointFeedback> feedback) const = 0;
-
+
/** queries the torque that the joint applied to one body attached
to it during the last timestep.
*/
virtual salt::Vector3f GetFeedbackTorque(int idx,
boost::shared_ptr<GenericJointFeedback> feedback) const = 0;
-
+
/** sets the fudgefactor parameter, making this value too small can
prevent the motor from being able to move the joint away from
a stop
*/
virtual void SetFudgeFactor(int idx, float fudge_factor, long jointID) = 0;
-
+
/** returns the fudgefactor paramter */
virtual float GetFudgeFactor(int idx, long jointID) const = 0;
-
+
/** sets the bouncyness of the stops. This is a restitution
parameter in the range 0..1. 0 means the stops are not bouncy
at all, 1 means maximum bouncyness.
*/
virtual void SetBounce(int idx, float bounce, long jointID) = 0;
-
+
/** returns the bouncyness of the stops */
virtual float GetBounce(int idx, long jointID) const = 0;
-
+
/** sets the low stop angle in degrees, this stop must be greater
than -180 to be effective
*/
virtual void SetLowStopDeg(int idx, float deg, long jointID) = 0;
-
+
/** returns the low stop angle in degrees */
virtual float GetLowStopDeg(int idx, long jointID) const = 0;
-
+
/** sets the high stop angle in degrees, this stop must be less
than +180 to be effective
*/
virtual void SetHighStopDeg(int idx, float deg, long jointID) = 0;
-
+
/** returns the high stop angle in degrees */
virtual float GetHighStopDeg(int idx, long jointID) const = 0;
-
+
/** sets the low stop position */
virtual void SetLowStopPos(int idx, float deg, long jointID) = 0;
-
+
/** returns the low stop position */
virtual float GetLowStopPos(int idx, long jointID) const = 0;
-
+
/** sets the high stop position */
virtual void SetHighStopPos(int idx, float deg, long jointID) = 0;
-
+
/** returns the high stop position */
virtual float GetHighStopPos(int idx, long jointID) const = 0;
-
+
/** the constraint force mixing (CFM) value used when not at a
- stop
+ stop
*/
virtual void SetCFM(int idx, float cfm, long jointID) = 0;
-
+
/** returns the constraint force mixing value used when not a a
- stop
+ stop
*/
virtual float GetCFM(int idx, long jointID) const = 0;
-
+
/** sets the constraint force mixing (CFM) value used by the
stops. Together with the ERP value this can be used to get
spongy or soft stops. This is intended for unpowered joints,
@@ -170,73 +170,73 @@
reaches its limit.
*/
virtual void SetStopCFM(int idx, float cfm, long jointID) = 0;
-
+
/** returns the constraint force mixing value used by the stops */
virtual float GetStopCFM(int idx, long jointID) const = 0;
-
+
/** sets the error reduction parameter (ERP) used by the stops. */
virtual void SetStopERP(int idx, float erp, long jointID) = 0;
-
+
/** returns the error reduction parameter used by the stops */
virtual float GetStopERP(int idx, long jointID) const = 0;
-
+
/** sets the suspension error reduction parameter (ERP). As of ode
0.039 this is only implemented on the hinge-2 joint.
*/
virtual void SetSuspensionERP(int idx, float erp, long jointID) = 0;
-
+
/** returns the suspension error reduction parameter (ERP). As of
ode 0.039 this is only implemented on the hinge-2 joint.
*/
virtual float GetSuspensionERP(int idx, long jointID) const = 0;
-
+
/** sets the suspension constraint force mixing value. As of ode
0.039 this is only implemented on the hinge-2 joint.
*/
virtual void SetSuspensionCFM(int idx, float cfm, long jointID) = 0;
-
+
/** returns the suspension constraint force mixing value. As of
ode 0.039 this is only implemented on the hinge-2 joint.
*/
virtual float GetSuspensionCFM(int idx, long jointID) const = 0;
-
+
/** sets the linear motor velocity */
virtual void SetLinearMotorVelocity(int idx, float vel, long jointID) = 0;
-
+
/** returns the linear motor velocity */
virtual float GetLinearMotorVelocity(int idx, long jointID) const = 0;
-
+
/** sets the angular motor velocity in degrees */
virtual void SetAngularMotorVelocity(int idx, float deg, long jointID) = 0;
-
+
/** returns the angular motor velocity in degrees */
virtual float GetAngularMotorVelocity(int idx, long jointID) const = 0;
-
+
/** sets the maximum force or torque that the motor will use to
achieve the desired velocity. This must always be greater than
or equal to zero. Setting this to zero (the default value)
turns off the motor.
*/
virtual void SetMaxMotorForce(int idx, float f, long jointID) = 0;
-
+
/** returns the maximum force or torque that the motor will use to
achieve the desired velocity.
*/
virtual float GetMaxMotorForce(int idx, long jointID) const = 0;
-
+
/** Sets the joint parameter indexed by \param parameter of the joint
specified by \param jointID to \param value
- */
+ */
virtual void SetParameter(int parameter, float value, long jointID) = 0;
-
+
/** Returns the joint parameter indexed by \param parameter of the joint
specified by \param jointID
- */
+ */
virtual float GetParameter(int parameter, long jointID) const = 0;
-
+
/** Links the ID of the joint specified by \param jointID to the Joint
- object specified by \param joint. Doing this allows us to later
- find the Joint object that manages the joint specified
+ object specified by \param joint. Doing this allows us to later
+ find the Joint object that manages the joint specified
by \param jointID.
*/
virtual void OnLink(long jointID, Joint* joint) = 0;
Modified: trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2010-03-10 06:24:22 UTC (rev 188)
+++ trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2010-03-28 08:27:22 UTC (rev 189)
@@ -23,7 +23,7 @@
#ifndef OXYGEN_PHYSICSOBJECTINT_H
#define OXYGEN_PHYSICSOBJECTINT_H
-#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <salt/matrix.h>
#include <oxygen/oxygen_defines.h>
#include <oxygen/physicsserver/genericphysicsobjects.h>
@@ -34,12 +34,12 @@
class OXYGEN_API PhysicsObjectInt
{
-public:
+public:
/** converts the rotation part of a salt::Matrix to an
engine-specific matrix that arranges the values in a different way
*/
virtual void ConvertRotationMatrix(const salt::Matrix& rot, GenericPhysicsMatrix& matrix) = 0;
-
+
/** coverts an engine-specific matrix to the rotation part of a salt::Matrix */
virtual void ConvertRotationMatrix(const GenericPhysicsMatrix* matrix, salt::Matrix& rot) const = 0;
};
Modified: trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2010-03-10 06:24:22 UTC (rev 188)
+++ trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2010-03-28 08:27:22 UTC (rev 189)
@@ -23,7 +23,7 @@
#ifndef OXYGEN_SLIDERJOINTINT_H
#define OXYGEN_SLIDERJOINTINT_H
-#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <oxygen/oxygen_defines.h>
namespace oxygen
@@ -35,17 +35,17 @@
public:
/** Creates a Slider Joint within the given world */
virtual long CreateSliderJoint(long world) = 0;
-
+
/** returns the slider linear position, i.e. the slider's
`extension'. When the axis is set, the current position of the
attached bodies is examined and that position will be the zero
position.
*/
virtual float GetPosition(long jointID) = 0;
-
+
/** returns the time derivative of the sliders linear position */
virtual float GetPositionRate(long jointID) = 0;
-
+
/** Sets the direction of the slider joint's axis */
virtual void SetSliderAxis(salt::Vector3f& up, long jointID) = 0;
};
Modified: trunk/spark/plugin/odeimps/odejoint.cpp
===================================================================
--- trunk/spark/plugin/odeimps/odejoint.cpp 2010-03-10 06:24:22 UTC (rev 188)
+++ trunk/spark/plugin/odeimps/odejoint.cpp 2010-03-28 08:27:22 UTC (rev 189)
@@ -25,7 +25,7 @@
using namespace std;
using namespace salt;
-JointImp::JointImp() : PhysicsObjectImp()
+JointImp::JointImp() : PhysicsObjectImp()
{
}
@@ -73,11 +73,11 @@
return (long) ODEBodyID;
}
-void JointImp::EnableFeedback(bool enable, long jointID,
+void JointImp::EnableFeedback(bool enable, long jointID,
boost::shared_ptr<GenericJointFeedback> feedback)
{
dJointID JointImp = (dJointID) jointID;
-
+
if (enable)
{
if (feedback.get() == 0)
@@ -94,8 +94,6 @@
}
}
- cout << "bla";
- std::cin;
dJointFeedback* ODEFeedback = (dJointFeedback*) feedback.get();
dJointSetFeedback(JointImp,ODEFeedback);
@@ -107,7 +105,7 @@
return (dJointGetFeedback(JointImp) != 0);
}
-Vector3f JointImp::GetFeedbackForce(int idx,
+Vector3f JointImp::GetFeedbackForce(int idx,
boost::shared_ptr<GenericJointFeedback> feedback) const
{
dJointFeedback* fb = (dJointFeedback*) feedback.get();
@@ -166,7 +164,7 @@
return Vector3f(0,0,0);
}
}
-
+
void JointImp::SetFudgeFactor(int idx, float fudge_factor, long jointID)
{
SetParameter(dParamFudgeFactor + (idx * dParamGroup), fudge_factor, jointID);
@@ -307,7 +305,7 @@
return GetParameter(dParamFMax + (idx * dParamGroup), jointID);
}
-void JointImp::DestroyJoint(long jointID,
+void JointImp::DestroyJoint(long jointID,
boost::shared_ptr<GenericJointFeedback> feedback)
{
dJointID JointImp = (dJointID) jointID;
@@ -328,7 +326,7 @@
case dJointTypeUniversal: dJointSetUniversalParam(JointImp, parameter, value);
break;
case dJointTypeAMotor: dJointSetAMotorParam(JointImp, parameter, value);
- break;
+ break;
default: return;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-03-10 06:24:30
|
Revision: 188
http://simspark.svn.sourceforge.net/simspark/?rev=188&view=rev
Author: a-held
Date: 2010-03-10 06:24:22 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
link ODE-Libs with collisionperceptor plugin
Modified Paths:
--------------
trunk/spark/plugin/collisionperceptor/CMakeLists.txt
Modified: trunk/spark/plugin/collisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2010-03-04 02:05:13 UTC (rev 187)
+++ trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2010-03-10 06:24:22 UTC (rev 188)
@@ -22,7 +22,7 @@
add_library(collisionperceptor MODULE ${collisionperceptor_LIB_SRCS})
-target_link_libraries(collisionperceptor ${spark_libs})
+target_link_libraries(collisionperceptor ${ODE_LIBRARY} ${spark_libs})
if (NOT APPLE)
set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-03-04 02:05:19
|
Revision: 187
http://simspark.svn.sourceforge.net/simspark/?rev=187&view=rev
Author: a-held
Date: 2010-03-04 02:05:13 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
Change makefiles to link ODE with odeimps module and not with oxygen
Modified Paths:
--------------
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/plugin/odeimps/CMakeLists.txt
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2010-02-28 21:46:06 UTC (rev 186)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2010-03-04 02:05:13 UTC (rev 187)
@@ -302,7 +302,7 @@
add_library(oxygen ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES}
- ${ODE_LIBRARY} ${oxygen_require_libs})
+ ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/plugin/odeimps/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/odeimps/CMakeLists.txt 2010-02-28 21:46:06 UTC (rev 186)
+++ trunk/spark/plugin/odeimps/CMakeLists.txt 2010-03-04 02:05:13 UTC (rev 187)
@@ -106,7 +106,7 @@
add_library(odeimps MODULE ${odeimps_LIB_SRCS})
-target_link_libraries(odeimps ${spark_libs})
+target_link_libraries(odeimps ${ODE_LIBRARY} ${spark_libs})
if (NOT APPLE)
set_target_properties(odeimps PROPERTIES VERSION 0.0.0 SOVERSION 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-28 21:46:12
|
Revision: 186
http://simspark.svn.sourceforge.net/simspark/?rev=186&view=rev
Author: a-held
Date: 2010-02-28 21:46:06 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Decomment proxyserver from CMakeLists... again.
Modified Paths:
--------------
trunk/spark/lib/oxygen/CMakeLists.txt
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2010-02-28 21:10:01 UTC (rev 185)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2010-02-28 21:46:06 UTC (rev 186)
@@ -89,8 +89,8 @@
physicsserver/int/universaljointint.h
physicsserver/int/worldint.h
- #proxyserver/agentproxy.h
- #proxyserver/proxyserver.h
+ proxyserver/agentproxy.h
+ proxyserver/proxyserver.h
sceneserver/sceneimporter.h
sceneserver/basenode.h
sceneserver/fpscontroller.h
@@ -279,10 +279,10 @@
monitorserver/custommonitor_c.cpp
monitorserver/monitorcmdparser.cpp
monitorserver/monitorcmdparser_c.cpp
- #proxyserver/agentproxy.cpp
- #proxyserver/agentproxy_c.cpp
- #proxyserver/proxyserver.cpp
- #proxyserver/proxyserver_c.cpp
+ proxyserver/agentproxy.cpp
+ proxyserver/agentproxy_c.cpp
+ proxyserver/proxyserver.cpp
+ proxyserver/proxyserver_c.cpp
)
if(SPADES_FOUND)
set(oxygen_LIB_SRCS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-28 21:10:11
|
Revision: 185
http://simspark.svn.sourceforge.net/simspark/?rev=185&view=rev
Author: a-held
Date: 2010-02-28 21:10:01 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Replace some ODE constants with their actual values in rsgedit files
Declare SetParameter in joint.h because rsgedit calls it (even though it's not implemented and not meant to be implemented there)
Modified Paths:
--------------
trunk/rsgedit/src/kinematicframe.cpp
trunk/rsgedit/src/property.cpp
trunk/spark/lib/oxygen/physicsserver/joint.h
Modified: trunk/rsgedit/src/kinematicframe.cpp
===================================================================
--- trunk/rsgedit/src/kinematicframe.cpp 2010-02-28 12:56:26 UTC (rev 184)
+++ trunk/rsgedit/src/kinematicframe.cpp 2010-02-28 21:10:01 UTC (rev 185)
@@ -101,17 +101,17 @@
strType = wxT("?");
break;
- case dJointTypeUniversal:
+ case /*dJointTypeUniversal*/ 5:
bmp = new wxStaticBitmap(mCtrScrollWnd, wxID_ANY, mBmpUniversal);
strType = wxT("Universal");
break;
- case dJointTypeHinge:
+ case /*dJointTypeHinge*/ 2:
bmp = new wxStaticBitmap(mCtrScrollWnd, wxID_ANY, mBmpHinge);
strType = wxT("Hinge");
break;
- case dJointTypeSlider:
+ case /*dJointTypeSlider*/ 3:
bmp = new wxStaticBitmap(mCtrScrollWnd, wxID_ANY, mBmpSlider);
strType = wxT("Slider");
break;
@@ -209,10 +209,10 @@
switch (jt)
{
- case dJointTypeFixed:
+ case 7 /*dJointTypeFixed*/:
break;
- case dJointTypeUniversal:
+ case 5 /*dJointTypeUniversal*/:
AddJointDescription(joint);
AddJointControl(joint, 0);
AddJointControl(joint, 1);
@@ -280,7 +280,7 @@
default:
break;
- case dJointTypeSlider:
+ case 3: //dJointTypeSlider:
{
shared_ptr<SliderJoint> sliderJoint
= shared_static_cast<SliderJoint>(entry.joint.lock());
@@ -288,7 +288,7 @@
break;
}
- case dJointTypeUniversal:
+ case 5: //dJointTypeUniversal:
{
shared_ptr<UniversalJoint> universal
= shared_static_cast<UniversalJoint>(entry.joint.lock());
@@ -296,7 +296,7 @@
break;
}
- case dJointTypeHinge:
+ case 2: //dJointTypeHinge:
{
shared_ptr<HingeJoint> hinge
= shared_static_cast<HingeJoint>(entry.joint.lock());
@@ -323,7 +323,7 @@
JointControl& entry = (*iter).second;
shared_ptr<Joint> joint(shared_static_cast<Joint>(entry.joint.lock()));
- joint->SetParameter(dParamVel, 0);
+ joint->SetParameter(2 /*dParamVel*/, 0);
}
float kinematicFrame::GetJointVel(float diff)
@@ -334,7 +334,7 @@
int kinematicFrame::GetParamVel(int axis) const
{
- return (axis == 0) ? dParamVel : dParamVel2;
+ return (axis == 0) ? 2 /*dParamVel*/ : 258 /*dParamVel2*/;
}
void kinematicFrame::MoveJoint(JointControl& entry)
@@ -346,7 +346,7 @@
default:
break;
- case dJointTypeHinge:
+ case 2: //dJointTypeHinge:
{
shared_ptr<HingeJoint> hinge
= shared_static_cast<HingeJoint>(entry.joint.lock());
@@ -363,7 +363,7 @@
break;
}
- case dJointTypeUniversal:
+ case 5: //dJointTypeUniversal:
{
shared_ptr<UniversalJoint> universal
= shared_static_cast<UniversalJoint>(entry.joint.lock());
Modified: trunk/rsgedit/src/property.cpp
===================================================================
--- trunk/rsgedit/src/property.cpp 2010-02-28 12:56:26 UTC (rev 184)
+++ trunk/rsgedit/src/property.cpp 2010-02-28 21:10:01 UTC (rev 185)
@@ -274,20 +274,20 @@
const ContactJointHandler& cjh = *shared_static_cast<ContactJointHandler>(leaf);
int mode = cjh.GetContactMode();
- wxString strMode =
- FORMAT_FLAG(mode, dContactMu2) +
- FORMAT_FLAG(mode, dContactFDir1) +
- FORMAT_FLAG(mode, dContactBounce) +
- FORMAT_FLAG(mode, dContactSoftERP) +
- FORMAT_FLAG(mode, dContactSoftCFM) +
- FORMAT_FLAG(mode, dContactMotion1) +
- FORMAT_FLAG(mode, dContactMotion2) +
- FORMAT_FLAG(mode, dContactSlip1) +
- FORMAT_FLAG(mode, dContactSlip2) +
- FORMAT_FLAG(mode, dContactApprox0) +
- FORMAT_FLAG(mode, dContactApprox1_1) +
- FORMAT_FLAG(mode, dContactApprox1_2) +
- FORMAT_FLAG(mode, dContactApprox1);
+ wxString strMode = //replace ODE constants with their actual values
+ FORMAT_FLAG(mode, 1 /*dContactMu2*/) +
+ FORMAT_FLAG(mode, 2 /*dContactFDir1*/) +
+ FORMAT_FLAG(mode, 4 /*dContactBounce*/) +
+ FORMAT_FLAG(mode, 8 /*dContactSoftERP*/) +
+ FORMAT_FLAG(mode, 16 /*dContactSoftCFM*/) +
+ FORMAT_FLAG(mode, 32 /*dContactMotion1*/) +
+ FORMAT_FLAG(mode, 64 /*dContactMotion2*/) +
+ FORMAT_FLAG(mode, 256 /*dContactSlip1*/) +
+ FORMAT_FLAG(mode, 512 /*dContactSlip2*/) +
+ FORMAT_FLAG(mode, 0 /*dContactApprox0*/) +
+ FORMAT_FLAG(mode, 4096 /*dContactApprox1_1*/) +
+ FORMAT_FLAG(mode, 8192 /*dContactApprox1_2*/) +
+ FORMAT_FLAG(mode, 12288 /*dContactApprox1*/);
entries.push_back(Entry(wxT("GetContactMode"),strMode));
entries.push_back(Entry(wxT("GetBounceValue"),FormatFloat(cjh.GetBounceValue())));
Modified: trunk/spark/lib/oxygen/physicsserver/joint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/joint.h 2010-02-28 12:56:26 UTC (rev 184)
+++ trunk/spark/lib/oxygen/physicsserver/joint.h 2010-02-28 21:10:01 UTC (rev 185)
@@ -270,6 +270,11 @@
/** Whether limit jointMaxSpeed2 */
bool IsLimitJointMaxSpeed2() const;
+
+ /** This has to be declared here because rsgedit upcasts to Joint
+ at one point and then calls this.
+ */
+ virtual void SetParameter(int parameter, float value){};
protected:
/** associates the created joint with this node */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2010-02-28 13:41:56
|
Revision: 183
http://simspark.svn.sourceforge.net/simspark/?rev=183&view=rev
Author: marianbuchta
Date: 2010-02-28 12:41:51 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
- change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr.
- removed installation of third party libraries under Windows (now done by simspark)
- added new version of FindBoost.cmake: finding boost libraries created by Visual C++ 2010 compiler.
Modified Paths:
--------------
trunk/rsgedit/CMakeLists.txt
trunk/rsgedit/ChangeLog
trunk/rsgedit/cmake/FindBoost.cmake
trunk/rsgedit/src/property.cpp
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2010-02-28 10:58:14 UTC (rev 182)
+++ trunk/rsgedit/CMakeLists.txt 2010-02-28 12:41:51 UTC (rev 183)
@@ -71,16 +71,6 @@
install(FILES ${CMAKE_BINARY_DIR}/rsgedit_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
-if (WIN32) # try to find and install third-party .dlls to bin/ directory
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
- if (EXISTS ${ODEDLL})
- install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
- endif (EXISTS ${ODEDLL})
-
- install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
-endif (WIN32)
-
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog 2010-02-28 10:58:14 UTC (rev 182)
+++ trunk/rsgedit/ChangeLog 2010-02-28 12:41:51 UTC (rev 183)
@@ -1,3 +1,14 @@
+2010-02-28 Marian Buchta <mar...@gm...>
+
+ * cmake/FindBoost.cmake:
+ - added new version of FindBoost.cmake: finding boost libraries created by Visual C++ 2010 compiler.
+
+ * CMakeLists.txt:
+ - Removed installation of third party libraries under Windows (now done by simspark)
+
+ * rsgedit/src/property.cpp
+ - change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr.
+
2009-08-25 Marian Buchta <mar...@gm...>
* CMakeLists.txt:
Modified: trunk/rsgedit/cmake/FindBoost.cmake
===================================================================
--- trunk/rsgedit/cmake/FindBoost.cmake 2010-02-28 10:58:14 UTC (rev 182)
+++ trunk/rsgedit/cmake/FindBoost.cmake 2010-02-28 12:41:51 UTC (rev 183)
@@ -1,860 +1,938 @@
-# - Try to find Boost include dirs and libraries
-# Usage of this module as follows:
-#
-# == Using Header-Only libraries from within Boost: ==
-#
-# find_package( Boost 1.36.0 )
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# endif()
-#
-#
-# == Using actual libraries from within Boost: ==
-#
-# set(Boost_USE_STATIC_LIBS ON)
-# set(Boost_USE_MULTITHREADED ON)
-# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
-#
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# target_link_libraries(foo ${Boost_LIBRARIES})
-# endif()
-#
-#
-# The components list needs to contain actual names of boost libraries only,
-# such as "date_time" for "libboost_date_time". If you're using parts of
-# Boost that contain header files only (e.g. foreach) you do not need to
-# specify COMPONENTS.
-#
-# You should provide a minimum version number that should be used. If you provide this
-# version number and specify the REQUIRED attribute, this module will fail if it
-# can't find the specified or a later version. If you specify a version number this is
-# automatically put into the considered list of version numbers and thus doesn't need
-# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
-#
-# NOTE for Visual Studio Users:
-# Automatic linking is used on MSVC & Borland compilers by default when
-# #including things in Boost. It's important to note that setting
-# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
-# should you need this feature. Automatic linking typically uses static
-# libraries with a few exceptions (Boost.Python is one).
-#
-# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
-# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
-# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
-# gets set to OFF. It is suggested you avoid automatic linking since it
-# will make your application less portable.
-#
-# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
-#
-# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
-# boost version numbers that should be taken into account when searching
-# for Boost. Unfortunately boost puts the version number into the
-# actual filename for the libraries, so this variable will certainly be needed
-# in the future when new Boost versions are released.
-#
-# Currently this module searches for the following version numbers:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
-# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
-#
-# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
-# add both 1.x and 1.x.0 as shown above. Official Boost include directories
-# omit the 3rd version number from include paths if it is 0 although not all
-# binary Boost releases do so.
-#
-# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
-#
-# ============================================================================
-#
-# Variables used by this module, they can change the default behaviour and need to be set
-# before calling find_package:
-#
-# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
-# boost libraries. If not specified, defaults
-# to ON.
-#
-# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
-# boost libraries. Defaults to OFF.
-#
-# Other Variables used by this module which you may want to set.
-#
-# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
-# the boost include directory. Please see
-# the documentation above regarding this
-# annoying, but necessary variable :(
-#
-# Boost_DEBUG Set this to TRUE to enable debugging output
-# of FindBoost.cmake if you are having problems.
-# Please enable this before filing any bug
-# reports.
-#
-# Boost_COMPILER Set this to the compiler suffix used by Boost
-# (e.g. "-gcc43") if FindBoods has problems finding
-# the proper Boost installation
-#
-# These last three variables are available also as environment variables:
-#
-# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
-# Boost. Set this if the module has problems finding
-# the proper Boost installation.
-#
-# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# Variables defined by this module:
-#
-# Boost_FOUND System has Boost, this means the include dir was
-# found, as well as all the libraries specified in
-# the COMPONENTS list.
-#
-# Boost_INCLUDE_DIRS Boost include directories: not cached
-#
-# Boost_INCLUDE_DIR This is almost the same as above, but this one is
-# cached and may be modified by advanced users
-#
-# Boost_LIBRARIES Link these to use the Boost libraries that you
-# specified: not cached
-#
-# Boost_LIBRARY_DIRS The path to where the Boost library files are.
-#
-# Boost_VERSION The version number of the boost libraries that
-# have been found, same as in version.hpp from Boost
-#
-# Boost_LIB_VERSION The version number in filename form as
-# it's appended to the library filenames
-#
-# Boost_MAJOR_VERSION major version number of boost
-# Boost_MINOR_VERSION minor version number of boost
-# Boost_SUBMINOR_VERSION subminor version number of boost
-#
-# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
-# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
-# to have diagnostic information about Boost's
-# automatic linking outputted during compilation time.
-#
-# For each component you list the following variables are set.
-# ATTENTION: The component names need to be in lower case, just as the boost
-# library names however the CMake variables use upper case for the component
-# part. So you'd get Boost_SERIALIZATION_FOUND for example.
-#
-# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
-# Boost_${COMPONENT}_LIBRARY The absolute path of the Boost library "component".
-# Boost_${COMPONENT}_LIBRARY_DEBUG The absolute path of the debug version of the
-# Boost library "component".
-# Boost_${COMPONENT}_LIBRARY_RELEASE The absolute path of the release version of the
-# Boost library "component"
-#
-# Copyright (c) 2006-2008 Andreas Schneider <ma...@cy...>
-# Copyright (c) 2007 Wengo
-# Copyright (c) 2007 Mike Jackson
-# Copyright (c) 2008 Andreas Pakulat <ap...@gm...>
-#
-# Redistribution AND use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-IF(NOT DEFINED Boost_USE_MULTITHREADED)
- SET(Boost_USE_MULTITHREADED TRUE)
-ENDIF()
-
-if(Boost_FIND_VERSION_EXACT)
- # The version may appear in a directory with or without the patch
- # level, even when the patch level is non-zero.
- set(_boost_TEST_VERSIONS
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
-else(Boost_FIND_VERSION_EXACT)
- # The user has not requested an exact version. Among known
- # versions, find those that are acceptable to the user request.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.38.0" "1.38" "1.37.0" "1.37"
- "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
- "1.34" "1.33.1" "1.33.0" "1.33")
- set(_boost_TEST_VERSIONS)
- if(Boost_FIND_VERSION)
- set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- # Select acceptable versions.
- foreach(version ${_Boost_KNOWN_VERSIONS})
- if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
- # This version is high enough.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
- # This version is a short-form for the requested version with
- # the patch level dropped.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- endif()
- endforeach(version)
- else(Boost_FIND_VERSION)
- # Any version is acceptable.
- set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
- endif(Boost_FIND_VERSION)
-endif(Boost_FIND_VERSION_EXACT)
-
-# The reason that we failed to find Boost. This will be set to a
-# user-friendly message when we fail to find some necessary piece of
-# Boost.
-set(Boost_ERROR_REASON)
-
-############################################
-#
-# Check the existence of the libraries.
-#
-############################################
-# This macro was taken directly from the FindQt4.cmake file that is included
-# with the CMake distribution. This is NOT my work. All work was done by the
-# original authors of the FindQt4.cmake file. Only minor modifications were
-# made to remove references to Qt and make this file more generally applicable
-#########################################################################
-
-MACRO (_Boost_ADJUST_LIB_VARS basename)
- IF (Boost_INCLUDE_DIR )
- IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
- # if the generator supports configuration types then set
- # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
- IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- # if there are no configuration types and CMAKE_BUILD_TYPE has no value
- # then just use the release libraries
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
- ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
-
- # if only the release version was found, set the debug variable also to the release version
- IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
- SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
- ENDIF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
-
- # if only the debug version was found, set the release variable also to the debug version
- IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
- SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
-
- IF (Boost_${basename}_LIBRARY)
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
-
- # Remove superfluous "debug" / "optimized" keywords from
- # Boost_LIBRARY_DIRS
- FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
- GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
- LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
- ENDFOREACH()
- LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
-
- set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
- SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
- ENDIF (Boost_${basename}_LIBRARY)
-
- ENDIF (Boost_INCLUDE_DIR )
- # Make variables changeble to the advanced user
- MARK_AS_ADVANCED(
- Boost_${basename}_LIBRARY
- Boost_${basename}_LIBRARY_RELEASE
- Boost_${basename}_LIBRARY_DEBUG
- )
-ENDMACRO (_Boost_ADJUST_LIB_VARS)
-
-#
-# Runs compiler with "-dumpversion" and parses major/minor
-# version with a regex.
-#
-FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
-
- EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE _boost_COMPILER_VERSION
- )
- STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
- _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-
- SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
-ENDFUNCTION()
-
-
-#-------------------------------------------------------------------------------
-
-
-SET( _boost_IN_CACHE TRUE)
-IF(Boost_INCLUDE_DIR)
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- IF(NOT Boost_${COMPONENT}_FOUND)
- SET( _boost_IN_CACHE FALSE)
- ENDIF(NOT Boost_${COMPONENT}_FOUND)
- ENDFOREACH(COMPONENT)
-ELSE(Boost_INCLUDE_DIR)
- SET( _boost_IN_CACHE FALSE)
-ENDIF(Boost_INCLUDE_DIR)
-
-IF (_boost_IN_CACHE)
- # in cache already
- SET(Boost_FOUND TRUE)
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
- ENDFOREACH(COMPONENT)
- SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
- IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
- ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
- "is already in the cache. For debugging messages, please clear the cache.")
- endif()
-ELSE (_boost_IN_CACHE)
- # Need to search for boost
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost not in cache")
- # Output some of their choices
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
- endif()
-
- IF(WIN32)
- # In windows, automatic linking is performed, so you do not have
- # to specify the libraries. If you are linking to a dynamic
- # runtime, then you can choose to link to either a static or a
- # dynamic Boost library, the default is to do a static link. You
- # can alter this for a specific library "whatever" by defining
- # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be
- # linked dynamically. Alternatively you can force all Boost
- # libraries to dynamic link by defining BOOST_ALL_DYN_LINK.
-
- # This feature can be disabled for Boost library "whatever" by
- # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining
- # BOOST_ALL_NO_LIB.
-
- # If you want to observe which libraries are being linked against
- # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking
- # code to emit a #pragma message each time a library is selected
- # for linking.
- SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS
- "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
- ENDIF(WIN32)
-
- SET(_boost_INCLUDE_SEARCH_DIRS
- C:/boost/include
- C:/boost
- "$ENV{ProgramFiles}/boost"
- C:/library/boost
- "C:/Program Files/boost"
- "C:/Program Files (x86)/boost"
- /sw/local/include
- )
-
- # If BOOST_ROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOST_ROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
-
- # If BOOSTROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOSTROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
-
- # If BOOST_INCLUDEDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
- set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
- ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
-
- # If BOOST_LIBRARYDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
- set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
- ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
-
- IF( BOOST_ROOT )
- file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
- ENDIF( BOOST_ROOT )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Declared as CMake or Environmental Variables:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_ROOT = ${BOOST_ROOT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- endif()
-
- IF( BOOST_ROOT )
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_ROOT}/include
- ${BOOST_ROOT}
- ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_INCLUDEDIR )
- file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR)
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_INCLUDEDIR )
-
- # ------------------------------------------------------------------------
- # Search for Boost include DIR
- # ------------------------------------------------------------------------
- # Try to find Boost by stepping backwards through the Boost versions
- # we know about.
- IF( NOT Boost_INCLUDE_DIR )
- # Build a list of path suffixes for each version.
- SET(_boost_PATH_SUFFIXES)
- FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
- # Add in a path suffix, based on the required version, ideally
- # we could read this from version.hpp, but for that to work we'd
- # need to know the include dir already
- set(_boost_BOOSTIFIED_VERSION)
-
- # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
- IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ENDIF()
-
- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
- if(WIN32)
- # For BoostPro's underscores (and others?)
- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
- endif()
-
- ENDFOREACH(_boost_VER)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Include debugging info:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
- endif()
-
- # Look for a standard boost header file.
- FIND_PATH(Boost_INCLUDE_DIR
- NAMES boost/config.hpp
- HINTS ${_boost_INCLUDE_SEARCH_DIRS}
- PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
- )
- ENDIF( NOT Boost_INCLUDE_DIR )
-
- # ------------------------------------------------------------------------
- # Extract version information from version.hpp
- # ------------------------------------------------------------------------
-
- IF(Boost_INCLUDE_DIR)
- # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
- # Read the whole file:
- #
- SET(BOOST_VERSION 0)
- SET(BOOST_LIB_VERSION "")
- FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
- endif()
-
- STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
- STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
-
- SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
- SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
-
- IF(NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
-
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
- ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "version.hpp reveals boost "
- "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- endif()
- ELSE(Boost_INCLUDE_DIR)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
- ENDIF(Boost_INCLUDE_DIR)
-
- # ------------------------------------------------------------------------
- # Suffix initialization and compiler suffix detection.
- # ------------------------------------------------------------------------
-
- # Setting some more suffixes for the library
- SET (Boost_LIB_PREFIX "")
- if ( MSVC AND Boost_USE_STATIC_LIBS )
- SET (Boost_LIB_PREFIX "lib")
- endif()
-
- if (Boost_COMPILER)
- set(_boost_COMPILER ${Boost_COMPILER})
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
- endif()
- else(Boost_COMPILER)
- # Attempt to guess the compiler suffix
- # NOTE: this is not perfect yet, if you experience any issues
- # please report them and use the Boost_COMPILER variable
- # to work around the problems.
- if (MSVC90)
- SET (_boost_COMPILER "-vc90")
- elseif (MSVC80)
- SET (_boost_COMPILER "-vc80")
- elseif (MSVC71)
- SET (_boost_COMPILER "-vc71")
- elseif (MSVC70) # Good luck!
- SET (_boost_COMPILER "-vc7") # yes, this is correct
- elseif (MSVC60) # Good luck!
- SET (_boost_COMPILER "-vc6") # yes, this is correct
- elseif (BORLAND)
- SET (_boost_COMPILER "-bcb")
- elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
- if(WIN32)
- set (_boost_COMPILER "-iw")
- else()
- set (_boost_COMPILER "-il")
- endif()
- elseif (MINGW)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
- endif()
- elseif (UNIX)
- if (CMAKE_COMPILER_IS_GNUCXX)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- # Determine which version of GCC we have.
- IF(APPLE)
- IF(Boost_MINOR_VERSION)
- IF(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost 1.36.0 and newer, the mangled compiler name used
- # on Mac OS X/Darwin is "xgcc".
- SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
- ELSE(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost <= 1.35.0, there is no mangled compiler name for
- # the Mac OS X/Darwin version of GCC.
- SET(_boost_COMPILER "")
- ENDIF(${Boost_MINOR_VERSION} GREATER 35)
- ELSE(Boost_MINOR_VERSION)
- # We don't know the Boost version, so assume it's
- # pre-1.36.0.
- SET(_boost_COMPILER "")
- ENDIF(Boost_MINOR_VERSION)
- ELSE()
- SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
- ENDIF()
- endif()
- endif (CMAKE_COMPILER_IS_GNUCXX)
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "guessed _boost_COMPILER = ${_boost_COMPILER}")
- endif()
- endif(Boost_COMPILER)
-
- SET (_boost_MULTITHREADED "-mt")
- if( NOT Boost_USE_MULTITHREADED )
- set (_boost_MULTITHREADED "")
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
- endif()
-
- SET( _boost_STATIC_TAG "")
- set( _boost_ABI_TAG "")
- IF (WIN32)
- IF(MSVC)
- SET (_boost_ABI_TAG "g")
- ENDIF(MSVC)
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_STATIC_TAG "-s")
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDIF(WIN32)
- SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_ABI_TAG = ${_boost_ABI_TAG}")
- endif()
-
- # ------------------------------------------------------------------------
- # Begin finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(_boost_LIBRARIES_SEARCH_DIRS
- C:/boost/lib
- C:/boost
- "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
- "$ENV{ProgramFiles}/boost"
- C:/library/boost/stage/lib
- "C:/Program Files/boost/stage/lib"
- "C:/Program Files (x86)/boost/stage/lib"
- C:/boost/lib
- /sw/local/lib
- )
- IF( BOOST_ROOT )
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_ROOT}/lib
- ${BOOST_ROOT}/stage/lib
- ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_LIBRARYDIR )
- file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_LIBRARYDIR )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
- endif()
-
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
-
- # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ELSE(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF(WIN32)
- ENDIF( Boost_USE_STATIC_LIBS )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
- IF( Boost_USE_STATIC_LIBS )
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDFOREACH(COMPONENT)
- # ------------------------------------------------------------------------
- # End finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(Boost_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- )
-
- SET(Boost_FOUND FALSE)
- IF(Boost_INCLUDE_DIR)
- SET( Boost_FOUND TRUE )
-
- # Check the version of Boost against the requested version.
- if (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34")
- endif (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
-
- if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
- # If the user requested an exact version of Boost, check
- # that. We already know that the Boost version we have is >= the
- # requested version.
- set(_Boost_VERSION_AGE "new")
-
- # If the user didn't specify a patchlevel, it's 0.
- if (NOT Boost_FIND_VERSION_PATCH)
- set(Boost_FIND_VERSION_PATCH 0)
- endif (NOT Boost_FIND_VERSION_PATCH)
-
- # We'll set Boost_FOUND true again if we have an exact version match.
- set(Boost_FOUND FALSE)
- if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND TRUE )
- endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
-
- if(NOT Boost_FOUND)
- # State that we found a version of Boost that is too new or too old.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- if (Boost_FIND_VERSION_PATCH)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
- endif (Boost_FIND_VERSION_PATCH)
- if (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
- endif (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
- endif (NOT Boost_FOUND)
-
- if (Boost_FOUND)
- set(_boost_CHECKED_COMPONENT FALSE)
- set(_Boost_MISSING_COMPONENTS)
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} COMPONENT)
- set(_boost_CHECKED_COMPONENT TRUE)
- if(NOT Boost_${COMPONENT}_FOUND)
- string(TOLOWER ${COMPONENT} COMPONENT)
- list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
- set( Boost_FOUND FALSE)
- endif(NOT Boost_${COMPONENT}_FOUND)
- endforeach(COMPONENT)
- endif (Boost_FOUND)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
- endif()
-
- if (_Boost_MISSING_COMPONENTS)
- # We were unable to find some libraries, so generate a sensible
- # error message that lists the libraries we were unable to find.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
- foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON} boost_${COMPONENT}\n")
- endforeach(COMPONENT)
-
- list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
- list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
- if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- endif (_Boost_MISSING_COMPONENTS)
-
- IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
- # Compatibility Code for backwards compatibility with CMake
- # 2.4's FindBoost module.
-
- # Look for the boost library path.
- # Note that the user may not have installed any libraries
- # so it is quite possible the Boost_LIBRARY_PATH may not exist.
- SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
-
- IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
-
- IF("${_boost_LIB_DIR}" MATCHES "/include$")
- # Strip off the trailing "/include" in the path.
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF("${_boost_LIB_DIR}" MATCHES "/include$")
-
- IF(EXISTS "${_boost_LIB_DIR}/lib")
- SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/lib")
- IF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR "")
- ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
-
- IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
- SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
- ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
-
- ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
-
- ELSE(Boost_INCLUDE_DIR)
- SET( Boost_FOUND FALSE)
- ENDIF(Boost_INCLUDE_DIR)
-
- IF (Boost_FOUND)
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- ENDIF(NOT Boost_FIND_QUIETLY)
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE(STATUS "Found the following Boost libraries:")
- ENDIF(NOT Boost_FIND_QUIETLY)
- FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
- STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT )
- IF ( Boost_${UPPERCOMPONENT}_FOUND )
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE (STATUS " ${COMPONENT}")
- ENDIF(NOT Boost_FIND_QUIETLY)
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
- ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
- ENDFOREACH(COMPONENT)
- ELSE (Boost_FOUND)
- IF (Boost_FIND_REQUIRED)
- message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
- ENDIF(Boost_FIND_REQUIRED)
- ENDIF(Boost_FOUND)
-
- # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
- MARK_AS_ADVANCED(Boost_INCLUDE_DIR
- Boost_INCLUDE_DIRS
- Boost_LIBRARY_DIRS
- )
-ENDIF(_boost_IN_CACHE)
-
+# - Try to find Boost include dirs and libraries
+# Usage of this module as follows:
+#
+# NOTE: Take note of the Boost_ADDITIONAL_VERSIONS variable below.
+# Due to Boost naming conventions and limitations in CMake this find
+# module is NOT future safe with respect to Boost version numbers,
+# and may break.
+#
+# == Using Header-Only libraries from within Boost: ==
+#
+# find_package( Boost 1.36.0 )
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# endif()
+#
+#
+# == Using actual libraries from within Boost: ==
+#
+# set(Boost_USE_STATIC_LIBS ON)
+# set(Boost_USE_MULTITHREADED ON)
+# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
+#
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# target_link_libraries(foo ${Boost_LIBRARIES})
+# endif()
+#
+#
+# The components list needs to contain actual names of boost libraries only,
+# such as "date_time" for "libboost_date_time". If you're using parts of
+# Boost that contain header files only (e.g. foreach) you do not need to
+# specify COMPONENTS.
+#
+# You should provide a minimum version number that should be used. If you provide this
+# version number and specify the REQUIRED attribute, this module will fail if it
+# can't find the specified or a later version. If you specify a version number this is
+# automatically put into the considered list of version numbers and thus doesn't need
+# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
+#
+# NOTE for Visual Studio Users:
+# Automatic linking is used on MSVC & Borland compilers by default when
+# #including things in Boost. It's important to note that setting
+# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
+# should you need this feature. Automatic linking typically uses static
+# libraries with a few exceptions (Boost.Python is one).
+#
+# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
+# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
+# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
+# gets set to OFF. It is suggested you avoid automatic linking since it
+# will make your application less portable.
+#
+# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
+#
+# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
+# boost version numbers that should be taken into account when searching
+# for Boost. Unfortunately boost puts the version number into the
+# actual filename for the libraries, so this variable will certainly be needed
+# in the future when new Boost versions are released.
+#
+# Currently this module searches for the following version numbers:
+# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
+# 1.40, 1.40.0, 1.41, 1.41.0
+#
+# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
+# add both 1.x and 1.x.0 as shown above. Official Boost include directories
+# omit the 3rd version number from include paths if it is 0 although not all
+# binary Boost releases do so.
+#
+# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
+#
+# ===================================== ============= ========================
+#
+# Variables used by this module, they can change the default behaviour and
+# need to be set before calling find_package:
+#
+# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
+# boost libraries. If not specified, defaults
+# to ON.
+#
+# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
+# boost libraries. Defaults to OFF.
+#
+# Other Variables used by this module which you may want to set.
+#
+# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
+# the boost include directory. Please see
+# the documentation above regarding this
+# annoying, but necessary variable :(
+#
+# Boost_DEBUG Set this to TRUE to enable debugging output
+# of FindBoost.cmake if you are having problems.
+# Please enable this before filing any bug
+# reports.
+#
+# Boost_DETAILED_FAILURE_MSG FindBoost doesn't output detailed information
+# about why it failed or how to fix the problem
+# unless this is set to TRUE or the REQUIRED
+# keyword is specified in find_package().
+# [Since CMake 2.8.0]
+#
+# Boost_COMPILER Set this to the compiler suffix used by Boost
+# (e.g. "-gcc43") if FindBoost has problems finding
+# the proper Boost installation
+#
+# These last three variables are available also as environment variables:
+#
+# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
+# Boost. Set this if the module has problems finding
+# the proper Boost installation.
+#
+# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# Variables defined by this module:
+#
+# Boost_FOUND System has Boost, this means the include dir was
+# found, as well as all the libraries specified in
+# the COMPONENTS list.
+#
+# Boost_INCLUDE_DIRS Boost include directories: not cached
+#
+# Boost_INCLUDE_DIR This is almost the same as above, but this one is
+# cached and may be modified by advanced users
+#
+# Boost_LIBRARIES Link to these to use the Boost libraries that you
+# specified: not cached
+#
+# Boost_LIBRARY_DIRS The path to where the Boost library files are.
+#
+# Boost_VERSION The version number of the boost libraries that
+# have been found, same as in version.hpp from Boost
+#
+# Boost_LIB_VERSION The version number in filename form as
+# it's appended to the library filenames
+#
+# Boost_MAJOR_VERSION major version number of boost
+# Boost_MINOR_VERSION minor version number of boost
+# Boost_SUBMINOR_VERSION subminor version number of boost
+#
+# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
+# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
+# to have diagnostic information about Boost's
+# automatic linking outputted during compilation time.
+#
+# For each component you specify in find_package(), the following (UPPER-CASE)
+# variables are set. You can use these variables if you would like to pick and
+# choose components for your targets instead of just using Boost_LIBRARIES.
+#
+# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
+#
+# Boost_${COMPONENT}_LIBRARY Contains the libraries for the specified Boost
+# "component" (includes debug and optimized keywords
+# when needed).
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006-2008 Andreas Schneider <ma...@cy...>
+# Copyright 2007 Wengo
+# Copyright 2007 Mike Jackson
+# Copyright 2008 Andreas Pakulat <ap...@gm...>
+# Copyright 2008-2009 Philip Lowman <ph...@yh...>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+#-------------------------------------------------------------------------------
+# FindBoost functions & macros
+#
+############################################
+#
+# Check the existence of the libraries.
+#
+############################################
+# This macro was taken directly from the FindQt4.cmake file that is included
+# with the CMake distribution. This is NOT my work. All work was done by the
+# original authors of the FindQt4.cmake file. Only minor modifications were
+# made to remove references to Qt and make this file more generally applicable
+# And ELSE/ENDIF pairs were removed for readability.
+#########################################################################
+
+MACRO (_Boost_ADJUST_LIB_VARS basename)
+ IF (Boost_INCLUDE_DIR )
+ IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
+ # if the generator supports configuration types then set
+ # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
+ IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ELSE()
+ # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+ # then just use the release libraries
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
+ ENDIF()
+ # FIXME: This probably should be set for both cases
+ SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF()
+
+ # if only the release version was found, set the debug variable also to the release version
+ IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
+ SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
+ ENDIF()
+
+ # if only the debug version was found, set the release variable also to the debug version
+ IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
+ SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF()
+
+ IF (Boost_${basename}_LIBRARY)
+ set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
+
+ # Remove superfluous "debug" / "optimized" keywords from
+ # Boost_LIBRARY_DIRS
+ FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
+ GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
+ LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
+ ENDFOREACH()
+ LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
+
+ set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
+ SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
+ ENDIF(Boost_${basename}_LIBRARY)
+
+ ENDIF (Boost_INCLUDE_DIR )
+ # Make variables changeble to the advanced user
+ MARK_AS_ADVANCED(
+ Boost_${basename}_LIBRARY
+ Boost_${basename}_LIBRARY_RELEASE
+ Boost_${basename}_LIBRARY_DEBUG
+ )
+ENDMACRO (_Boost_ADJUST_LIB_VARS)
+
+#-------------------------------------------------------------------------------
+
+#
+# Runs compiler with "-dumpversion" and parses major/minor
+# version with a regex.
+#
+FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
+
+ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE _boost_COMPILER_VERSION
+ )
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+ _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
+
+ SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
+ENDFUNCTION()
+
+#
+# A convenience function for marking desired components
+# as found or not
+#
+function(_Boost_MARK_COMPONENTS_FOUND _yes_or_no)
+ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ set(Boost_${UPPERCOMPONENT}_FOUND ${_yes_or_no} CACHE INTERNAL "Whether the Boost ${COMPONENT} library found" FORCE)
+ endforeach()
+endfunction()
+
+#
+# End functions/macros
+#
+#-------------------------------------------------------------------------------
+
+
+
+
+IF(NOT DEFINED Boost_USE_MULTITHREADED)
+ SET(Boost_USE_MULTITHREADED TRUE)
+ENDIF()
+
+if(Boost_FIND_VERSION_EXACT)
+ # The version may appear in a directory with or without the patch
+ # level, even when the patch level is non-zero.
+ set(_boost_TEST_VERSIONS
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+else(Boost_FIND_VERSION_EXACT)
+ # The user has not requested an exact version. Among known
+ # versions, find those that are acceptable to the user request.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+ "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
+ "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
+ "1.34" "1.33.1" "1.33.0" "1.33")
+ set(_boost_TEST_VERSIONS)
+ if(Boost_FIND_VERSION)
+ set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+ # Select acceptable versions.
+ foreach(version ${_Boost_KNOWN_VERSIONS})
+ if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
+ # This version is high enough.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
+ # This version is a short-form for the requested version with
+ # the patch level dropped.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ endif()
+ endforeach(version)
+ else(Boost_FIND_VERSION)
+ # Any version is acceptable.
+ set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
+ endif(Boost_FIND_VERSION)
+endif(Boost_FIND_VERSION_EXACT)
+
+# The reason that we failed to find Boost. This will be set to a
+# user-friendly message when we fail to find some necessary piece of
+# Boost.
+set(Boost_ERROR_REASON)
+
+SET( _boost_IN_CACHE TRUE)
+IF(Boost_INCLUDE_DIR)
+
+ # On versions < 1.35, remove the System library from the considered list
+ # since it wasn't added until 1.35.
+ if(Boost_VERSION AND Boost_FIND_COMPONENTS)
+ math(EXPR _boost_maj "${Boost_VERSION} / 100000")
+ math(EXPR _boost_min "${Boost_VERSION} / 100 % 1000")
+ if(${_boost_maj}.${_boost_min} VERSION_LESS 1.35)
+ list(REMOVE_ITEM Boost_FIND_COMPONENTS system)
+ endif()
+ endif()
+
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} COMPONENT)
+ IF(NOT Boost_${COMPONENT}_FOUND)
+ SET( _boost_IN_CACHE FALSE)
+ ENDIF(NOT Boost_${COMPONENT}_FOUND)
+ ENDFOREACH(COMPONENT)
+ELSE(Boost_INCLUDE_DIR)
+ SET( _boost_IN_CACHE FALSE)
+ENDIF(Boost_INCLUDE_DIR)
+
+IF (_boost_IN_CACHE)
+ # in cache already
+ SET(Boost_FOUND TRUE)
+ FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} COMPONENT)
+ _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
+ SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
+ ENDFOREACH(COMPONENT)
+ SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
+ IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
+ MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
+ MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
+ ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
+ "is already in the cache. For debugging messages, please clear the cache.")
+ endif()
+ELSE (_boost_IN_CACHE)
+ # Need to search for boost
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost not in cache")
+ # Output some of their choices
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ message(STATUS "...
[truncated message content] |
|
From: <a-...@us...> - 2010-02-28 13:40:48
|
Revision: 184
http://simspark.svn.sourceforge.net/simspark/?rev=184&view=rev
Author: a-held
Date: 2010-02-28 12:56:26 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Replaced one occurence of "BODY" with "RIGIDBODY"
Modified Paths:
--------------
trunk/rsgedit/src/property.h
Modified: trunk/rsgedit/src/property.h
===================================================================
--- trunk/rsgedit/src/property.h 2010-02-28 12:41:51 UTC (rev 183)
+++ trunk/rsgedit/src/property.h 2010-02-28 12:56:26 UTC (rev 184)
@@ -44,7 +44,7 @@
CL_CLASS,
CL_BASENODE,
CL_TRANSFORM,
- CL_BODY,
+ CL_RIGIDBODY,
CL_JOINT,
CL_HINGEJOINT,
CL_UNIVERSALJOINT,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2010-02-28 10:58:35
|
Revision: 182
http://simspark.svn.sourceforge.net/simspark/?rev=182&view=rev
Author: marianbuchta
Date: 2010-02-28 10:58:14 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr.
removed installation of third party libraries under Windows (now done by simspark)
Modified Paths:
--------------
trunk/simspark-utilities/CMakeLists.txt
trunk/simspark-utilities/ChangeLog
trunk/simspark-utilities/gendot/main.cpp
trunk/simspark-utilities/monitorspark/main.cpp
trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp
trunk/simspark-utilities/samplesim/main.cpp
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/CMakeLists.txt 2010-02-28 10:58:14 UTC (rev 182)
@@ -63,28 +63,6 @@
install(FILES AUTHORS ChangeLog COPYING README
DESTINATION ${DATADIR}/doc/${CMAKE_PROJECT_NAME})
-if (WIN32)
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
- if (EXISTS ${ODEDLL})
- install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
- endif (EXISTS ${ODEDLL})
-
- install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
-
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
- if (EXISTS ${DevIL_DLL})
- install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
- endif (EXISTS ${DevIL_DLL})
-
- install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
-
- set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
- if (EXISTS ${SDL_DLL})
- install(PROGRAMS ${SDL_DLL} DESTINATION ${BINDIR})
- endif (EXISTS ${SDL_DLL})
-endif (WIN32)
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Modified: trunk/simspark-utilities/ChangeLog
===================================================================
--- trunk/simspark-utilities/ChangeLog 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/ChangeLog 2010-02-28 10:58:14 UTC (rev 182)
@@ -1,3 +1,14 @@
+2010-02-28 Marian Buchta <mar...@gm...>
+
+ * gendot/main.cpp:
+ * monitorspark/main.cpp:
+ * sampleagent/leggedspherebehavior.cpp:
+ * samplesim/main.cpp:
+ - change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr.
+
+ * CMakeLists.txt:
+ - Removed installation of third party libraries under Windows (now done by simspark)
+
2009-08-25 Marian Buchta <mar...@gm...>
* windows/install_extra.nsi:
Modified: trunk/simspark-utilities/gendot/main.cpp
===================================================================
--- trunk/simspark-utilities/gendot/main.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/gendot/main.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -112,7 +112,7 @@
// require any additional classes in the gendot.rb
zg.GetCore()->GetScriptServer()->Run("gendot.rb");
- shared_ptr<Leaf> classRoot = zg.GetCore()->Get("/classes");
+ boost::shared_ptr<Leaf> classRoot = zg.GetCore()->Get("/classes");
if (classRoot.get() == 0)
{
cout << "ERROR: unable to get the class root node" << endl;
@@ -151,7 +151,7 @@
cout << "class " << name << endl;
- shared_ptr<Class> theClass = shared_dynamic_cast<Class>(*iter);
+ boost::shared_ptr<Class> theClass = shared_dynamic_cast<Class>(*iter);
if (theClass.get() == 0)
{
continue;
Modified: trunk/simspark-utilities/monitorspark/main.cpp
===================================================================
--- trunk/simspark-utilities/monitorspark/main.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/monitorspark/main.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -118,7 +118,7 @@
GetScriptServer()->Run("monitorspark.rb");
// tell the inputControl node the loaction of our camera
- shared_ptr<InputControl> inputCtr = GetInputControl();
+ boost::shared_ptr<InputControl> inputCtr = GetInputControl();
if (inputCtr.get() != 0)
{
inputCtr->SetFPSController("/usr/scene/camera/physics/controller");
@@ -139,7 +139,7 @@
spark.GetSimulationServer()->Run(argc,argv);
- shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
+ boost::shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
if (renderCtr.get() != 0)
{
spark.GetLog()->Normal()
Modified: trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp
===================================================================
--- trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/sampleagent/leggedspherebehavior.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -165,7 +165,7 @@
// parse message and extract joint angles
//cout << "(LeggedSphereBehavior) received message " << message << endl;
- shared_ptr<PredicateList> predList =
+ boost::shared_ptr<PredicateList> predList =
mParser->Parse(message);
if (predList.get() != 0)
Modified: trunk/simspark-utilities/samplesim/main.cpp
===================================================================
--- trunk/simspark-utilities/samplesim/main.cpp 2010-02-28 10:55:34 UTC (rev 181)
+++ trunk/simspark-utilities/samplesim/main.cpp 2010-02-28 10:58:14 UTC (rev 182)
@@ -101,7 +101,7 @@
GetScriptServer()->Run("simspark.rb");
// tell the inputControl node the loaction of our camera
- shared_ptr<InputControl> inputCtr = GetInputControl();
+ boost::shared_ptr<InputControl> inputCtr = GetInputControl();
if (inputCtr.get() != 0)
{
inputCtr->SetFPSController("/usr/scene/camera/physics/controller");
@@ -122,7 +122,7 @@
spark.GetSimulationServer()->Run(argc,argv);
- shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
+ boost::shared_ptr<RenderControl> renderCtr = spark.GetRenderControl();
if (renderCtr.get() != 0)
{
spark.GetLog()->Normal()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2010-02-28 10:55:53
|
Revision: 181
http://simspark.svn.sourceforge.net/simspark/?rev=181&view=rev
Author: marianbuchta
Date: 2010-02-28 10:55:34 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
- change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr.
- added new version of FindBoost.cmake: finding boost libraries created by Visual C++ 2010 compiler.
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/cmake/FindBoost.cmake
trunk/rcssserver3d/plugin/soccer/agentintegration/soccerbotbehavior.cpp
trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.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/gamestateaspect/gamestateaspect.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/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/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/rcssagent3d/hoap2behavior.cpp
trunk/rcssserver3d/rcssagent3d/naobehavior.cpp
trunk/rcssserver3d/rcssagent3d/soccerbehavior.cpp
trunk/rcssserver3d/rcssagent3d/soccerbotbehavior.cpp
trunk/rcssserver3d/rcssmonitor3d/main.cpp
trunk/rcssserver3d/rcssserver3d/main.cpp
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2010-02-28 07:05:31 UTC (rev 180)
+++ trunk/rcssserver3d/ChangeLog 2010-02-28 10:55:34 UTC (rev 181)
@@ -1,3 +1,44 @@
+2010-02-28 Marian Buchta <mar...@gm...>
+
+ * cmake/FindBoost.cmake:
+ - added new version of FindBoost.cmake: finding boost libraries created by Visual C++ 2010 compiler.
+
+ * plugin/soccer/agentintegration/soccerbotbehavior.cpp:
+ * plugin/soccer/agentstateperceptor/agentstateperceptor.cpp:
+ * plugin/soccer/ballstateaspect/ballstateaspect.cpp:
+ * plugin/soccer/beameffector/beameffector.cpp:
+ * plugin/soccer/catcheffector/catcheffector.cpp:
+ * plugin/soccer/createeffector/createeffector.cpp:
+ * plugin/soccer/driveeffector/driveeffector.cpp:
+ * plugin/soccer/gamestateaspect/gamestateaspect.cpp:
+ * plugin/soccer/hmdp_effector/hmdpeffector.cpp:
+ * plugin/soccer/hmdp_effector/hmdpperceptor.cpp:
+ * plugin/soccer/initeffector/initeffector.cpp:
+ * plugin/soccer/initeffector/singlematiniteffector.cpp:
+ * plugin/soccer/initeffector/staticmeshiniteffector.cpp:
+ * plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp:
+ * plugin/soccer/internalsoccermonitor/internalsoccerrender.cpp:
+ * plugin/soccer/kickeffector/kickeffector.cpp:
+ * plugin/soccer/pantilteffector/pantilteffector.cpp:
+ * plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp:
+ * plugin/soccer/sayeffector/sayeffector.cpp:
+ * plugin/soccer/sexpmonitor/sexpmonitor.cpp:
+ * plugin/soccer/soccerbase/soccerbase.cpp:
+ * plugin/soccer/soccercontrolaspect/soccercontrolaspect.cpp:
+ * plugin/soccer/soccerruleaspect/soccerruleaspect.cpp:
+ * plugin/soccer/trainercommandparser/trainercommandparser.cpp:
+ * plugin/soccer/visionperceptor/visionperceptor.cpp:
+ * plugin/soccermonitor/soccerinput.cpp:
+ * rcssagent3d/hoap2behavior.cpp:
+ * rcssagent3d/naobehavior.cpp:
+ * rcssagent3d/soccerbehavior.cpp:
+ * rcssagent3d/soccerbotbehavior.cpp:
+ * rcssmonitor3d/main.cpp:
+ * rcssserver3d/main.cpp:
+
+ - change shared_ptr -> boost::shared_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr
+
+
2010-01-18 Hedayat Vatankhah <he...@gr...>
* windows/uninstall_extra.nsi:
Modified: trunk/rcssserver3d/cmake/FindBoost.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindBoost.cmake 2010-02-28 07:05:31 UTC (rev 180)
+++ trunk/rcssserver3d/cmake/FindBoost.cmake 2010-02-28 10:55:34 UTC (rev 181)
@@ -1,860 +1,938 @@
-# - Try to find Boost include dirs and libraries
-# Usage of this module as follows:
-#
-# == Using Header-Only libraries from within Boost: ==
-#
-# find_package( Boost 1.36.0 )
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# endif()
-#
-#
-# == Using actual libraries from within Boost: ==
-#
-# set(Boost_USE_STATIC_LIBS ON)
-# set(Boost_USE_MULTITHREADED ON)
-# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
-#
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# target_link_libraries(foo ${Boost_LIBRARIES})
-# endif()
-#
-#
-# The components list needs to contain actual names of boost libraries only,
-# such as "date_time" for "libboost_date_time". If you're using parts of
-# Boost that contain header files only (e.g. foreach) you do not need to
-# specify COMPONENTS.
-#
-# You should provide a minimum version number that should be used. If you provide this
-# version number and specify the REQUIRED attribute, this module will fail if it
-# can't find the specified or a later version. If you specify a version number this is
-# automatically put into the considered list of version numbers and thus doesn't need
-# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
-#
-# NOTE for Visual Studio Users:
-# Automatic linking is used on MSVC & Borland compilers by default when
-# #including things in Boost. It's important to note that setting
-# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
-# should you need this feature. Automatic linking typically uses static
-# libraries with a few exceptions (Boost.Python is one).
-#
-# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
-# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
-# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
-# gets set to OFF. It is suggested you avoid automatic linking since it
-# will make your application less portable.
-#
-# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
-#
-# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
-# boost version numbers that should be taken into account when searching
-# for Boost. Unfortunately boost puts the version number into the
-# actual filename for the libraries, so this variable will certainly be needed
-# in the future when new Boost versions are released.
-#
-# Currently this module searches for the following version numbers:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
-# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
-#
-# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
-# add both 1.x and 1.x.0 as shown above. Official Boost include directories
-# omit the 3rd version number from include paths if it is 0 although not all
-# binary Boost releases do so.
-#
-# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
-#
-# ============================================================================
-#
-# Variables used by this module, they can change the default behaviour and need to be set
-# before calling find_package:
-#
-# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
-# boost libraries. If not specified, defaults
-# to ON.
-#
-# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
-# boost libraries. Defaults to OFF.
-#
-# Other Variables used by this module which you may want to set.
-#
-# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
-# the boost include directory. Please see
-# the documentation above regarding this
-# annoying, but necessary variable :(
-#
-# Boost_DEBUG Set this to TRUE to enable debugging output
-# of FindBoost.cmake if you are having problems.
-# Please enable this before filing any bug
-# reports.
-#
-# Boost_COMPILER Set this to the compiler suffix used by Boost
-# (e.g. "-gcc43") if FindBoods has problems finding
-# the proper Boost installation
-#
-# These last three variables are available also as environment variables:
-#
-# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
-# Boost. Set this if the module has problems finding
-# the proper Boost installation.
-#
-# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# Variables defined by this module:
-#
-# Boost_FOUND System has Boost, this means the include dir was
-# found, as well as all the libraries specified in
-# the COMPONENTS list.
-#
-# Boost_INCLUDE_DIRS Boost include directories: not cached
-#
-# Boost_INCLUDE_DIR This is almost the same as above, but this one is
-# cached and may be modified by advanced users
-#
-# Boost_LIBRARIES Link these to use the Boost libraries that you
-# specified: not cached
-#
-# Boost_LIBRARY_DIRS The path to where the Boost library files are.
-#
-# Boost_VERSION The version number of the boost libraries that
-# have been found, same as in version.hpp from Boost
-#
-# Boost_LIB_VERSION The version number in filename form as
-# it's appended to the library filenames
-#
-# Boost_MAJOR_VERSION major version number of boost
-# Boost_MINOR_VERSION minor version number of boost
-# Boost_SUBMINOR_VERSION subminor version number of boost
-#
-# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
-# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
-# to have diagnostic information about Boost's
-# automatic linking outputted during compilation time.
-#
-# For each component you list the following variables are set.
-# ATTENTION: The component names need to be in lower case, just as the boost
-# library names however the CMake variables use upper case for the component
-# part. So you'd get Boost_SERIALIZATION_FOUND for example.
-#
-# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
-# Boost_${COMPONENT}_LIBRARY The absolute path of the Boost library "component".
-# Boost_${COMPONENT}_LIBRARY_DEBUG The absolute path of the debug version of the
-# Boost library "component".
-# Boost_${COMPONENT}_LIBRARY_RELEASE The absolute path of the release version of the
-# Boost library "component"
-#
-# Copyright (c) 2006-2008 Andreas Schneider <ma...@cy...>
-# Copyright (c) 2007 Wengo
-# Copyright (c) 2007 Mike Jackson
-# Copyright (c) 2008 Andreas Pakulat <ap...@gm...>
-#
-# Redistribution AND use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-IF(NOT DEFINED Boost_USE_MULTITHREADED)
- SET(Boost_USE_MULTITHREADED TRUE)
-ENDIF()
-
-if(Boost_FIND_VERSION_EXACT)
- # The version may appear in a directory with or without the patch
- # level, even when the patch level is non-zero.
- set(_boost_TEST_VERSIONS
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
-else(Boost_FIND_VERSION_EXACT)
- # The user has not requested an exact version. Among known
- # versions, find those that are acceptable to the user request.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.38.0" "1.38" "1.37.0" "1.37"
- "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
- "1.34" "1.33.1" "1.33.0" "1.33")
- set(_boost_TEST_VERSIONS)
- if(Boost_FIND_VERSION)
- set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- # Select acceptable versions.
- foreach(version ${_Boost_KNOWN_VERSIONS})
- if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
- # This version is high enough.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
- # This version is a short-form for the requested version with
- # the patch level dropped.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- endif()
- endforeach(version)
- else(Boost_FIND_VERSION)
- # Any version is acceptable.
- set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
- endif(Boost_FIND_VERSION)
-endif(Boost_FIND_VERSION_EXACT)
-
-# The reason that we failed to find Boost. This will be set to a
-# user-friendly message when we fail to find some necessary piece of
-# Boost.
-set(Boost_ERROR_REASON)
-
-############################################
-#
-# Check the existence of the libraries.
-#
-############################################
-# This macro was taken directly from the FindQt4.cmake file that is included
-# with the CMake distribution. This is NOT my work. All work was done by the
-# original authors of the FindQt4.cmake file. Only minor modifications were
-# made to remove references to Qt and make this file more generally applicable
-#########################################################################
-
-MACRO (_Boost_ADJUST_LIB_VARS basename)
- IF (Boost_INCLUDE_DIR )
- IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
- # if the generator supports configuration types then set
- # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
- IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- # if there are no configuration types and CMAKE_BUILD_TYPE has no value
- # then just use the release libraries
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
- ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
-
- # if only the release version was found, set the debug variable also to the release version
- IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
- SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
- ENDIF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
-
- # if only the debug version was found, set the release variable also to the debug version
- IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
- SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
-
- IF (Boost_${basename}_LIBRARY)
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
-
- # Remove superfluous "debug" / "optimized" keywords from
- # Boost_LIBRARY_DIRS
- FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
- GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
- LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
- ENDFOREACH()
- LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
-
- set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
- SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
- ENDIF (Boost_${basename}_LIBRARY)
-
- ENDIF (Boost_INCLUDE_DIR )
- # Make variables changeble to the advanced user
- MARK_AS_ADVANCED(
- Boost_${basename}_LIBRARY
- Boost_${basename}_LIBRARY_RELEASE
- Boost_${basename}_LIBRARY_DEBUG
- )
-ENDMACRO (_Boost_ADJUST_LIB_VARS)
-
-#
-# Runs compiler with "-dumpversion" and parses major/minor
-# version with a regex.
-#
-FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
-
- EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE _boost_COMPILER_VERSION
- )
- STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
- _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-
- SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
-ENDFUNCTION()
-
-
-#-------------------------------------------------------------------------------
-
-
-SET( _boost_IN_CACHE TRUE)
-IF(Boost_INCLUDE_DIR)
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- IF(NOT Boost_${COMPONENT}_FOUND)
- SET( _boost_IN_CACHE FALSE)
- ENDIF(NOT Boost_${COMPONENT}_FOUND)
- ENDFOREACH(COMPONENT)
-ELSE(Boost_INCLUDE_DIR)
- SET( _boost_IN_CACHE FALSE)
-ENDIF(Boost_INCLUDE_DIR)
-
-IF (_boost_IN_CACHE)
- # in cache already
- SET(Boost_FOUND TRUE)
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
- ENDFOREACH(COMPONENT)
- SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
- IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
- ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
- "is already in the cache. For debugging messages, please clear the cache.")
- endif()
-ELSE (_boost_IN_CACHE)
- # Need to search for boost
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost not in cache")
- # Output some of their choices
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
- endif()
-
- IF(WIN32)
- # In windows, automatic linking is performed, so you do not have
- # to specify the libraries. If you are linking to a dynamic
- # runtime, then you can choose to link to either a static or a
- # dynamic Boost library, the default is to do a static link. You
- # can alter this for a specific library "whatever" by defining
- # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be
- # linked dynamically. Alternatively you can force all Boost
- # libraries to dynamic link by defining BOOST_ALL_DYN_LINK.
-
- # This feature can be disabled for Boost library "whatever" by
- # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining
- # BOOST_ALL_NO_LIB.
-
- # If you want to observe which libraries are being linked against
- # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking
- # code to emit a #pragma message each time a library is selected
- # for linking.
- SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS
- "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
- ENDIF(WIN32)
-
- SET(_boost_INCLUDE_SEARCH_DIRS
- C:/boost/include
- C:/boost
- "$ENV{ProgramFiles}/boost"
- C:/library/boost
- "C:/Program Files/boost"
- "C:/Program Files (x86)/boost"
- /sw/local/include
- )
-
- # If BOOST_ROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOST_ROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
-
- # If BOOSTROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOSTROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
-
- # If BOOST_INCLUDEDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
- set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
- ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
-
- # If BOOST_LIBRARYDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
- set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
- ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
-
- IF( BOOST_ROOT )
- file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
- ENDIF( BOOST_ROOT )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Declared as CMake or Environmental Variables:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_ROOT = ${BOOST_ROOT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- endif()
-
- IF( BOOST_ROOT )
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_ROOT}/include
- ${BOOST_ROOT}
- ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_INCLUDEDIR )
- file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR)
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_INCLUDEDIR )
-
- # ------------------------------------------------------------------------
- # Search for Boost include DIR
- # ------------------------------------------------------------------------
- # Try to find Boost by stepping backwards through the Boost versions
- # we know about.
- IF( NOT Boost_INCLUDE_DIR )
- # Build a list of path suffixes for each version.
- SET(_boost_PATH_SUFFIXES)
- FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
- # Add in a path suffix, based on the required version, ideally
- # we could read this from version.hpp, but for that to work we'd
- # need to know the include dir already
- set(_boost_BOOSTIFIED_VERSION)
-
- # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
- IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ENDIF()
-
- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
- if(WIN32)
- # For BoostPro's underscores (and others?)
- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
- endif()
-
- ENDFOREACH(_boost_VER)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Include debugging info:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
- endif()
-
- # Look for a standard boost header file.
- FIND_PATH(Boost_INCLUDE_DIR
- NAMES boost/config.hpp
- HINTS ${_boost_INCLUDE_SEARCH_DIRS}
- PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
- )
- ENDIF( NOT Boost_INCLUDE_DIR )
-
- # ------------------------------------------------------------------------
- # Extract version information from version.hpp
- # ------------------------------------------------------------------------
-
- IF(Boost_INCLUDE_DIR)
- # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
- # Read the whole file:
- #
- SET(BOOST_VERSION 0)
- SET(BOOST_LIB_VERSION "")
- FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
- endif()
-
- STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
- STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
-
- SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
- SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
-
- IF(NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
-
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
- ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "version.hpp reveals boost "
- "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- endif()
- ELSE(Boost_INCLUDE_DIR)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
- ENDIF(Boost_INCLUDE_DIR)
-
- # ------------------------------------------------------------------------
- # Suffix initialization and compiler suffix detection.
- # ------------------------------------------------------------------------
-
- # Setting some more suffixes for the library
- SET (Boost_LIB_PREFIX "")
- if ( MSVC AND Boost_USE_STATIC_LIBS )
- SET (Boost_LIB_PREFIX "lib")
- endif()
-
- if (Boost_COMPILER)
- set(_boost_COMPILER ${Boost_COMPILER})
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
- endif()
- else(Boost_COMPILER)
- # Attempt to guess the compiler suffix
- # NOTE: this is not perfect yet, if you experience any issues
- # please report them and use the Boost_COMPILER variable
- # to work around the problems.
- if (MSVC90)
- SET (_boost_COMPILER "-vc90")
- elseif (MSVC80)
- SET (_boost_COMPILER "-vc80")
- elseif (MSVC71)
- SET (_boost_COMPILER "-vc71")
- elseif (MSVC70) # Good luck!
- SET (_boost_COMPILER "-vc7") # yes, this is correct
- elseif (MSVC60) # Good luck!
- SET (_boost_COMPILER "-vc6") # yes, this is correct
- elseif (BORLAND)
- SET (_boost_COMPILER "-bcb")
- elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
- if(WIN32)
- set (_boost_COMPILER "-iw")
- else()
- set (_boost_COMPILER "-il")
- endif()
- elseif (MINGW)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
- endif()
- elseif (UNIX)
- if (CMAKE_COMPILER_IS_GNUCXX)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- # Determine which version of GCC we have.
- IF(APPLE)
- IF(Boost_MINOR_VERSION)
- IF(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost 1.36.0 and newer, the mangled compiler name used
- # on Mac OS X/Darwin is "xgcc".
- SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
- ELSE(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost <= 1.35.0, there is no mangled compiler name for
- # the Mac OS X/Darwin version of GCC.
- SET(_boost_COMPILER "")
- ENDIF(${Boost_MINOR_VERSION} GREATER 35)
- ELSE(Boost_MINOR_VERSION)
- # We don't know the Boost version, so assume it's
- # pre-1.36.0.
- SET(_boost_COMPILER "")
- ENDIF(Boost_MINOR_VERSION)
- ELSE()
- SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
- ENDIF()
- endif()
- endif (CMAKE_COMPILER_IS_GNUCXX)
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "guessed _boost_COMPILER = ${_boost_COMPILER}")
- endif()
- endif(Boost_COMPILER)
-
- SET (_boost_MULTITHREADED "-mt")
- if( NOT Boost_USE_MULTITHREADED )
- set (_boost_MULTITHREADED "")
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
- endif()
-
- SET( _boost_STATIC_TAG "")
- set( _boost_ABI_TAG "")
- IF (WIN32)
- IF(MSVC)
- SET (_boost_ABI_TAG "g")
- ENDIF(MSVC)
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_STATIC_TAG "-s")
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDIF(WIN32)
- SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_ABI_TAG = ${_boost_ABI_TAG}")
- endif()
-
- # ------------------------------------------------------------------------
- # Begin finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(_boost_LIBRARIES_SEARCH_DIRS
- C:/boost/lib
- C:/boost
- "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
- "$ENV{ProgramFiles}/boost"
- C:/library/boost/stage/lib
- "C:/Program Files/boost/stage/lib"
- "C:/Program Files (x86)/boost/stage/lib"
- C:/boost/lib
- /sw/local/lib
- )
- IF( BOOST_ROOT )
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_ROOT}/lib
- ${BOOST_ROOT}/stage/lib
- ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_LIBRARYDIR )
- file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_LIBRARYDIR )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
- endif()
-
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
-
- # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ELSE(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF(WIN32)
- ENDIF( Boost_USE_STATIC_LIBS )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
- IF( Boost_USE_STATIC_LIBS )
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDFOREACH(COMPONENT)
- # ------------------------------------------------------------------------
- # End finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(Boost_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- )
-
- SET(Boost_FOUND FALSE)
- IF(Boost_INCLUDE_DIR)
- SET( Boost_FOUND TRUE )
-
- # Check the version of Boost against the requested version.
- if (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34")
- endif (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
-
- if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
- # If the user requested an exact version of Boost, check
- # that. We already know that the Boost version we have is >= the
- # requested version.
- set(_Boost_VERSION_AGE "new")
-
- # If the user didn't specify a patchlevel, it's 0.
- if (NOT Boost_FIND_VERSION_PATCH)
- set(Boost_FIND_VERSION_PATCH 0)
- endif (NOT Boost_FIND_VERSION_PATCH)
-
- # We'll set Boost_FOUND true again if we have an exact version match.
- set(Boost_FOUND FALSE)
- if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND TRUE )
- endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
-
- if(NOT Boost_FOUND)
- # State that we found a version of Boost that is too new or too old.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- if (Boost_FIND_VERSION_PATCH)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
- endif (Boost_FIND_VERSION_PATCH)
- if (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
- endif (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
- endif (NOT Boost_FOUND)
-
- if (Boost_FOUND)
- set(_boost_CHECKED_COMPONENT FALSE)
- set(_Boost_MISSING_COMPONENTS)
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} COMPONENT)
- set(_boost_CHECKED_COMPONENT TRUE)
- if(NOT Boost_${COMPONENT}_FOUND)
- string(TOLOWER ${COMPONENT} COMPONENT)
- list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
- set( Boost_FOUND FALSE)
- endif(NOT Boost_${COMPONENT}_FOUND)
- endforeach(COMPONENT)
- endif (Boost_FOUND)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
- endif()
-
- if (_Boost_MISSING_COMPONENTS)
- # We were unable to find some libraries, so generate a sensible
- # error message that lists the libraries we were unable to find.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
- foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON} boost_${COMPONENT}\n")
- endforeach(COMPONENT)
-
- list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
- list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
- if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- endif (_Boost_MISSING_COMPONENTS)
-
- IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
- # Compatibility Code for backwards compatibility with CMake
- # 2.4's FindBoost module.
-
- # Look for the boost library path.
- # Note that the user may not have installed any libraries
- # so it is quite possible the Boost_LIBRARY_PATH may not exist.
- SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
-
- IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
-
- IF("${_boost_LIB_DIR}" MATCHES "/include$")
- # Strip off the trailing "/include" in the path.
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF("${_boost_LIB_DIR}" MATCHES "/include$")
-
- IF(EXISTS "${_boost_LIB_DIR}/lib")
- SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/lib")
- IF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR "")
- ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
-
- IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
- SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
- ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
-
- ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
-
- ELSE(Boost_INCLUDE_DIR)
- SET( Boost_FOUND FALSE)
- ENDIF(Boost_INCLUDE_DIR)
-
- IF (Boost_FOUND)
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- ENDIF(NOT Boost_FIND_QUIETLY)
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE(STATUS "Found the following Boost libraries:")
- ENDIF(NOT Boost_FIND_QUIETLY)
- FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
- STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT )
- IF ( Boost_${UPPERCOMPONENT}_FOUND )
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE (STATUS " ${COMPONENT}")
- ENDIF(NOT Boost_FIND_QUIETLY)
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
- ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
- ENDFOREACH(COMPONENT)
- ELSE (Boost_FOUND)
- IF (Boost_FIND_REQUIRED)
- message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
- ENDIF(Boost_FIND_REQUIRED)
- ENDIF(Boost_FOUND)
-
- # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
- MARK_AS_ADVANCED(Boost_INCLUDE_DIR
- Boost_INCLUDE_DIRS
- Boost_LIBRARY_DIRS
- )
-ENDIF(_boost_IN_CACHE)
-
+# - Try to find Boost include dirs and libraries
+# Usage of this module as follows:
+#
+# NOTE: Take note of the Boost_ADDITIONAL_VERSIONS variable below.
+# Due to Boost naming conventions and limitations in CMake this find
+# module is NOT future safe with respect to Boost version numbers,
+# and may break.
+#
+# == Using Header-Only libraries from within Boost: ==
+#
+# find_package( Boost 1.36.0 )
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# endif()
+#
+#
+# == Using actual libraries from within Boost: ==
+#
+# set(Boost_USE_STATIC_LIBS ON)
+# set(Boost_USE_MULTITHREADED ON)
+# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
+#
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# target_link_libraries(foo ${Boost_LIBRARIES})
+# endif()
+#
+#
+# The components list needs to contain actual names of boost libraries only,
+# such as "date_time" for "libboost_date_time". If you're using parts of
+# Boost that contain header files only (e.g. foreach) you do not need to
+# specify COMPONENTS.
+#
+# You should provide a minimum version number that should be used. If you provide this
+# version number and specify the REQUIRED attribute, this module will fail if it
+# can't find the specified or a later version. If you specify a version number this is
+# automatically put into the considered list of version numbers and thus doesn't need
+# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
+#
+# NOTE for Visual Studio Users:
+# Automatic linking is used on MSVC & Borland compilers by default when
+# #including things in Boost. It's important to note that setting
+# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
+# should you need this feature. Automatic linking typically uses static
+# libraries with a few exceptions (Boost.Python is one).
+#
+# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
+# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
+# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
+# gets set to OFF. It is suggested you avoid automatic linking since it
+# will make your application less portable.
+#
+# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
+#
+# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
+# boost version numbers that should be taken into account when searching
+# for Boost. Unfortunately boost puts the version number into the
+# actual filename for the libraries, so this variable will certainly be needed
+# in the future when new Boost versions are released.
+#
+# Currently this module searches for the following version numbers:
+# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
+# 1.40, 1.40.0, 1.41, 1.41.0
+#
+# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
+# add both 1.x and 1.x.0 as shown above. Official Boost include directories
+# omit the 3rd version number from include paths if it is 0 although not all
+# binary Boost releases do so.
+#
+# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
+#
+# ===================================== ============= ========================
+#
+# Variables used by this module, they can change the default behaviour and
+# need to be set before calling find_package:
+#
+# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
+# boost libraries. If not specified, defaults
+# to ON.
+#
+# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
+# boost libraries. Defaults to OFF.
+#
+# Other Variables used by this module which you may want to set.
+#
+# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
+# the boost include directory. Please see
+# the documentation above regarding this
+# annoying, but necessary variable :(
+#
+# Boost_DEBUG Set this to TRUE to enable debugging output
+# of FindBoost.cmake if you are having problems.
+# Please enable this before filing any bug
+# reports.
+#
+# Boost_DETAILED_FAILURE_MSG FindBoost doesn't output detailed information
+# about why it failed or how to fix the problem
+# unless this is set to TRUE or the REQUIRED
+# keyword is specified in find_package().
+# [Since CMake 2.8.0]
+#
+# Boost_COMPILER Set this to the compiler suffix used by Boost
+# (e.g. "-gcc43") if FindBoost has problems finding
+# the proper Boost installation
+#
+# These last three variables are available also as environment variables:
+#
+# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
+# Boost. Set this if the module has problems finding
+# the proper Boost installation.
+#
+# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# Variables defined by this module:
+#
+# Boost_FOUND System has Boost, this means the include dir was
+# found, as well as all the libraries specified in
+# the COMPONENTS list.
+#
+# Boost_INCLUDE_DIRS Boost include directories: not cached
+#
+# Boost_INCLUDE_DIR This is almost the same as above, but this one is
+# cached and may be modified by advanced users
+#
+# Boost_LIBRARIES Link to these to use the Boost libraries that you
+# specified: not cached
+#
+# Boost_LIBRARY_DIRS The path to where the Boost library files are.
+#
+# Boost_VERSION The version number of the boost libraries that
+# have been found, same as in version.hpp from Boost
+#
+# Boost_LIB_VERSION The version number in filename form as
+# it's appended to the library filenames
+#
+# Boost_MAJOR_VERSION major version number of boost
+# Boost_MINOR_VERSION minor version number of boost
+# Boost_SUBMINOR_VERSION subminor version number of boost
+#
+# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
+# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
+# to have diagnostic information about Boost's
+# automatic linking outputted during compilation time.
+#
+# For each component you specify in find_package(), the following (UPPER-CASE)
+# variables are set. You can use these variables if you would like to pick and
+# choose components for your targets instead of just using Boost_LIBRARIES.
+#
+# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
+#
+# Boost_${COMPONENT}_LIBRARY Contains the libraries for the specified Boost
+# "component" (includes debug and optimized keywords
+# when needed).
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006-2008 Andreas Schneider <ma...@cy...>
+# Copyright 2007 Wengo
+# Copyright 2007 Mike Jackson
+# Copyright 2008 Andreas Pakulat <ap...@gm...>
+# Copyright 2008-2009 Philip Lowman <ph...@yh...>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+#-------------------------------------------------------------------------------
+# FindBoost functions & macros
+#
+############################################
+#
+# Check the existence of the libraries.
+#
+############################################
+# This macro was taken directly from the FindQt4.cmake file that is included
+# with the CMake distribution. This is NOT my work. All work was done by the
+# original authors of the FindQt4.cmake file. Only minor modifications were
+# made to remove references to Qt and make this file more generally applicable
+# And ELSE/ENDIF pairs were removed for readability.
+#########################################################################
+
+MACRO (_Boost_ADJUST_LIB_VARS basename)
+ IF (Boost_INCLUDE_DIR )
+ IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
+ # if the generator supports configuration types then set
+ # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
+ IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ELSE()
+ # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+ # then just use the release libraries
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
+ ENDIF()
+ # FIXME: This probably should be set for both cases
+ SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF()
+
+ # if only the release version was found, set the debug variable also to the release version
+ IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
+ SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
+ ENDIF()
+
+ # if only the debug version was found, set the release variable also to the debug version
+ IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
+ SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
+ SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
+ ENDIF()
+
+ IF (Boost_${basename}_LIBRARY)
+ set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
+
+ # Remove superfluous "debug" / "optimized" keywords from
+ # Boost_LIBRARY_DIRS
+ FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
+ GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
+ LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
+ ENDFOREACH()
+ LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
+
+ set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
+ SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
+ ENDIF(Boost_${basename}_LIBRARY)
+
+ ENDIF (Boost_INCLUDE_DIR )
+ # Make variables changeble to the advanced user
+ MARK_AS_ADVANCED(
+ Boost_${basename}_LIBRARY
+ Boost_${basename}_LIBRARY_RELEASE
+ Boost_${basename}_LIBRARY_DEBUG
+ )
+ENDMACRO (_Boost_ADJUST_LIB_VARS)
+
+#-------------------------------------------------------------------------------
+
+#
+# Runs compiler with "-dumpversion" and parses major/minor
+# version with a regex.
+#
+FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
+
+ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE _boost_COMPILER_VERSION
+ )
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+ _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
+
+ SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
+ENDFUNCTION()
+
+#
+# A convenience function for marking desired components
+# as found or not
+#
+function(_Boost_MARK_COMPONENTS_FOUND _yes_or_no)
+ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ set(Boost_${UPPERCOMPONENT}_FOUND ${_yes_or_no} CACHE INTERNAL "Whether the Boost ${COMPONENT} library found" FORCE)
+ endforeach()
+endfunction()
+
+#
+# End functions/macros
+#
+#-------------------------------------------------------------------------------
+
+
+
+
+IF(NOT DEFINED Boost_USE_MULTITHREADED)
+ SET(Boost_USE_MULTITHREADED TRUE)
+ENDIF()
+
+if(Boost_FIND_VERSION_EXACT)
+ # The version may appear in a directory with or without the patch
+ # level, even when the patch level is non-zero.
+ set(_boost_TEST_VERSIONS
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
+ "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+else(Boost_FIND_VERSION_EXACT)
+ # The user has not requested an exact version. Among known
+ # versions, find those that are acceptable to the user request.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+ "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
+ "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
+ "1.34" "1.33.1" "1.33.0" "1.33")
+ set(_boost_TEST_VERSIONS)
+ if(Boost_FIND_VERSION)
+ set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
+ # Select acceptable versions.
+ foreach(version ${_Boost_KNOWN_VERSIONS})
+ if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
+ # This version is high enough.
+ list(APPEND _boost_TEST_VERSIONS "${version}")
+ elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
+ # This version is a short-form for the...
[truncated message content] |
|
From: <a-...@us...> - 2010-02-28 07:05:38
|
Revision: 180
http://simspark.svn.sourceforge.net/simspark/?rev=180&view=rev
Author: a-held
Date: 2010-02-28 07:05:31 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
Add missing return values to GetParameter and CreateMass
Modified Paths:
--------------
trunk/spark/lib/oxygen/physicsserver/balljoint.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
Modified: trunk/spark/lib/oxygen/physicsserver/balljoint.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/balljoint.cpp 2010-02-28 01:33:40 UTC (rev 179)
+++ trunk/spark/lib/oxygen/physicsserver/balljoint.cpp 2010-02-28 07:05:31 UTC (rev 180)
@@ -94,4 +94,6 @@
float BallJoint::GetParameter(int parameter) const{
GetLog()->Warning()
<< "(BallJoint) WARNING: SetParameter undefined for BallJoint, call ignored";
+
+ return 0.0f;
}
Modified: trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-28 01:33:40 UTC (rev 179)
+++ trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-28 07:05:31 UTC (rev 180)
@@ -392,7 +392,7 @@
GenericMass& RigidBody::CreateMass(float mass, salt::Vector3f cVector)
{
- mRigidBodyImp->CreateMass(mass, cVector);
+ return mRigidBodyImp->CreateMass(mass, cVector);
}
void RigidBody::SetInertiaTensorAt(int i, float value, GenericMass& mass)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2010-02-28 01:33:50
|
Revision: 179
http://simspark.svn.sourceforge.net/simspark/?rev=179&view=rev
Author: marianbuchta
Date: 2010-02-28 01:33:40 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
- change shared_ptr -> boost::shared_ptr and weak_ptr -> boost::weak_ptr because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr
- added new version of FindBoost.cmake: finding boost libraries created by Visual C++ 2010 compiler.
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/cmake/FindBoost.cmake
trunk/spark/lib/kerosin/fontserver/fontserver.cpp
trunk/spark/lib/kerosin/imageserver/imageserver.cpp
trunk/spark/lib/kerosin/imageserver/imageserver.h
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/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/kerosin/soundserver/soundserver_c.cpp
trunk/spark/lib/kerosin/textureserver/textureserver.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/behavior.cpp
trunk/spark/lib/oxygen/gamecontrolserver/gamecontrolserver.cpp
trunk/spark/lib/oxygen/geometryserver/geometryserver.cpp
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.cpp
trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
trunk/spark/lib/oxygen/monitorserver/monitorserver.h
trunk/spark/lib/oxygen/physicsserver/collider.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.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/recorderhandler.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.cpp
trunk/spark/lib/oxygen/physicsserver/space.cpp
trunk/spark/lib/oxygen/physicsserver/world.cpp
trunk/spark/lib/oxygen/sceneserver/basenode.cpp
trunk/spark/lib/oxygen/sceneserver/basenode_c.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/agentcontrol.cpp
trunk/spark/lib/oxygen/simulationserver/monitorcontrol.cpp
trunk/spark/lib/oxygen/simulationserver/monitorlogger.cpp
trunk/spark/lib/oxygen/simulationserver/netclient.cpp
trunk/spark/lib/oxygen/simulationserver/netcontrol.cpp
trunk/spark/lib/oxygen/simulationserver/netmessage.cpp
trunk/spark/lib/oxygen/simulationserver/simcontrolnode.cpp
trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp
trunk/spark/lib/oxygen/simulationserver/traincontrol.cpp
trunk/spark/lib/zeitgeist/class.cpp
trunk/spark/lib/zeitgeist/class.h
trunk/spark/lib/zeitgeist/core.cpp
trunk/spark/lib/zeitgeist/corecontext.cpp
trunk/spark/lib/zeitgeist/fileserver/fileserver.cpp
trunk/spark/lib/zeitgeist/leaf.cpp
trunk/spark/lib/zeitgeist/node.cpp
trunk/spark/lib/zeitgeist/object.cpp
trunk/spark/lib/zeitgeist/object.h
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/lib/zeitgeist/zeitgeist.cpp
trunk/spark/plugin/accelerometer/accelerometer.cpp
trunk/spark/plugin/agentsynceffector/agentsynceffector.cpp
trunk/spark/plugin/collisionperceptor/collisionperceptor.cpp
trunk/spark/plugin/collisionperceptor/perceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/touchperceptor.cpp
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.cpp
trunk/spark/plugin/filesystemstd/filesystemstd.cpp
trunk/spark/plugin/forceeffector/forceeffector.cpp
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.cpp
trunk/spark/plugin/imageperceptor/imageperceptor.h
trunk/spark/plugin/inputsdl/inputsystemsdl.cpp
trunk/spark/plugin/objimporter/objimporter.cpp
trunk/spark/plugin/odeimps/odejoint.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/sexpparser/sexpparser.cpp
trunk/spark/plugin/sparkagent/hinge2effector.cpp
trunk/spark/plugin/sparkagent/hingeeffector.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
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2010-02-26 09:19:45 UTC (rev 178)
+++ trunk/spark/ChangeLog 2010-02-28 01:33:40 UTC (rev 179)
@@ -1,3 +1,97 @@
+2010-02-28 Marian Buchta <mar...@gm...>
+
+ * lib/kerosin/fontserver/fontserver.cpp:
+ * lib/kerosin/imageserver/imageserver.cpp:
+ * lib/kerosin/imageserver/imageserver.h:
+ * lib/kerosin/inputserver/inputcontrol.cpp:
+ * lib/kerosin/inputserver/inputserver.cpp:
+ * lib/kerosin/materialserver/material2dtexture.cpp:
+ * lib/kerosin/materialserver/materialserver.cpp:
+ * lib/kerosin/renderserver/renderserver.cpp:
+ * lib/kerosin/sceneserver/singlematnode.cpp:
+ * lib/kerosin/sceneserver/staticmesh.cpp:
+ * lib/kerosin/soundserver/soundserver.cpp:
+ * lib/kerosin/soundserver/soundserver_c.cpp:
+ * lib/kerosin/textureserver/textureserver.cpp:
+ * lib/oxygen/agentaspect/agentaspect.cpp:
+ * lib/oxygen/agentaspect/effector.cpp:
+ * lib/oxygen/controlaspect/controlaspect.cpp:
+ * lib/oxygen/gamecontrolserver/behavior.cpp:
+ * lib/oxygen/gamecontrolserver/gamecontrolserver.cpp:
+ * lib/oxygen/geometryserver/geometryserver.cpp:
+ * lib/oxygen/geometryserver/stdmeshimporter.cpp:
+ * lib/oxygen/monitorserver/monitorserver.cpp:
+ * lib/oxygen/monitorserver/monitorserver.h:
+ * lib/oxygen/physicsserver/collider.cpp:
+ * lib/oxygen/physicsserver/collisionhandler.cpp:
+ * lib/oxygen/physicsserver/contactjointhandler.cpp:
+ * lib/oxygen/physicsserver/joint.cpp:
+ * lib/oxygen/physicsserver/physicsobject.cpp:
+ * lib/oxygen/physicsserver/physicsserver.cpp:
+ * lib/oxygen/physicsserver/recorderhandler.cpp:
+ * lib/oxygen/physicsserver/rigidbody.cpp:
+ * lib/oxygen/physicsserver/sliderjoint.cpp:
+ * lib/oxygen/physicsserver/space.cpp:
+ * lib/oxygen/physicsserver/world.cpp:
+ * lib/oxygen/sceneserver/basenode.cpp:
+ * lib/oxygen/sceneserver/basenode_c.cpp:
+ * lib/oxygen/sceneserver/fpscontroller.cpp:
+ * lib/oxygen/sceneserver/sceneserver.cpp:
+ * lib/oxygen/sceneserver/transform.cpp:
+ * lib/oxygen/simulationserver/agentcontrol.cpp:
+ * lib/oxygen/simulationserver/monitorcontrol.cpp:
+ * lib/oxygen/simulationserver/monitorlogger.cpp:
+ * lib/oxygen/simulationserver/netclient.cpp:
+ * lib/oxygen/simulationserver/netcontrol.cpp:
+ * lib/oxygen/simulationserver/netmessage.cpp:
+ * lib/oxygen/simulationserver/simcontrolnode.cpp:
+ * lib/oxygen/simulationserver/simulationserver.cpp:
+ * lib/oxygen/simulationserver/traincontrol.cpp:
+ * lib/zeitgeist/class.cpp:
+ * lib/zeitgeist/class.h:
+ * lib/zeitgeist/core.cpp:
+ * lib/zeitgeist/corecontext.cpp:
+ * lib/zeitgeist/fileserver/fileserver.cpp:
+ * lib/zeitgeist/leaf.cpp:
+ * lib/zeitgeist/node.cpp:
+ * lib/zeitgeist/object.cpp:
+ * lib/zeitgeist/object.h:
+ * lib/zeitgeist/scriptserver/scriptserver.cpp:
+ * lib/zeitgeist/zeitgeist.cpp:
+ * plugin/accelerometer/accelerometer.cpp:
+ * plugin/agentsynceffector/agentsynceffector.cpp:
+ * plugin/collisionperceptor/collisionperceptor.cpp:
+ * plugin/collisionperceptor/perceptorhandler.cpp:
+ * plugin/collisionperceptor/touchperceptor.cpp:
+ * plugin/collisionperceptor/touchperceptorhandler.cpp:
+ * plugin/filesystemstd/filesystemstd.cpp:
+ * plugin/forceeffector/forceeffector.cpp:
+ * plugin/gyrorateperceptor/gyrorateperceptor.cpp:
+ * plugin/imageperceptor/imageperceptor.h:
+ * plugin/inputsdl/inputsystemsdl.cpp:
+ * plugin/objimporter/objimporter.cpp:
+ * plugin/odeimps/odejoint.cpp:
+ * plugin/perfectvisionperceptor/perfectvisionperceptor.cpp:
+ * plugin/rosimporter/rosimporter.cpp:
+ * plugin/rubysceneimporter/rubysceneimporter.cpp:
+ * plugin/sceneeffector/sceneeffector.cpp:
+ * plugin/sexpparser/sexpparser.cpp:
+ * plugin/sparkagent/hinge2effector.cpp:
+ * plugin/sparkagent/hingeeffector.cpp:
+ * plugin/sparkagent/universaljointeffector.cpp:
+ * plugin/sparkmonitor/sparkmonitor.cpp:
+ * plugin/sparkmonitor/sparkmonitorclient.cpp:
+ * plugin/sparkmonitor/sparkmonitorlogfileserver.cpp:
+ * spark/spark.cpp:
+ * test/coretest/main.cpp:
+ * test/fonttest/main.cpp:
+ * test/inputtest/main.cpp:
+ - change shared_ptr -> boost::shared_ptr and weak_ptr -> boost::weak_ptr
+ because of Visual Studio 2010 compatibility. Issue between boost::shared_ptr and std::tr1::shared_ptr
+
+ * cmake/FindBoost.cmake:
+ - added new version of FindBoost.cmake: finding boost libraries created by Visual C++ 2010 compiler.
+
2010-01-17 Hedayat Vatankhah <he...@gr...>
* NEWS:
Modified: trunk/spark/cmake/FindBoost.cmake
===================================================================
--- trunk/spark/cmake/FindBoost.cmake 2010-02-26 09:19:45 UTC (rev 178)
+++ trunk/spark/cmake/FindBoost.cmake 2010-02-28 01:33:40 UTC (rev 179)
@@ -1,860 +1,938 @@
-# - Try to find Boost include dirs and libraries
-# Usage of this module as follows:
-#
-# == Using Header-Only libraries from within Boost: ==
-#
-# find_package( Boost 1.36.0 )
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# endif()
-#
-#
-# == Using actual libraries from within Boost: ==
-#
-# set(Boost_USE_STATIC_LIBS ON)
-# set(Boost_USE_MULTITHREADED ON)
-# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
-#
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# target_link_libraries(foo ${Boost_LIBRARIES})
-# endif()
-#
-#
-# The components list needs to contain actual names of boost libraries only,
-# such as "date_time" for "libboost_date_time". If you're using parts of
-# Boost that contain header files only (e.g. foreach) you do not need to
-# specify COMPONENTS.
-#
-# You should provide a minimum version number that should be used. If you provide this
-# version number and specify the REQUIRED attribute, this module will fail if it
-# can't find the specified or a later version. If you specify a version number this is
-# automatically put into the considered list of version numbers and thus doesn't need
-# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
-#
-# NOTE for Visual Studio Users:
-# Automatic linking is used on MSVC & Borland compilers by default when
-# #including things in Boost. It's important to note that setting
-# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
-# should you need this feature. Automatic linking typically uses static
-# libraries with a few exceptions (Boost.Python is one).
-#
-# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
-# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
-# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
-# gets set to OFF. It is suggested you avoid automatic linking since it
-# will make your application less portable.
-#
-# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
-#
-# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
-# boost version numbers that should be taken into account when searching
-# for Boost. Unfortunately boost puts the version number into the
-# actual filename for the libraries, so this variable will certainly be needed
-# in the future when new Boost versions are released.
-#
-# Currently this module searches for the following version numbers:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
-# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
-#
-# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
-# add both 1.x and 1.x.0 as shown above. Official Boost include directories
-# omit the 3rd version number from include paths if it is 0 although not all
-# binary Boost releases do so.
-#
-# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
-#
-# ============================================================================
-#
-# Variables used by this module, they can change the default behaviour and need to be set
-# before calling find_package:
-#
-# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
-# boost libraries. If not specified, defaults
-# to ON.
-#
-# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
-# boost libraries. Defaults to OFF.
-#
-# Other Variables used by this module which you may want to set.
-#
-# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
-# the boost include directory. Please see
-# the documentation above regarding this
-# annoying, but necessary variable :(
-#
-# Boost_DEBUG Set this to TRUE to enable debugging output
-# of FindBoost.cmake if you are having problems.
-# Please enable this before filing any bug
-# reports.
-#
-# Boost_COMPILER Set this to the compiler suffix used by Boost
-# (e.g. "-gcc43") if FindBoods has problems finding
-# the proper Boost installation
-#
-# These last three variables are available also as environment variables:
-#
-# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
-# Boost. Set this if the module has problems finding
-# the proper Boost installation.
-#
-# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# Variables defined by this module:
-#
-# Boost_FOUND System has Boost, this means the include dir was
-# found, as well as all the libraries specified in
-# the COMPONENTS list.
-#
-# Boost_INCLUDE_DIRS Boost include directories: not cached
-#
-# Boost_INCLUDE_DIR This is almost the same as above, but this one is
-# cached and may be modified by advanced users
-#
-# Boost_LIBRARIES Link these to use the Boost libraries that you
-# specified: not cached
-#
-# Boost_LIBRARY_DIRS The path to where the Boost library files are.
-#
-# Boost_VERSION The version number of the boost libraries that
-# have been found, same as in version.hpp from Boost
-#
-# Boost_LIB_VERSION The version number in filename form as
-# it's appended to the library filenames
-#
-# Boost_MAJOR_VERSION major version number of boost
-# Boost_MINOR_VERSION minor version number of boost
-# Boost_SUBMINOR_VERSION subminor version number of boost
-#
-# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
-# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
-# to have diagnostic information about Boost's
-# automatic linking outputted during compilation time.
-#
-# For each component you list the following variables are set.
-# ATTENTION: The component names need to be in lower case, just as the boost
-# library names however the CMake variables use upper case for the component
-# part. So you'd get Boost_SERIALIZATION_FOUND for example.
-#
-# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
-# Boost_${COMPONENT}_LIBRARY The absolute path of the Boost library "component".
-# Boost_${COMPONENT}_LIBRARY_DEBUG The absolute path of the debug version of the
-# Boost library "component".
-# Boost_${COMPONENT}_LIBRARY_RELEASE The absolute path of the release version of the
-# Boost library "component"
-#
-# Copyright (c) 2006-2008 Andreas Schneider <ma...@cy...>
-# Copyright (c) 2007 Wengo
-# Copyright (c) 2007 Mike Jackson
-# Copyright (c) 2008 Andreas Pakulat <ap...@gm...>
-#
-# Redistribution AND use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-IF(NOT DEFINED Boost_USE_MULTITHREADED)
- SET(Boost_USE_MULTITHREADED TRUE)
-ENDIF()
-
-if(Boost_FIND_VERSION_EXACT)
- # The version may appear in a directory with or without the patch
- # level, even when the patch level is non-zero.
- set(_boost_TEST_VERSIONS
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
-else(Boost_FIND_VERSION_EXACT)
- # The user has not requested an exact version. Among known
- # versions, find those that are acceptable to the user request.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.38.0" "1.38" "1.37.0" "1.37"
- "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
- "1.34" "1.33.1" "1.33.0" "1.33")
- set(_boost_TEST_VERSIONS)
- if(Boost_FIND_VERSION)
- set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- # Select acceptable versions.
- foreach(version ${_Boost_KNOWN_VERSIONS})
- if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
- # This version is high enough.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
- # This version is a short-form for the requested version with
- # the patch level dropped.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- endif()
- endforeach(version)
- else(Boost_FIND_VERSION)
- # Any version is acceptable.
- set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
- endif(Boost_FIND_VERSION)
-endif(Boost_FIND_VERSION_EXACT)
-
-# The reason that we failed to find Boost. This will be set to a
-# user-friendly message when we fail to find some necessary piece of
-# Boost.
-set(Boost_ERROR_REASON)
-
-############################################
-#
-# Check the existence of the libraries.
-#
-############################################
-# This macro was taken directly from the FindQt4.cmake file that is included
-# with the CMake distribution. This is NOT my work. All work was done by the
-# original authors of the FindQt4.cmake file. Only minor modifications were
-# made to remove references to Qt and make this file more generally applicable
-#########################################################################
-
-MACRO (_Boost_ADJUST_LIB_VARS basename)
- IF (Boost_INCLUDE_DIR )
- IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
- # if the generator supports configuration types then set
- # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
- IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- # if there are no configuration types and CMAKE_BUILD_TYPE has no value
- # then just use the release libraries
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
- ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
-
- # if only the release version was found, set the debug variable also to the release version
- IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
- SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
- ENDIF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
-
- # if only the debug version was found, set the release variable also to the debug version
- IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
- SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
- SET(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
- ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
-
- IF (Boost_${basename}_LIBRARY)
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
-
- # Remove superfluous "debug" / "optimized" keywords from
- # Boost_LIBRARY_DIRS
- FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
- GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
- LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
- ENDFOREACH()
- LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
-
- set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
- SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
- ENDIF (Boost_${basename}_LIBRARY)
-
- ENDIF (Boost_INCLUDE_DIR )
- # Make variables changeble to the advanced user
- MARK_AS_ADVANCED(
- Boost_${basename}_LIBRARY
- Boost_${basename}_LIBRARY_RELEASE
- Boost_${basename}_LIBRARY_DEBUG
- )
-ENDMACRO (_Boost_ADJUST_LIB_VARS)
-
-#
-# Runs compiler with "-dumpversion" and parses major/minor
-# version with a regex.
-#
-FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
-
- EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE _boost_COMPILER_VERSION
- )
- STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
- _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-
- SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
-ENDFUNCTION()
-
-
-#-------------------------------------------------------------------------------
-
-
-SET( _boost_IN_CACHE TRUE)
-IF(Boost_INCLUDE_DIR)
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- IF(NOT Boost_${COMPONENT}_FOUND)
- SET( _boost_IN_CACHE FALSE)
- ENDIF(NOT Boost_${COMPONENT}_FOUND)
- ENDFOREACH(COMPONENT)
-ELSE(Boost_INCLUDE_DIR)
- SET( _boost_IN_CACHE FALSE)
-ENDIF(Boost_INCLUDE_DIR)
-
-IF (_boost_IN_CACHE)
- # in cache already
- SET(Boost_FOUND TRUE)
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} COMPONENT)
- _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
- ENDFOREACH(COMPONENT)
- SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
- IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
- ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
- "is already in the cache. For debugging messages, please clear the cache.")
- endif()
-ELSE (_boost_IN_CACHE)
- # Need to search for boost
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost not in cache")
- # Output some of their choices
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
- endif()
-
- IF(WIN32)
- # In windows, automatic linking is performed, so you do not have
- # to specify the libraries. If you are linking to a dynamic
- # runtime, then you can choose to link to either a static or a
- # dynamic Boost library, the default is to do a static link. You
- # can alter this for a specific library "whatever" by defining
- # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be
- # linked dynamically. Alternatively you can force all Boost
- # libraries to dynamic link by defining BOOST_ALL_DYN_LINK.
-
- # This feature can be disabled for Boost library "whatever" by
- # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining
- # BOOST_ALL_NO_LIB.
-
- # If you want to observe which libraries are being linked against
- # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking
- # code to emit a #pragma message each time a library is selected
- # for linking.
- SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS
- "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
- ENDIF(WIN32)
-
- SET(_boost_INCLUDE_SEARCH_DIRS
- C:/boost/include
- C:/boost
- "$ENV{ProgramFiles}/boost"
- C:/library/boost
- "C:/Program Files/boost"
- "C:/Program Files (x86)/boost"
- /sw/local/include
- )
-
- # If BOOST_ROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOST_ROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
-
- # If BOOSTROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOSTROOT})
- endif(NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
-
- # If BOOST_INCLUDEDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
- set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
- ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
-
- # If BOOST_LIBRARYDIR was defined in the environment, use it.
- IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
- set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
- ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
-
- IF( BOOST_ROOT )
- file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
- ENDIF( BOOST_ROOT )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Declared as CMake or Environmental Variables:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_ROOT = ${BOOST_ROOT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- endif()
-
- IF( BOOST_ROOT )
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_ROOT}/include
- ${BOOST_ROOT}
- ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_INCLUDEDIR )
- file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR)
- SET(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
- ENDIF( BOOST_INCLUDEDIR )
-
- # ------------------------------------------------------------------------
- # Search for Boost include DIR
- # ------------------------------------------------------------------------
- # Try to find Boost by stepping backwards through the Boost versions
- # we know about.
- IF( NOT Boost_INCLUDE_DIR )
- # Build a list of path suffixes for each version.
- SET(_boost_PATH_SUFFIXES)
- FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
- # Add in a path suffix, based on the required version, ideally
- # we could read this from version.hpp, but for that to work we'd
- # need to know the include dir already
- set(_boost_BOOSTIFIED_VERSION)
-
- # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
- IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
- STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- ENDIF()
-
- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
- if(WIN32)
- # For BoostPro's underscores (and others?)
- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
- endif()
-
- ENDFOREACH(_boost_VER)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Include debugging info:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
- endif()
-
- # Look for a standard boost header file.
- FIND_PATH(Boost_INCLUDE_DIR
- NAMES boost/config.hpp
- HINTS ${_boost_INCLUDE_SEARCH_DIRS}
- PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
- )
- ENDIF( NOT Boost_INCLUDE_DIR )
-
- # ------------------------------------------------------------------------
- # Extract version information from version.hpp
- # ------------------------------------------------------------------------
-
- IF(Boost_INCLUDE_DIR)
- # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
- # Read the whole file:
- #
- SET(BOOST_VERSION 0)
- SET(BOOST_LIB_VERSION "")
- FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
- endif()
-
- STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
- STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
-
- SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
- SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
-
- IF(NOT "${Boost_VERSION}" STREQUAL "0")
- MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
-
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
- ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "version.hpp reveals boost "
- "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- endif()
- ELSE(Boost_INCLUDE_DIR)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
- ENDIF(Boost_INCLUDE_DIR)
-
- # ------------------------------------------------------------------------
- # Suffix initialization and compiler suffix detection.
- # ------------------------------------------------------------------------
-
- # Setting some more suffixes for the library
- SET (Boost_LIB_PREFIX "")
- if ( MSVC AND Boost_USE_STATIC_LIBS )
- SET (Boost_LIB_PREFIX "lib")
- endif()
-
- if (Boost_COMPILER)
- set(_boost_COMPILER ${Boost_COMPILER})
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
- endif()
- else(Boost_COMPILER)
- # Attempt to guess the compiler suffix
- # NOTE: this is not perfect yet, if you experience any issues
- # please report them and use the Boost_COMPILER variable
- # to work around the problems.
- if (MSVC90)
- SET (_boost_COMPILER "-vc90")
- elseif (MSVC80)
- SET (_boost_COMPILER "-vc80")
- elseif (MSVC71)
- SET (_boost_COMPILER "-vc71")
- elseif (MSVC70) # Good luck!
- SET (_boost_COMPILER "-vc7") # yes, this is correct
- elseif (MSVC60) # Good luck!
- SET (_boost_COMPILER "-vc6") # yes, this is correct
- elseif (BORLAND)
- SET (_boost_COMPILER "-bcb")
- elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
- if(WIN32)
- set (_boost_COMPILER "-iw")
- else()
- set (_boost_COMPILER "-il")
- endif()
- elseif (MINGW)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
- endif()
- elseif (UNIX)
- if (CMAKE_COMPILER_IS_GNUCXX)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- # Determine which version of GCC we have.
- IF(APPLE)
- IF(Boost_MINOR_VERSION)
- IF(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost 1.36.0 and newer, the mangled compiler name used
- # on Mac OS X/Darwin is "xgcc".
- SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
- ELSE(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost <= 1.35.0, there is no mangled compiler name for
- # the Mac OS X/Darwin version of GCC.
- SET(_boost_COMPILER "")
- ENDIF(${Boost_MINOR_VERSION} GREATER 35)
- ELSE(Boost_MINOR_VERSION)
- # We don't know the Boost version, so assume it's
- # pre-1.36.0.
- SET(_boost_COMPILER "")
- ENDIF(Boost_MINOR_VERSION)
- ELSE()
- SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
- ENDIF()
- endif()
- endif (CMAKE_COMPILER_IS_GNUCXX)
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "guessed _boost_COMPILER = ${_boost_COMPILER}")
- endif()
- endif(Boost_COMPILER)
-
- SET (_boost_MULTITHREADED "-mt")
- if( NOT Boost_USE_MULTITHREADED )
- set (_boost_MULTITHREADED "")
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
- endif()
-
- SET( _boost_STATIC_TAG "")
- set( _boost_ABI_TAG "")
- IF (WIN32)
- IF(MSVC)
- SET (_boost_ABI_TAG "g")
- ENDIF(MSVC)
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_STATIC_TAG "-s")
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDIF(WIN32)
- SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_ABI_TAG = ${_boost_ABI_TAG}")
- endif()
-
- # ------------------------------------------------------------------------
- # Begin finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(_boost_LIBRARIES_SEARCH_DIRS
- C:/boost/lib
- C:/boost
- "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
- "$ENV{ProgramFiles}/boost"
- C:/library/boost/stage/lib
- "C:/Program Files/boost/stage/lib"
- "C:/Program Files (x86)/boost/stage/lib"
- C:/boost/lib
- /sw/local/lib
- )
- IF( BOOST_ROOT )
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_ROOT}/lib
- ${BOOST_ROOT}/stage/lib
- ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_ROOT )
-
- IF( BOOST_LIBRARYDIR )
- file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
- ENDIF( BOOST_LIBRARYDIR )
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
- endif()
-
- FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
- SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
-
- # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
- IF( Boost_USE_STATIC_LIBS )
- SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ELSE(WIN32)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF(WIN32)
- ENDIF( Boost_USE_STATIC_LIBS )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
- NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
- HINTS ${_boost_LIBRARIES_SEARCH_DIRS}
- )
-
- _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
- IF( Boost_USE_STATIC_LIBS )
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
- ENDIF( Boost_USE_STATIC_LIBS )
- ENDFOREACH(COMPONENT)
- # ------------------------------------------------------------------------
- # End finding boost libraries
- # ------------------------------------------------------------------------
-
- SET(Boost_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- )
-
- SET(Boost_FOUND FALSE)
- IF(Boost_INCLUDE_DIR)
- SET( Boost_FOUND TRUE )
-
- # Check the version of Boost against the requested version.
- if (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34")
- endif (Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
-
- if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
- # If the user requested an exact version of Boost, check
- # that. We already know that the Boost version we have is >= the
- # requested version.
- set(_Boost_VERSION_AGE "new")
-
- # If the user didn't specify a patchlevel, it's 0.
- if (NOT Boost_FIND_VERSION_PATCH)
- set(Boost_FIND_VERSION_PATCH 0)
- endif (NOT Boost_FIND_VERSION_PATCH)
-
- # We'll set Boost_FOUND true again if we have an exact version match.
- set(Boost_FOUND FALSE)
- if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND TRUE )
- endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
-
- if(NOT Boost_FOUND)
- # State that we found a version of Boost that is too new or too old.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- if (Boost_FIND_VERSION_PATCH)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
- endif (Boost_FIND_VERSION_PATCH)
- if (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
- endif (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
- endif (NOT Boost_FOUND)
-
- if (Boost_FOUND)
- set(_boost_CHECKED_COMPONENT FALSE)
- set(_Boost_MISSING_COMPONENTS)
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} COMPONENT)
- set(_boost_CHECKED_COMPONENT TRUE)
- if(NOT Boost_${COMPONENT}_FOUND)
- string(TOLOWER ${COMPONENT} COMPONENT)
- list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
- set( Boost_FOUND FALSE)
- endif(NOT Boost_${COMPONENT}_FOUND)
- endforeach(COMPONENT)
- endif (Boost_FOUND)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
- endif()
-
- if (_Boost_MISSING_COMPONENTS)
- # We were unable to find some libraries, so generate a sensible
- # error message that lists the libraries we were unable to find.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
- foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON} boost_${COMPONENT}\n")
- endforeach(COMPONENT)
-
- list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
- list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
- if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set Boost_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- endif (_Boost_MISSING_COMPONENTS)
-
- IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
- # Compatibility Code for backwards compatibility with CMake
- # 2.4's FindBoost module.
-
- # Look for the boost library path.
- # Note that the user may not have installed any libraries
- # so it is quite possible the Boost_LIBRARY_PATH may not exist.
- SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
-
- IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
-
- IF("${_boost_LIB_DIR}" MATCHES "/include$")
- # Strip off the trailing "/include" in the path.
- GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- ENDIF("${_boost_LIB_DIR}" MATCHES "/include$")
-
- IF(EXISTS "${_boost_LIB_DIR}/lib")
- SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/lib")
- IF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
- ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib")
- SET(_boost_LIB_DIR "")
- ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib")
- ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
-
- IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
- SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
- ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
-
- ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
-
- ELSE(Boost_INCLUDE_DIR)
- SET( Boost_FOUND FALSE)
- ENDIF(Boost_INCLUDE_DIR)
-
- IF (Boost_FOUND)
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- ENDIF(NOT Boost_FIND_QUIETLY)
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE(STATUS "Found the following Boost libraries:")
- ENDIF(NOT Boost_FIND_QUIETLY)
- FOREACH ( COMPONENT ${Boost_FIND_COMPONENTS} )
- STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT )
- IF ( Boost_${UPPERCOMPONENT}_FOUND )
- IF (NOT Boost_FIND_QUIETLY)
- MESSAGE (STATUS " ${COMPONENT}")
- ENDIF(NOT Boost_FIND_QUIETLY)
- SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
- ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
- ENDFOREACH(COMPONENT)
- ELSE (Boost_FOUND)
- IF (Boost_FIND_REQUIRED)
- message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
- ENDIF(Boost_FIND_REQUIRED)
- ENDIF(Boost_FOUND)
-
- # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
- MARK_AS_ADVANCED(Boost_INCLUDE_DIR
- Boost_INCLUDE_DIRS
- Boost_LIBRARY_DIRS
- )
-ENDIF(_boost_IN_CACHE)
-
+# - Try to find Boost include dirs and libraries
+# Usage of this module as follows:
+#
+# NOTE: Take note of the Boost_ADDITIONAL_VERSIONS variable below.
+# Due to Boost naming conventions and limitations in CMake this find
+# module is NOT future safe with respect to Boost version numbers,
+# and may break.
+#
+# == Using Header-Only libraries from within Boost: ==
+#
+# find_package( Boost 1.36.0 )
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# endif()
+#
+#
+# == Using actual libraries from within Boost: ==
+#
+# set(Boost_USE_STATIC_LIBS ON)
+# set(Boost_USE_MULTITHREADED ON)
+# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
+#
+# if(Boost_FOUND)
+# include_directories(${Boost_INCLUDE_DIRS})
+# add_executable(foo foo.cc)
+# target_link_libraries(foo ${Boost_LIBRARIES})
+# endif()
+#
+#
+# The components list needs to contain actual names of boost libraries only,
+# such as "date_time" for "libboost_date_time". If you're using parts of
+# Boost that contain header files only (e.g. foreach) you do not need to
+# specify COMPONENTS.
+#
+# You should provide a minimum version number that should be used. If you provide this
+# version number and specify the REQUIRED attribute, this module will fail if it
+# can't find the specified or a later version. If you specify a version number this is
+# automatically put into the considered list of version numbers and thus doesn't need
+# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
+#
+# NOTE for Visual Studio Users:
+# Automatic linking is used on MSVC & Borland compilers by default when
+# #including things in Boost. It's important to note that setting
+# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
+# should you need this feature. Automatic linking typically uses static
+# libraries with a few exceptions (Boost.Python is one).
+#
+# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
+# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
+# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
+# gets set to OFF. It is suggested you avoid automatic linking since it
+# will make your application less portable.
+#
+# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
+#
+# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
+# boost version numbers that should be taken into account when searching
+# for Boost. Unfortunately boost puts the version number into the
+# actual filename for the libraries, so this variable will certainly be needed
+# in the future when new Boost versions are released.
+#
+# Currently this module searches for the following version numbers:
+# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
+# 1.40, 1.40.0, 1.41, 1.41.0
+#
+# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
+# add both 1.x and 1.x.0 as shown above. Official Boost include directories
+# omit the 3rd version number from include paths if it is 0 although not all
+# binary Boost releases do so.
+#
+# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
+#
+# ===================================== ============= ========================
+#
+# Variables used by this module, they can change the default behaviour and
+# need to be set before calling find_package:
+#
+# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
+# boost libraries. If not specified, defaults
+# to ON.
+#
+# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
+# boost libraries. Defaults to OFF.
+#
+# Other Variables used by this module which you may want to set.
+#
+# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
+# the boost include directory. Please see
+# the documentation above regarding this
+# annoying, but necessary variable :(
+#
+# Boost_DEBUG Set this to TRUE to enable debugging output
+# of FindBoost.cmake if you are having problems.
+# Please enable this before filing any bug
+# reports.
+#
+# Boost_DETAILED_FAILURE_MSG FindBoost doesn't output detailed information
+# about why it failed or how to fix the problem
+# unless this is set to TRUE or the REQUIRED
+# keyword is specified in find_package().
+# [Since CMake 2.8.0]
+#
+# Boost_COMPILER Set this to the compiler suffix used by Boost
+# (e.g. "-gcc43") if FindBoost has problems finding
+# the proper Boost installation
+#
+# These last three variables are available also as environment variables:
+#
+# BOOST_ROOT or BOOSTROOT The preferred installation prefix for searching for
+# Boost. Set this if the module has problems finding
+# the proper Boost installation.
+#
+# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
+# module has problems finding the proper Boost installation
+#
+# Variables defined by this module:
+#
+# Boost_FOUND System has Boost, this means the include dir was
+# found, as well as all the libraries specified in
+# the COMPONENTS list.
+#
+# Boost_INCLUDE_DIRS Boost include directories: not cached
+#
+# Boost_INCLUDE_DIR This is almost the same as above, but this one is
+# cached and may be modified by advanced users
+#
+# Boost_LIBRARIES Link to these to use the Boost libraries that you
+# specified: not cached
+#
+# Boost_LIBRARY_DIRS The path to where the Boost library files are.
+#
+# Boost_VERSION The version number of the boost libraries that
+# have been found, same as in version.hpp from Boost
+#
+# Boost_LIB_VERSION The version number in filename form as
+# it's appended to the library filenames
+#
+# Boost_MAJOR_VERSION major version number of boost
+# Boost_MINOR_VERSION minor version number of boost
+# Boost_SUBMINOR_VERSION subminor version number of boost
+#
+# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
+# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
+# to have diagnostic information about Boost's
+# automatic linking outputted during compilation time.
+#
+# For each component you specify in find_package(), the following (UPPER-CASE)
+# variables are set. You can use these variables if you would like to pick and
+# choose components for your targets instead of just using Boost_LIBRARIES.
+#
+# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
+#
+# Boost_${COMPONENT}_LIBRARY Contains the libraries for the specified Boost
+# "component" (includes debug and optimized keywords
+# when needed).
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006-2008 Andreas Schneider <ma...@cy...>
+# Copyright 2007 Wengo
+# Copyright 2007 Mike Jackson
+# Copyright 2008 Andreas Pakulat <ap...@gm...>
+# Copyright 2008-2009 Philip Lowman <ph...@yh...>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+#-------------------------------------------------------------------------------
+# FindBoost functions & macros
+#
+############################################
+#
+# Check the existence of the libraries.
+#
+############################################
+# This macro was taken directly from the FindQt4.cmake file that is included
+# with the CMake distribution. This is NOT my work. All work was done by the
+# original authors of the FindQt4.cmake file. Only minor modifications were
+# made to remove references to Qt and make this file more generally applicable
+# And ELSE/ENDIF pairs were removed for readability.
+#########################################################################
+
+MACRO (_Boost_ADJUST_LIB_VARS basename)
+ IF (Boost_INCLUDE_DIR )
+ IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
+ # if the generator supports configuration types then set
+ # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
+ IF...
[truncated message content] |
|
From: <a-...@us...> - 2010-02-26 09:19:52
|
Revision: 178
http://simspark.svn.sourceforge.net/simspark/?rev=178&view=rev
Author: a-held
Date: 2010-02-26 09:19:45 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
Remove a tiny bit of ODE-specific code that I overlooked
Modified Paths:
--------------
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.h
trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
Removed Paths:
-------------
trunk/spark/lib/oxygen/physicsserver/odeobject.cpp
trunk/spark/lib/oxygen/physicsserver/odeobject.h
trunk/spark/lib/oxygen/physicsserver/odeobject_c.cpp
trunk/spark/lib/oxygen/physicsserver/odewrapper.h
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2010-02-26 09:19:45 UTC (rev 178)
@@ -89,8 +89,8 @@
physicsserver/int/universaljointint.h
physicsserver/int/worldint.h
- proxyserver/agentproxy.h
- proxyserver/proxyserver.h
+ #proxyserver/agentproxy.h
+ #proxyserver/proxyserver.h
sceneserver/sceneimporter.h
sceneserver/basenode.h
sceneserver/fpscontroller.h
@@ -279,10 +279,10 @@
monitorserver/custommonitor_c.cpp
monitorserver/monitorcmdparser.cpp
monitorserver/monitorcmdparser_c.cpp
- proxyserver/agentproxy.cpp
- proxyserver/agentproxy_c.cpp
- proxyserver/proxyserver.cpp
- proxyserver/proxyserver_c.cpp
+ #proxyserver/agentproxy.cpp
+ #proxyserver/agentproxy_c.cpp
+ #proxyserver/proxyserver.cpp
+ #proxyserver/proxyserver_c.cpp
)
if(SPADES_FOUND)
set(oxygen_LIB_SRCS
Modified: trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2010-02-26 09:19:45 UTC (rev 178)
@@ -247,6 +247,17 @@
by \param worldID
*/
virtual long CreateBody(long worldID) = 0;
+
+ /** Creates a new mass object with the information passed on to this
+ method via \param mass and \param cVector
+ */
+ virtual GenericMass& CreateMass(float mass, salt::Vector3f cVector) = 0;
+
+ /** Sets the value of the inertia tensor of this body. \param i is the
+ index of the \param value 's position in the inertia tensor.
+ (It's a 3x3 matrix)
+ */
+ virtual void SetInertiaTensorAt(int i, float value, GenericMass& mass) = 0;
};
} //namespace oxygen
Deleted: trunk/spark/lib/oxygen/physicsserver/odeobject.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/odeobject.cpp 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/odeobject.cpp 2010-02-26 09:19:45 UTC (rev 178)
@@ -1,167 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
- this file is part of rcssserver3D
- Fri May 9 2003
- Copyright (C) 2002,2003 Koblenz University
- Copyright (C) 2003 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.
-*/
-#include "odeobject.h"
-#include "space.h"
-#include "world.h"
-#include <oxygen/sceneserver/scene.h>
-#include <zeitgeist/logserver/logserver.h>
-
-using namespace oxygen;
-using namespace boost;
-
-ODEObject::ODEObject() : BaseNode()
-{
-}
-
-ODEObject::~ODEObject()
-{
-}
-
-void ODEObject::OnUnlink()
-{
- DestroyODEObject();
-}
-
-/** returns the world node */
-shared_ptr<World> ODEObject::GetWorld() const
-{
- shared_ptr<Scene> scene = GetScene();
- if (scene.get() == 0)
- {
- GetLog()->Error() << "(ODEObject) ERROR: found no Scene node\n";
- return shared_ptr<World>();
- }
-
- shared_ptr<World> worldNode = shared_dynamic_cast<World>
- (scene->GetChildOfClass("World"));
- if (worldNode.get() == 0)
- {
- GetLog()->Error() << "(ODEObject) ERROR: found no World node\n";
- }
-
- return worldNode;
-}
-
-shared_ptr<Space> ODEObject::GetSpace()
-{
- // try to find the nearest parent space object
- weak_ptr<Space> parentSpace = FindParentSupportingClass<Space>();
- if (! parentSpace.expired())
- {
- return parentSpace.lock();
- }
-
- // return the global space instance
- shared_ptr<Scene> scene = GetScene();
- if (scene.get() == 0)
- {
- GetLog()->Error() << "(ODEObject) ERROR: found no Scene node\n";
- return shared_ptr<Space>();
- }
-
- shared_ptr<Space> spaceNode = shared_dynamic_cast<Space>
- (scene->GetChildOfClass("Space"));
- if (spaceNode.get() == 0)
- {
- GetLog()->Error() << "(ODEObject) ERROR: found no Space node\n";
- }
-
- return spaceNode;
-}
-
-dWorldID ODEObject::GetWorldID()
-{
- shared_ptr<World> world = GetWorld();
- if (world.get() == 0)
- {
- return 0;
- }
-
- dWorldID worldId = world->GetODEWorld();
- if (worldId == 0)
- {
- GetLog()->Error()
- << "(ODEObject) ERROR: World returned empty ODE handle\n";
- }
-
- return worldId;
-}
-
-dSpaceID ODEObject::FindSpaceID()
-{
- shared_ptr<Space> space = GetSpace();
- if (space.get() == 0)
- {
- return 0;
- }
-
- dSpaceID spaceId = space->GetODESpace();
-
- if (spaceId == 0)
- {
- GetLog()->Error()
- << "(ODEObject) ERROR: Space returned empty ODE handle\n";
- }
-
- return spaceId;
-}
-
-dSpaceID ODEObject::GetParentSpaceID()
-{
- return 0;
-}
-
-void ODEObject::ConvertRotationMatrix(const salt::Matrix& rot, dMatrix3& matrix)
-{
- matrix[0] = rot.m[0];
- matrix[1] = rot.m[4];
- matrix[2] = rot.m[8];
- matrix[3] = 0;
- matrix[4] = rot.m[1];
- matrix[5] = rot.m[5];
- matrix[6] = rot.m[9];
- matrix[7] = 0;
- matrix[8] = rot.m[2];
- matrix[9] = rot.m[6];
- matrix[10] = rot.m[10];
- matrix[11] = 0;
-}
-
-void ODEObject::ConvertRotationMatrix(const dReal* matrix, salt::Matrix& rot) const
-{
- rot.m[0] = matrix[0] ;
- rot.m[4] = matrix[1] ;
- rot.m[8] = matrix[2];
- rot.m[12] = matrix[3];
- rot.m[1] = matrix[4];
- rot.m[5] = matrix[5];
- rot.m[9] = matrix[6];
- rot.m[13] = matrix[7];
- rot.m[2] = matrix[8];
- rot.m[6] = matrix[9];
- rot.m[10] = matrix[10] ;
- rot.m[14] = matrix[11];
- rot.m[3] = 0.0;
- rot.m[7] = 0.0;
- rot.m[11] = 0.0;
- rot.m[15] = 1.0;
-}
Deleted: trunk/spark/lib/oxygen/physicsserver/odeobject.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/odeobject.h 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/odeobject.h 2010-02-26 09:19:45 UTC (rev 178)
@@ -1,83 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
- this file is part of rcssserver3D
- Fri May 9 2003
- Copyright (C) 2002,2003 Koblenz University
- Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id$
- $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.
-*/
-#ifndef OXYGEN_ODEOBJECT_H
-#define OXYGEN_ODEOBJECT_H
-
-#include <oxygen/oxygen_defines.h>
-#include <oxygen/sceneserver/basenode.h>
-#include "odewrapper.h"
-
-namespace oxygen
-{
-class Space;
-class World;
-
-/** ODEObject is the base of all classes encapsulating ODE concepts
- */
-class OXYGEN_API ODEObject : public BaseNode
-{
-public:
- //
- // Functions
- //
- ODEObject();
- virtual ~ODEObject();
-
- /** This rountine is called, before the hierarchy object is
- removed from the parent. It can be overridden to support
- custom 'unlink' behavior.
- */
- virtual void OnUnlink();
-
- /** returns the ODE world handle */
- dWorldID GetWorldID();
-
- /** returns the nearest parent space ODE handle */
- dSpaceID FindSpaceID();
-
- /** returns the ODE handle ID of the containing parent space */
- virtual dSpaceID GetParentSpaceID();
-
- /** destroy the managed ODE object */
- virtual void DestroyODEObject() = 0;
-
- /** returns the world node */
- boost::shared_ptr<World> GetWorld() const;
-
-protected:
- /** finds the nearest parent space node */
- boost::shared_ptr<Space> GetSpace();
-
- /** converts the rotation part of a salt::Matrix to an ODE
- dMatrix3 */
- void ConvertRotationMatrix(const salt::Matrix& rot, dMatrix3& matrix);
-
- /** coverts the ODE dMatrix3 to the rotation part of a salt::Matrix */
- void ConvertRotationMatrix(const dReal* matrix, salt::Matrix& rot) const;
-};
-
-DECLARE_ABSTRACTCLASS(ODEObject);
-
-} //namespace oxygen
-
-#endif //OXYGEN_ODEOBJECT_H
Deleted: trunk/spark/lib/oxygen/physicsserver/odeobject_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/odeobject_c.cpp 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/odeobject_c.cpp 2010-02-26 09:19:45 UTC (rev 178)
@@ -1,29 +0,0 @@
-/* -*- mode: c++ -*-
-
- this file is part of rcssserver3D
- Fri May 9 2003
- Copyright (C) 2003 Koblenz University
- $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.
-*/
-
-#include "odeobject.h"
-
-using namespace oxygen;
-
-void CLASS(ODEObject)::DefineClass()
-{
- DEFINE_BASECLASS(oxygen/BaseNode);
-}
Deleted: trunk/spark/lib/oxygen/physicsserver/odewrapper.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/odewrapper.h 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/odewrapper.h 2010-02-26 09:19:45 UTC (rev 178)
@@ -1,80 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
- this file is part of rcssserver3D
- Fri May 9 2003
- Copyright (C) 2002,2003 Koblenz University
- Copyright (C) 2003 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.
-*/
-#ifndef OXYGEN_ODEWRAPPER_H
-#define OXYGEN_ODEWRAPPER_H
-
-#undef EXTERN
-#undef HAVE_VPRINTF
-#undef PACKAGE
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PREFIX
-#undef VERSION
-
-#ifdef WIN32
-
-#ifdef copysignf
-#undef copysignf
-#endif
-
-#ifdef copysign
-#undef copysign
-#endif
-
-#endif // WIN32
-
-#ifdef __APPLE__
-
-// there is a conflicting type in a system header (Leopard)
-// so we define a dummy here
-#define uint32 dummy
-
-#endif
-
-#include <ode/ode.h>
-
-#ifdef __APPLE__
-
-// undefine the dummy
-#undef uint32
-
-#endif
-
-#undef EXTERN
-#undef HAVE_VPRINTF
-#undef PACKAGE
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PREFIX
-#undef VERSION
-
-#ifdef HAVE_CONFIG_H
-#include <sparkconfig.h>
-#endif
-
-#endif // OXYGEN_ODEWRAPPER
Modified: trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-26 09:19:45 UTC (rev 178)
@@ -389,3 +389,13 @@
{
mRigidBodyImp->TranslateMass(v, mBodyID);
}
+
+GenericMass& RigidBody::CreateMass(float mass, salt::Vector3f cVector)
+{
+ mRigidBodyImp->CreateMass(mass, cVector);
+}
+
+void RigidBody::SetInertiaTensorAt(int i, float value, GenericMass& mass)
+{
+ mRigidBodyImp->SetInertiaTensorAt(i, value, mass);
+}
Modified: trunk/spark/lib/oxygen/physicsserver/rigidbody.h
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/rigidbody.h 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/rigidbody.h 2010-02-26 09:19:45 UTC (rev 178)
@@ -239,6 +239,17 @@
orientation
*/
void SynchronizeParent() const;
+
+ /** Creates a new mass object with the information passed on to this
+ method via \param mass and \param cVector
+ */
+ GenericMass& CreateMass(float mass, salt::Vector3f cVector);
+
+ /** Sets the value of the inertia tensor of this body. \param i is the
+ index of the \param value 's position in the inertia tensor.
+ (It's a 3x3 matrix)
+ */
+ void SetInertiaTensorAt(int i, float value, GenericMass& mass);
protected:
/** creates the managed body and moves it to the position of
Modified: trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
===================================================================
--- trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp 2010-02-26 09:19:45 UTC (rev 178)
@@ -20,8 +20,6 @@
*/
#include <oxygen/physicsserver/rigidbody.h>
-//TODO: Do not include odewrapper in this file!
-#include <../plugin/odeimps/odewrapper.h>
using namespace boost;
using namespace oxygen;
@@ -88,22 +86,33 @@
return false;
}
- dMass mass;
- mass.mass = inMass;
- mass.c[0] = inCenter[0];
- mass.c[1] = inCenter[1];
- mass.c[2] = inCenter[2];
-
+ GenericMass& mass = obj->CreateMass(inMass, inCenter);
+ //mass.mass = inMass;
+ //mass.c[0] = inCenter[0];
+ //mass.c[1] = inCenter[1];
+ //mass.c[2] = inCenter[2];
+
+ float currentValue;
+
+ //try to emulate the loop commented out below without understanding it
for (int i=0;i<9;++i)
{
- if (! in.AdvanceValue(iter,mass.I[i]))
+ if (in.AdvanceValue(iter,currentValue))
{
- return false;
+ obj->SetInertiaTensorAt(i, currentValue, mass);
}
- }
+ else return false;
+ }
+
+ //for (int i=0;i<9;++i)
+ // {
+ // if (! in.AdvanceValue(iter,mass.I[i]))
+ // {
+ // return false;
+ // }
+ // }
- GenericMass& massRef = (GenericMass&) mass;
- obj->SetMassParameters(massRef);
+ obj->SetMassParameters(mass);
return true;
}
Modified: trunk/spark/plugin/odeimps/oderigidbody.cpp
===================================================================
--- trunk/spark/plugin/odeimps/oderigidbody.cpp 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/plugin/odeimps/oderigidbody.cpp 2010-02-26 09:19:45 UTC (rev 178)
@@ -455,3 +455,21 @@
dBodyGetMass(ODEBody, &m);
dMassTranslate(&m,v[0],v[1],v[2]);
}
+
+GenericMass& RigidBodyImp::CreateMass(float mass, salt::Vector3f cVector)
+{
+ dMass ODEMass;
+ ODEMass.mass = mass;
+ ODEMass.c[0] = cVector[0];
+ ODEMass.c[1] = cVector[1];
+ ODEMass.c[2] = cVector[2];
+
+ GenericMass& massRef = (GenericMass&) ODEMass;
+ return massRef;
+}
+
+void RigidBodyImp::SetInertiaTensorAt(int i, float value, GenericMass& mass)
+{
+ dMass& ODEMass = (dMass&) mass;
+ ODEMass.I[i] = value;
+}
Modified: trunk/spark/plugin/odeimps/oderigidbody.h
===================================================================
--- trunk/spark/plugin/odeimps/oderigidbody.h 2010-02-25 12:27:30 UTC (rev 177)
+++ trunk/spark/plugin/odeimps/oderigidbody.h 2010-02-26 09:19:45 UTC (rev 178)
@@ -90,6 +90,8 @@
void BodySetData(oxygen::RigidBody* rb, long bodyID);
oxygen::RigidBody* BodyGetData(long bodyID);
long CreateBody(long worldID);
+ oxygen::GenericMass& CreateMass(float mass, salt::Vector3f cVector);
+ void SetInertiaTensorAt(int i, float value, oxygen::GenericMass& mass);
protected:
//These methods are only called internally and are not declared in the interface.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-25 13:10:00
|
Revision: 176
http://simspark.svn.sourceforge.net/simspark/?rev=176&view=rev
Author: a-held
Date: 2010-02-25 12:19:37 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
merge branch into trunk after a long day of hard work...
Modified Paths:
--------------
trunk/rcssserver3d/data/rsg/agent/ball.rsg
trunk/rcssserver3d/data/rsg/agent/hoap2.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
trunk/rcssserver3d/doc/users/robots.tex
trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
trunk/rcssserver3d/plugin/soccer/ball/ball.h
trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.h
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp
trunk/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.h
trunk/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
trunk/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h
trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h
trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
trunk/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h
trunk/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.h
trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
trunk/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.h
trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinput.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinput.h
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
trunk/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/rcssserver3d/main.cpp
trunk/rcssserver3d/rcssserver3d/rcsoccersim3d.in
trunk/rsgedit/src/property.cpp
trunk/rsgedit/src/sparkglrender.cpp
trunk/simspark-utilities/data/rsg/agent/ball.rsg
trunk/spark/RELEASE
trunk/spark/data/ros/aibo.rsi
trunk/spark/data/ros/blockworld.ros
trunk/spark/data/rsg/boxspheres/box.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler055.rsg
trunk/spark/data/rsg/boxspheres/box_with_handler056.rsg
trunk/spark/data/rsg/boxspheres/simspark.rsg
trunk/spark/data/rsg/boxspheres/sphere.rsg
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/kerosin/kerosin.cpp
trunk/spark/lib/kerosin/kerosin.h
trunk/spark/lib/kerosin/renderserver/renderserver.cpp
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.cpp
trunk/spark/lib/oxygen/geometryserver/stdmeshimporter.h
trunk/spark/lib/oxygen/oxygen.cpp
trunk/spark/lib/oxygen/oxygen.h
trunk/spark/lib/oxygen/physicsserver/angularmotor.cpp
trunk/spark/lib/oxygen/physicsserver/angularmotor.h
trunk/spark/lib/oxygen/physicsserver/angularmotor_c.cpp
trunk/spark/lib/oxygen/physicsserver/balljoint.cpp
trunk/spark/lib/oxygen/physicsserver/balljoint.h
trunk/spark/lib/oxygen/physicsserver/balljoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/body.cpp
trunk/spark/lib/oxygen/physicsserver/body.h
trunk/spark/lib/oxygen/physicsserver/body_c.cpp
trunk/spark/lib/oxygen/physicsserver/bodycontroller.cpp
trunk/spark/lib/oxygen/physicsserver/bodycontroller.h
trunk/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/boxcollider.cpp
trunk/spark/lib/oxygen/physicsserver/boxcollider.h
trunk/spark/lib/oxygen/physicsserver/boxcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/collider.cpp
trunk/spark/lib/oxygen/physicsserver/collider.h
trunk/spark/lib/oxygen/physicsserver/collider_c.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.cpp
trunk/spark/lib/oxygen/physicsserver/collisionhandler.h
trunk/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
trunk/spark/lib/oxygen/physicsserver/contactjointhandler.h
trunk/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/dragcontroller.cpp
trunk/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/fixedjoint.cpp
trunk/spark/lib/oxygen/physicsserver/fixedjoint.h
trunk/spark/lib/oxygen/physicsserver/fixedjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/hinge2joint.cpp
trunk/spark/lib/oxygen/physicsserver/hinge2joint.h
trunk/spark/lib/oxygen/physicsserver/hinge2joint_c.cpp
trunk/spark/lib/oxygen/physicsserver/hingejoint.cpp
trunk/spark/lib/oxygen/physicsserver/hingejoint.h
trunk/spark/lib/oxygen/physicsserver/hingejoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/joint.cpp
trunk/spark/lib/oxygen/physicsserver/joint.h
trunk/spark/lib/oxygen/physicsserver/joint_c.cpp
trunk/spark/lib/oxygen/physicsserver/physicsserver.cpp
trunk/spark/lib/oxygen/physicsserver/physicsserver.h
trunk/spark/lib/oxygen/physicsserver/physicsserver_c.cpp
trunk/spark/lib/oxygen/physicsserver/planecollider.cpp
trunk/spark/lib/oxygen/physicsserver/planecollider.h
trunk/spark/lib/oxygen/physicsserver/planecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/raycollider.cpp
trunk/spark/lib/oxygen/physicsserver/raycollider.h
trunk/spark/lib/oxygen/physicsserver/raycollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/recorderhandler.cpp
trunk/spark/lib/oxygen/physicsserver/recorderhandler.h
trunk/spark/lib/oxygen/physicsserver/recorderhandler_c.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.cpp
trunk/spark/lib/oxygen/physicsserver/sliderjoint.h
trunk/spark/lib/oxygen/physicsserver/sliderjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/space.cpp
trunk/spark/lib/oxygen/physicsserver/space.h
trunk/spark/lib/oxygen/physicsserver/space_c.cpp
trunk/spark/lib/oxygen/physicsserver/spherecollider.cpp
trunk/spark/lib/oxygen/physicsserver/spherecollider.h
trunk/spark/lib/oxygen/physicsserver/spherecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/transformcollider.cpp
trunk/spark/lib/oxygen/physicsserver/transformcollider.h
trunk/spark/lib/oxygen/physicsserver/transformcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/universaljoint.cpp
trunk/spark/lib/oxygen/physicsserver/universaljoint.h
trunk/spark/lib/oxygen/physicsserver/universaljoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/velocitycontroller.cpp
trunk/spark/lib/oxygen/physicsserver/velocitycontroller_c.cpp
trunk/spark/lib/oxygen/physicsserver/world.cpp
trunk/spark/lib/oxygen/physicsserver/world.h
trunk/spark/lib/oxygen/physicsserver/world_c.cpp
trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp
trunk/spark/lib/oxygen/sceneserver/fpscontroller.cpp
trunk/spark/lib/oxygen/sceneserver/sceneserver.cpp
trunk/spark/lib/oxygen/sceneserver/sceneserver.h
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/accelerometer/CMakeLists.txt
trunk/spark/plugin/accelerometer/accelerometer.cpp
trunk/spark/plugin/accelerometer/accelerometer.h
trunk/spark/plugin/collisionperceptor/forceresistanceperceptor.cpp
trunk/spark/plugin/collisionperceptor/forceresistanceperceptor.h
trunk/spark/plugin/collisionperceptor/perceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/perceptorhandler.h
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.cpp
trunk/spark/plugin/collisionperceptor/touchperceptorhandler.h
trunk/spark/plugin/forceeffector/forceeffector.cpp
trunk/spark/plugin/forceeffector/forceeffector.h
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.cpp
trunk/spark/plugin/gyrorateperceptor/gyrorateperceptor.h
trunk/spark/plugin/rosimporter/roselements.cpp
trunk/spark/plugin/rosimporter/roselements.h
trunk/spark/plugin/rosimporter/rosimporter.cpp
trunk/spark/plugin/rosimporter/rosimporter.h
trunk/spark/plugin/sparkagent/hinge2effector.cpp
trunk/spark/plugin/sparkagent/hingeeffector.cpp
trunk/spark/plugin/sparkagent/universaljointeffector.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorclient.cpp
trunk/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
trunk/spark/spark/spark.rb
trunk/spark/test/scenetest/script/scenetest.rb
Added Paths:
-----------
trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg
trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
trunk/spark/data/rsg/boxspheres/capsule.rsg
trunk/spark/data/rsg/boxspheres/staticcapsule.rsg
trunk/spark/lib/kerosin/sceneserver/capsule.cpp
trunk/spark/lib/kerosin/sceneserver/capsule.h
trunk/spark/lib/kerosin/sceneserver/capsule_c.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.cpp
trunk/spark/lib/oxygen/physicsserver/capsulecollider.h
trunk/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.cpp
trunk/spark/lib/oxygen/physicsserver/compoundcollider.h
trunk/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.cpp
trunk/spark/lib/oxygen/physicsserver/concavecollider.h
trunk/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.cpp
trunk/spark/lib/oxygen/physicsserver/conecollider.h
trunk/spark/lib/oxygen/physicsserver/conecollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
trunk/spark/lib/oxygen/physicsserver/conetwistjoint.h
trunk/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.cpp
trunk/spark/lib/oxygen/physicsserver/convexcollider.h
trunk/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.cpp
trunk/spark/lib/oxygen/physicsserver/cylindercollider.h
trunk/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.cpp
trunk/spark/lib/oxygen/physicsserver/dynamicbody.h
trunk/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.cpp
trunk/spark/lib/oxygen/physicsserver/emptycollider.h
trunk/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint.h
trunk/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
trunk/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
trunk/spark/lib/oxygen/physicsserver/int/
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
trunk/spark/lib/oxygen/physicsserver/physicsobject.cpp
trunk/spark/lib/oxygen/physicsserver/physicsobject.h
trunk/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.cpp
trunk/spark/lib/oxygen/physicsserver/rigidbody.h
trunk/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.cpp
trunk/spark/lib/oxygen/physicsserver/softbody.h
trunk/spark/lib/oxygen/physicsserver/softbody_c.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.cpp
trunk/spark/lib/oxygen/physicsserver/staticbody.h
trunk/spark/lib/oxygen/physicsserver/staticbody_c.cpp
trunk/spark/plugin/odeimps/
trunk/spark/plugin/odeimps/CMakeLists.txt
trunk/spark/plugin/odeimps/export.cpp
trunk/spark/plugin/odeimps/odeangularmotor.cpp
trunk/spark/plugin/odeimps/odeangularmotor.h
trunk/spark/plugin/odeimps/odeangularmotor_c.cpp
trunk/spark/plugin/odeimps/odeballjoint.cpp
trunk/spark/plugin/odeimps/odeballjoint.h
trunk/spark/plugin/odeimps/odeballjoint_c.cpp
trunk/spark/plugin/odeimps/odebody.cpp
trunk/spark/plugin/odeimps/odebody.h
trunk/spark/plugin/odeimps/odebody_c.cpp
trunk/spark/plugin/odeimps/odeboxcollider.cpp
trunk/spark/plugin/odeimps/odeboxcollider.h
trunk/spark/plugin/odeimps/odeboxcollider_c.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.h
trunk/spark/plugin/odeimps/odecapsulecollider_c.cpp
trunk/spark/plugin/odeimps/odecollider.cpp
trunk/spark/plugin/odeimps/odecollider.h
trunk/spark/plugin/odeimps/odecollider_c.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.h
trunk/spark/plugin/odeimps/odecompoundcollider_c.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.h
trunk/spark/plugin/odeimps/odeconcavecollider_c.cpp
trunk/spark/plugin/odeimps/odeconecollider.cpp
trunk/spark/plugin/odeimps/odeconecollider.h
trunk/spark/plugin/odeimps/odeconecollider_c.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.h
trunk/spark/plugin/odeimps/odeconetwistjoint_c.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.h
trunk/spark/plugin/odeimps/odecontactjointhandler_c.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.h
trunk/spark/plugin/odeimps/odeconvexcollider_c.cpp
trunk/spark/plugin/odeimps/odecylindercollider.cpp
trunk/spark/plugin/odeimps/odecylindercollider.h
trunk/spark/plugin/odeimps/odecylindercollider_c.cpp
trunk/spark/plugin/odeimps/odedynamicbody.cpp
trunk/spark/plugin/odeimps/odedynamicbody.h
trunk/spark/plugin/odeimps/odedynamicbody_c.cpp
trunk/spark/plugin/odeimps/odeemptycollider.cpp
trunk/spark/plugin/odeimps/odeemptycollider.h
trunk/spark/plugin/odeimps/odeemptycollider_c.cpp
trunk/spark/plugin/odeimps/odefixedjoint.cpp
trunk/spark/plugin/odeimps/odefixedjoint.h
trunk/spark/plugin/odeimps/odefixedjoint_c.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.h
trunk/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
trunk/spark/plugin/odeimps/odehinge2joint.cpp
trunk/spark/plugin/odeimps/odehinge2joint.h
trunk/spark/plugin/odeimps/odehinge2joint_c.cpp
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odehingejoint_c.cpp
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
trunk/spark/plugin/odeimps/odejoint_c.cpp
trunk/spark/plugin/odeimps/odephysicsobject.cpp
trunk/spark/plugin/odeimps/odephysicsobject.h
trunk/spark/plugin/odeimps/odephysicsobject_c.cpp
trunk/spark/plugin/odeimps/odephysicsserver.cpp
trunk/spark/plugin/odeimps/odephysicsserver.h
trunk/spark/plugin/odeimps/odephysicsserver_c.cpp
trunk/spark/plugin/odeimps/odeplanecollider.cpp
trunk/spark/plugin/odeimps/odeplanecollider.h
trunk/spark/plugin/odeimps/odeplanecollider_c.cpp
trunk/spark/plugin/odeimps/oderaycollider.cpp
trunk/spark/plugin/odeimps/oderaycollider.h
trunk/spark/plugin/odeimps/oderaycollider_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
trunk/spark/plugin/odeimps/oderigidbody_c.cpp
trunk/spark/plugin/odeimps/odesliderjoint.cpp
trunk/spark/plugin/odeimps/odesliderjoint.h
trunk/spark/plugin/odeimps/odesliderjoint_c.cpp
trunk/spark/plugin/odeimps/odesoftbody.cpp
trunk/spark/plugin/odeimps/odesoftbody.h
trunk/spark/plugin/odeimps/odesoftbody_c.cpp
trunk/spark/plugin/odeimps/odespace.cpp
trunk/spark/plugin/odeimps/odespace.h
trunk/spark/plugin/odeimps/odespace_c.cpp
trunk/spark/plugin/odeimps/odespherecollider.cpp
trunk/spark/plugin/odeimps/odespherecollider.h
trunk/spark/plugin/odeimps/odespherecollider_c.cpp
trunk/spark/plugin/odeimps/odestaticbody.cpp
trunk/spark/plugin/odeimps/odestaticbody.h
trunk/spark/plugin/odeimps/odestaticbody_c.cpp
trunk/spark/plugin/odeimps/odetransformcollider.cpp
trunk/spark/plugin/odeimps/odetransformcollider.h
trunk/spark/plugin/odeimps/odetransformcollider_c.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.h
trunk/spark/plugin/odeimps/odeuniversaljoint_c.cpp
trunk/spark/plugin/odeimps/odeworld.cpp
trunk/spark/plugin/odeimps/odeworld.h
trunk/spark/plugin/odeimps/odeworld_c.cpp
trunk/spark/plugin/odeimps/odewrapper.h
Removed Paths:
-------------
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
trunk/spark/data/rsg/boxspheres/ccylinder.rsg
trunk/spark/data/rsg/boxspheres/staticccylinder.rsg
trunk/spark/lib/kerosin/sceneserver/ccylinder.cpp
trunk/spark/lib/kerosin/sceneserver/ccylinder.h
trunk/spark/lib/kerosin/sceneserver/ccylinder_c.cpp
trunk/spark/lib/oxygen/physicsserver/int/angularmotorint.h
trunk/spark/lib/oxygen/physicsserver/int/balljointint.h
trunk/spark/lib/oxygen/physicsserver/int/bodyint.h
trunk/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/colliderint.h
trunk/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
trunk/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
trunk/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/fixedjointint.h
trunk/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
trunk/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
trunk/spark/lib/oxygen/physicsserver/int/hingejointint.h
trunk/spark/lib/oxygen/physicsserver/int/jointint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
trunk/spark/lib/oxygen/physicsserver/int/physicsserverint.h
trunk/spark/lib/oxygen/physicsserver/int/planecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/raycolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/sliderjointint.h
trunk/spark/lib/oxygen/physicsserver/int/softbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/spaceint.h
trunk/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/staticbodyint.h
trunk/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
trunk/spark/lib/oxygen/physicsserver/int/universaljointint.h
trunk/spark/lib/oxygen/physicsserver/int/worldint.h
trunk/spark/plugin/odeimps/CMakeLists.txt
trunk/spark/plugin/odeimps/export.cpp
trunk/spark/plugin/odeimps/odeangularmotor.cpp
trunk/spark/plugin/odeimps/odeangularmotor.h
trunk/spark/plugin/odeimps/odeangularmotor_c.cpp
trunk/spark/plugin/odeimps/odeballjoint.cpp
trunk/spark/plugin/odeimps/odeballjoint.h
trunk/spark/plugin/odeimps/odeballjoint_c.cpp
trunk/spark/plugin/odeimps/odebody.cpp
trunk/spark/plugin/odeimps/odebody.h
trunk/spark/plugin/odeimps/odebody_c.cpp
trunk/spark/plugin/odeimps/odeboxcollider.cpp
trunk/spark/plugin/odeimps/odeboxcollider.h
trunk/spark/plugin/odeimps/odeboxcollider_c.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.cpp
trunk/spark/plugin/odeimps/odecapsulecollider.h
trunk/spark/plugin/odeimps/odecapsulecollider_c.cpp
trunk/spark/plugin/odeimps/odecollider.cpp
trunk/spark/plugin/odeimps/odecollider.h
trunk/spark/plugin/odeimps/odecollider_c.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.cpp
trunk/spark/plugin/odeimps/odecompoundcollider.h
trunk/spark/plugin/odeimps/odecompoundcollider_c.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.cpp
trunk/spark/plugin/odeimps/odeconcavecollider.h
trunk/spark/plugin/odeimps/odeconcavecollider_c.cpp
trunk/spark/plugin/odeimps/odeconecollider.cpp
trunk/spark/plugin/odeimps/odeconecollider.h
trunk/spark/plugin/odeimps/odeconecollider_c.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.cpp
trunk/spark/plugin/odeimps/odeconetwistjoint.h
trunk/spark/plugin/odeimps/odeconetwistjoint_c.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.cpp
trunk/spark/plugin/odeimps/odecontactjointhandler.h
trunk/spark/plugin/odeimps/odecontactjointhandler_c.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.cpp
trunk/spark/plugin/odeimps/odeconvexcollider.h
trunk/spark/plugin/odeimps/odeconvexcollider_c.cpp
trunk/spark/plugin/odeimps/odecylindercollider.cpp
trunk/spark/plugin/odeimps/odecylindercollider.h
trunk/spark/plugin/odeimps/odecylindercollider_c.cpp
trunk/spark/plugin/odeimps/odedynamicbody.cpp
trunk/spark/plugin/odeimps/odedynamicbody.h
trunk/spark/plugin/odeimps/odedynamicbody_c.cpp
trunk/spark/plugin/odeimps/odeemptycollider.cpp
trunk/spark/plugin/odeimps/odeemptycollider.h
trunk/spark/plugin/odeimps/odeemptycollider_c.cpp
trunk/spark/plugin/odeimps/odefixedjoint.cpp
trunk/spark/plugin/odeimps/odefixedjoint.h
trunk/spark/plugin/odeimps/odefixedjoint_c.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.cpp
trunk/spark/plugin/odeimps/odegeneric6dofjoint.h
trunk/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
trunk/spark/plugin/odeimps/odehinge2joint.cpp
trunk/spark/plugin/odeimps/odehinge2joint.h
trunk/spark/plugin/odeimps/odehinge2joint_c.cpp
trunk/spark/plugin/odeimps/odehingejoint.cpp
trunk/spark/plugin/odeimps/odehingejoint.h
trunk/spark/plugin/odeimps/odehingejoint_c.cpp
trunk/spark/plugin/odeimps/odejoint.cpp
trunk/spark/plugin/odeimps/odejoint.h
trunk/spark/plugin/odeimps/odejoint_c.cpp
trunk/spark/plugin/odeimps/odephysicsobject.cpp
trunk/spark/plugin/odeimps/odephysicsobject.h
trunk/spark/plugin/odeimps/odephysicsobject_c.cpp
trunk/spark/plugin/odeimps/odephysicsserver.cpp
trunk/spark/plugin/odeimps/odephysicsserver.h
trunk/spark/plugin/odeimps/odephysicsserver_c.cpp
trunk/spark/plugin/odeimps/odeplanecollider.cpp
trunk/spark/plugin/odeimps/odeplanecollider.h
trunk/spark/plugin/odeimps/odeplanecollider_c.cpp
trunk/spark/plugin/odeimps/oderaycollider.cpp
trunk/spark/plugin/odeimps/oderaycollider.h
trunk/spark/plugin/odeimps/oderaycollider_c.cpp
trunk/spark/plugin/odeimps/oderigidbody.cpp
trunk/spark/plugin/odeimps/oderigidbody.h
trunk/spark/plugin/odeimps/oderigidbody_c.cpp
trunk/spark/plugin/odeimps/odesliderjoint.cpp
trunk/spark/plugin/odeimps/odesliderjoint.h
trunk/spark/plugin/odeimps/odesliderjoint_c.cpp
trunk/spark/plugin/odeimps/odesoftbody.cpp
trunk/spark/plugin/odeimps/odesoftbody.h
trunk/spark/plugin/odeimps/odesoftbody_c.cpp
trunk/spark/plugin/odeimps/odespace.cpp
trunk/spark/plugin/odeimps/odespace.h
trunk/spark/plugin/odeimps/odespace_c.cpp
trunk/spark/plugin/odeimps/odespherecollider.cpp
trunk/spark/plugin/odeimps/odespherecollider.h
trunk/spark/plugin/odeimps/odespherecollider_c.cpp
trunk/spark/plugin/odeimps/odestaticbody.cpp
trunk/spark/plugin/odeimps/odestaticbody.h
trunk/spark/plugin/odeimps/odestaticbody_c.cpp
trunk/spark/plugin/odeimps/odetransformcollider.cpp
trunk/spark/plugin/odeimps/odetransformcollider.h
trunk/spark/plugin/odeimps/odetransformcollider_c.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.cpp
trunk/spark/plugin/odeimps/odeuniversaljoint.h
trunk/spark/plugin/odeimps/odeuniversaljoint_c.cpp
trunk/spark/plugin/odeimps/odeworld.cpp
trunk/spark/plugin/odeimps/odeworld.h
trunk/spark/plugin/odeimps/odeworld_c.cpp
trunk/spark/plugin/odeimps/odewrapper.h
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/treehole:175
Modified: trunk/rcssserver3d/data/rsg/agent/ball.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -15,7 +15,7 @@
(setScale $Radius $Radius $Radius)
)
- (nd Body
+ (nd RigidBody
(setName physics)
(setSphereTotal $Mass $Radius)
Modified: trunk/rcssserver3d/data/rsg/agent/hoap2.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -142,7 +142,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -151,7 +151,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -373,7 +373,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -410,7 +410,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
@@ -16,4 +16,4 @@
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
-)
\ No newline at end of file
+)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,11 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $material)
+
+ (nd Capsule
+ (setParams $radius $length)
+ (setMaterial $material)
+ )
+)
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,19 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius $length)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+
+ (nd CapsuleCollider
+ (setParams $radius $length)
+
+ (importScene rsg/agent/nao/contactjointhandler.rsg)
+ )
+ )
Copied: trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,13 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+)
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,11 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $material)
-
- (nd CCylinder
- (setParams $radius $length)
- (setMaterial $material)
- )
-)
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,19 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius $length)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-
- (nd CCylinderCollider
- (setParams $radius $length)
-
- (importScene rsg/agent/nao/contactjointhandler.rsg)
- )
- )
Deleted: trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,13 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -43,12 +43,12 @@
(setName neck)
(setLocalPos $Neck_X $Neck_Y $Neck_Z)
- (importScene rsg/agent/nao/ccylinder_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
- (importScene rsg/agent/nao/ccylinder_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
+ (importScene rsg/agent/nao/capsule_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
+ (importScene rsg/agent/nao/capsule_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
(importScene rsg/agent/nao/hingejoint.rsg
hj1 he1
- ../ccylinderBody ../../body/boxBody
+ ../capsuleBody ../../body/boxBody
0 0 0
0 0 1
$he1_min $he1_max)
@@ -80,7 +80,7 @@
(importScene rsg/agent/nao/hingejoint.rsg
hj2 he2
- ../sphereBody ../../neck/ccylinderBody
+ ../sphereBody ../../neck/capsuleBody
;../boxBody ../../body/boxBody
0 0 -0.005
1 0 0
Modified: trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -168,7 +168,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -178,7 +178,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -336,7 +336,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -374,7 +374,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -204,7 +204,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -214,7 +214,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -409,7 +409,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -455,7 +455,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -771,7 +771,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -812,7 +812,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -8,17 +8,17 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
- (nd DragController
- (setAngularDrag 0.01)
- (setLinearDrag 0.01)
- )
+ (nd DragController
+ (setAngularDrag 0.01)
+ (setLinearDrag 0.01)
+ )
)
(nd BoxCollider
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
- )
\ No newline at end of file
+ )
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -8,7 +8,7 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
(nd DragController
@@ -21,4 +21,4 @@
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/touchperceptorhandler.rsg)
)
- )
\ No newline at end of file
+ )
Copied: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg (from rev 175, branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg)
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg (rev 0)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -0,0 +1,37 @@
+;; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $name $perceptorName $effectorName $attach
+ $x $y $z
+ $lenX $lenY $lenZ
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ $minDeg $maxDeg
+ $totalMass $material $ElbowRadius $ElbowLen)
+
+ (nd Transform
+ (setName $name)
+ (setLocalPos $x $y $z)
+ (importScene rsg/agent/soccerbot058/box.rsg
+ $lenX $lenY $lenZ
+ $totalMass $material)
+
+ ;; install hinge joint
+ (importScene rsg/agent/nao/hingejoint.rsg
+ $perceptorName $effectorName
+ ../boxBody $attach
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ
+ $minDeg $maxDeg)
+
+ ;; static cylinder for the elbow
+ (nd Transform
+ (setLocalPos $anchorX $anchorY $anchorZ)
+ (setLocalRotation 0 90 0)
+ (nd Capsule
+ (setMaterial matGrey)
+ (setParams $ElbowRadius $ElbowLen)
+ )
+ )
+ )
+ )
Deleted: trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -1,37 +0,0 @@
-;; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $name $perceptorName $effectorName $attach
- $x $y $z
- $lenX $lenY $lenZ
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ $minDeg $maxDeg
- $totalMass $material $ElbowRadius $ElbowLen)
-
- (nd Transform
- (setName $name)
- (setLocalPos $x $y $z)
- (importScene rsg/agent/soccerbot058/box.rsg
- $lenX $lenY $lenZ
- $totalMass $material)
-
- ;; install hinge joint
- (importScene rsg/agent/nao/hingejoint.rsg
- $perceptorName $effectorName
- ../boxBody $attach
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ
- $minDeg $maxDeg)
-
- ;; static cylinder for the elbow
- (nd Transform
- (setLocalPos $anchorX $anchorY $anchorZ)
- (setLocalRotation 0 90 0)
- (nd CCylinder
- (setMaterial matGrey)
- (setParams $ElbowRadius $ElbowLen)
- )
- )
- )
- )
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -9,7 +9,7 @@
(setName head)
(setLocalPos $HeadPosX $HeadPosY $HeadPosZ)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $headMass $headRadius
$HeadPosX $HeadPosY $HeadPosZ
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -38,7 +38,7 @@
(nd Transform
(setLocalPos $anchorX $anchorY $anchorZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLen)
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -32,7 +32,7 @@
- (eval 0.04 * $scale)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
;; Lower arm
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -216,7 +216,7 @@
$offsetLeftShoulderCylY
$offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -228,7 +228,7 @@
$offsetRightShoulderCylY
$offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -434,7 +434,7 @@
- (eval $ShankHeight / 2.0)
- (eval 0.05 * $scale)))
(def $ShankAnchorZ (eval $ShankHeight * 0.5))
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
leftshank llj4 lle4 ../../leftthigh/boxBody
$LeftShankPosX $LeftShankPosY $LeftShankPosZ
$ShankLength $ShankWidth $ShankHeight
@@ -447,7 +447,7 @@
(def $RightShankPosX $RightThighPosX)
(def $RightShankPosY $RightThighPosY)
(def $RightShankPosZ $LeftShankPosZ)
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
rightshank rlj4 rle4 ../../rightthigh/boxBody
$RightShankPosX $RightShankPosY $RightShankPosZ
$ShankLength $ShankWidth $ShankHeight
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -16,7 +16,7 @@
; + (eval 0.1 * $scale))
; + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBoxTotal $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -203,7 +203,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -213,7 +213,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -369,7 +369,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -415,7 +415,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -621,7 +621,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -662,7 +662,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -10,7 +10,7 @@
;(setScale 1.0 1.0 1.0)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
;(setBoxTotal $totalMass $lenX $lenY $lenZ)
(setBox $totalMass $lenX $lenY $lenZ)
@@ -36,4 +36,4 @@
)
)
-)
\ No newline at end of file
+)
Modified: trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
===================================================================
--- trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 12:19:37 UTC (rev 176)
@@ -14,7 +14,7 @@
(def $HeadPosY 0.05)
(def $HeadPosZ (eval (eval (eval 0.5 * $upperLenZ) + 0.1) + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBox $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: trunk/rcssserver3d/doc/users/robots.tex
===================================================================
--- trunk/rcssserver3d/doc/users/robots.tex 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/doc/users/robots.tex 2010-02-25 12:19:37 UTC (rev 176)
@@ -237,11 +237,11 @@
box\_physics\_with\_handler.rsg & Not only do the job as file
“box\_physics.rsg”, but also install a touchperceptorhandler under
the BoxCollider Node. \\
- ccylinder\_appearance.rsg & Install a capped cylinder which is
+ capsule\_appearance.rsg & Install a capsule which is
for the GL render. \\
- ccylinder\_physics.rsg & Install a capped cylinder that has
+ capsule\_physics.rsg & Install a capsule that has
physics effect(ODE related) \\
- ccylinder\_physics\_nocollider.rsg & Install a capped cylinder that
+ capsule\_physics\_nocollider.rsg & Install a capsule that
only has dynamics effect (mass, linear velocity, etc). But it can
never collide to the others. \\
contactjointhandler.rsg & Install a contactjointhandler to
Modified: trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -27,7 +27,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
}
class AgentState : public ObjectState
Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 12:19:37 UTC (rev 176)
@@ -46,7 +46,7 @@
if (mBody.get() == 0)
{
- mBody = shared_dynamic_cast<Body>(GetChildOfClass("Body"));
+ mBody = shared_dynamic_cast<RigidBody>(GetChildOfClass("RigidBody"));
}
}
Modified: trunk/rcssserver3d/plugin/soccer/ball/ball.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -23,7 +23,7 @@
#define BALL_H
#include <oxygen/sceneserver/transform.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <salt/vector.h>
class BallStateAspect;
@@ -65,7 +65,7 @@
salt::Vector3f mForce;
salt::Vector3f mTorque;
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
boost::shared_ptr<oxygen::AgentAspect> mKickedLast;
boost::shared_ptr<BallStateAspect> mBallStateAspect;
};
Modified: trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -23,7 +23,7 @@
#define BEAMEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <gamestateaspect/gamestateaspect.h>
class BeamEffector : public oxygen::Effector
@@ -51,7 +51,7 @@
protected:
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
/** the reference to the GameState */
boost::shared_ptr<GameStateAspect> mGameState;
Modified: trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -22,7 +22,7 @@
#define CATCHEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <ball/ball.h>
#include <ballstateaspect/ballstateaspect.h>
@@ -33,7 +33,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
class AgentAspect;
}
@@ -74,7 +74,7 @@
protected:
/** reference to the body node of the ball */
- boost::shared_ptr<oxygen::Body> mBallBody;
+ boost::shared_ptr<oxygen::RigidBody> mBallBody;
/** reference to the agent aspect */
boost::shared_ptr<oxygen::AgentAspect> mAgent;
/** reference to the agentstate */
Modified: trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 11:08:46 UTC (rev 175)
+++ trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 12:19:37 UTC (rev 176)
@@ -24,7 +24,7 @@
#include <salt/random.h>
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <agentstate/agentstate.h>
class DriveEffector : public oxygen::Effector
@@ -84,7 +84,7 @@
/** the reference to the parent transform node */
boost::shared_ptr<oxygen::Transform> mTransformParent;
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
//! a reference to the agent state
boost::shared_ptr<AgentState> mAgentState;
Modified: trunk/rcssserver3d/plugin/soccer/hmdp_eff...
[truncated message content] |
|
From: <a-...@us...> - 2010-02-25 13:09:58
|
Revision: 177
http://simspark.svn.sourceforge.net/simspark/?rev=177&view=rev
Author: a-held
Date: 2010-02-25 12:27:30 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
decomment the proxyserver from oxygen's CMakeLists
Modified Paths:
--------------
trunk/spark/lib/oxygen/CMakeLists.txt
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2010-02-25 12:19:37 UTC (rev 176)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2010-02-25 12:27:30 UTC (rev 177)
@@ -89,8 +89,8 @@
physicsserver/int/universaljointint.h
physicsserver/int/worldint.h
- #proxyserver/agentproxy.h
- #proxyserver/proxyserver.h
+ proxyserver/agentproxy.h
+ proxyserver/proxyserver.h
sceneserver/sceneimporter.h
sceneserver/basenode.h
sceneserver/fpscontroller.h
@@ -279,10 +279,10 @@
monitorserver/custommonitor_c.cpp
monitorserver/monitorcmdparser.cpp
monitorserver/monitorcmdparser_c.cpp
- #proxyserver/agentproxy.cpp
- #proxyserver/agentproxy_c.cpp
- #proxyserver/proxyserver.cpp
- #proxyserver/proxyserver_c.cpp
+ proxyserver/agentproxy.cpp
+ proxyserver/agentproxy_c.cpp
+ proxyserver/proxyserver.cpp
+ proxyserver/proxyserver_c.cpp
)
if(SPADES_FOUND)
set(oxygen_LIB_SRCS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-25 11:08:56
|
Revision: 175
http://simspark.svn.sourceforge.net/simspark/?rev=175&view=rev
Author: a-held
Date: 2010-02-25 11:08:46 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
patch new branch to get it up to date
Modified Paths:
--------------
branches/treehole/rcssserver3d/data/rsg/agent/ball.rsg
branches/treehole/rcssserver3d/data/rsg/agent/hoap2.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot055.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot056.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
branches/treehole/rcssserver3d/doc/users/robots.tex
branches/treehole/rcssserver3d/plugin/soccer/agentstate/agentstate.h
branches/treehole/rcssserver3d/plugin/soccer/ball/ball.cpp
branches/treehole/rcssserver3d/plugin/soccer/ball/ball.h
branches/treehole/rcssserver3d/plugin/soccer/beameffector/beameffector.h
branches/treehole/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
branches/treehole/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.h
branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.cpp
branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpperceptor.h
branches/treehole/rcssserver3d/plugin/soccer/initeffector/initeffector.cpp
branches/treehole/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.cpp
branches/treehole/rcssserver3d/plugin/soccer/internalsoccermonitor/internalsoccerinput.h
branches/treehole/rcssserver3d/plugin/soccer/kickeffector/kickeffector.h
branches/treehole/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.h
branches/treehole/rcssserver3d/plugin/soccer/soccerbase/soccerbase.cpp
branches/treehole/rcssserver3d/plugin/soccer/soccerbase/soccerbase.h
branches/treehole/rcssserver3d/plugin/soccer/soccercontrolaspect/soccercontrolaspect.h
branches/treehole/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
branches/treehole/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.h
branches/treehole/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp
branches/treehole/rcssserver3d/plugin/soccermonitor/soccerinput.cpp
branches/treehole/rcssserver3d/plugin/soccermonitor/soccerinput.h
branches/treehole/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.cpp
branches/treehole/rcssserver3d/plugin/soccermonitor/soccerinputlogplayer.h
branches/treehole/rcssserver3d/rcssserver3d/CMakeLists.txt
branches/treehole/rcssserver3d/rcssserver3d/main.cpp
branches/treehole/rcssserver3d/rcssserver3d/rcsoccersim3d.in
branches/treehole/rsgedit/src/property.cpp
branches/treehole/rsgedit/src/sparkglrender.cpp
branches/treehole/simspark-utilities/data/rsg/agent/ball.rsg
branches/treehole/spark/RELEASE
branches/treehole/spark/data/ros/aibo.rsi
branches/treehole/spark/data/ros/blockworld.ros
branches/treehole/spark/data/rsg/boxspheres/box.rsg
branches/treehole/spark/data/rsg/boxspheres/box_with_handler.rsg
branches/treehole/spark/data/rsg/boxspheres/box_with_handler055.rsg
branches/treehole/spark/data/rsg/boxspheres/box_with_handler056.rsg
branches/treehole/spark/data/rsg/boxspheres/simspark.rsg
branches/treehole/spark/data/rsg/boxspheres/sphere.rsg
branches/treehole/spark/lib/kerosin/CMakeLists.txt
branches/treehole/spark/lib/kerosin/kerosin.cpp
branches/treehole/spark/lib/kerosin/kerosin.h
branches/treehole/spark/lib/kerosin/renderserver/renderserver.cpp
branches/treehole/spark/lib/oxygen/CMakeLists.txt
branches/treehole/spark/lib/oxygen/geometryserver/stdmeshimporter.cpp
branches/treehole/spark/lib/oxygen/geometryserver/stdmeshimporter.h
branches/treehole/spark/lib/oxygen/oxygen.cpp
branches/treehole/spark/lib/oxygen/oxygen.h
branches/treehole/spark/lib/oxygen/physicsserver/angularmotor.cpp
branches/treehole/spark/lib/oxygen/physicsserver/angularmotor.h
branches/treehole/spark/lib/oxygen/physicsserver/angularmotor_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/balljoint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/balljoint.h
branches/treehole/spark/lib/oxygen/physicsserver/balljoint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/body.cpp
branches/treehole/spark/lib/oxygen/physicsserver/body.h
branches/treehole/spark/lib/oxygen/physicsserver/body_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/bodycontroller.cpp
branches/treehole/spark/lib/oxygen/physicsserver/bodycontroller.h
branches/treehole/spark/lib/oxygen/physicsserver/bodycontroller_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/boxcollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/boxcollider.h
branches/treehole/spark/lib/oxygen/physicsserver/boxcollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/collider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/collider.h
branches/treehole/spark/lib/oxygen/physicsserver/collider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/collisionhandler.cpp
branches/treehole/spark/lib/oxygen/physicsserver/collisionhandler.h
branches/treehole/spark/lib/oxygen/physicsserver/collisionhandler_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
branches/treehole/spark/lib/oxygen/physicsserver/contactjointhandler.h
branches/treehole/spark/lib/oxygen/physicsserver/contactjointhandler_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/dragcontroller.cpp
branches/treehole/spark/lib/oxygen/physicsserver/dragcontroller_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/fixedjoint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/fixedjoint.h
branches/treehole/spark/lib/oxygen/physicsserver/fixedjoint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/hinge2joint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/hinge2joint.h
branches/treehole/spark/lib/oxygen/physicsserver/hinge2joint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/hingejoint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/hingejoint.h
branches/treehole/spark/lib/oxygen/physicsserver/hingejoint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/joint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/joint.h
branches/treehole/spark/lib/oxygen/physicsserver/joint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/physicsserver.cpp
branches/treehole/spark/lib/oxygen/physicsserver/physicsserver.h
branches/treehole/spark/lib/oxygen/physicsserver/physicsserver_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/planecollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/planecollider.h
branches/treehole/spark/lib/oxygen/physicsserver/planecollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/raycollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/raycollider.h
branches/treehole/spark/lib/oxygen/physicsserver/raycollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/recorderhandler.cpp
branches/treehole/spark/lib/oxygen/physicsserver/recorderhandler.h
branches/treehole/spark/lib/oxygen/physicsserver/recorderhandler_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/sliderjoint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/sliderjoint.h
branches/treehole/spark/lib/oxygen/physicsserver/sliderjoint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/space.cpp
branches/treehole/spark/lib/oxygen/physicsserver/space.h
branches/treehole/spark/lib/oxygen/physicsserver/space_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/spherecollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/spherecollider.h
branches/treehole/spark/lib/oxygen/physicsserver/spherecollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/transformcollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/transformcollider.h
branches/treehole/spark/lib/oxygen/physicsserver/transformcollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/universaljoint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/universaljoint.h
branches/treehole/spark/lib/oxygen/physicsserver/universaljoint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/velocitycontroller.cpp
branches/treehole/spark/lib/oxygen/physicsserver/velocitycontroller_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/world.cpp
branches/treehole/spark/lib/oxygen/physicsserver/world.h
branches/treehole/spark/lib/oxygen/physicsserver/world_c.cpp
branches/treehole/spark/lib/oxygen/proxyserver/agentproxy.cpp
branches/treehole/spark/lib/oxygen/sceneserver/fpscontroller.cpp
branches/treehole/spark/lib/oxygen/sceneserver/sceneserver.cpp
branches/treehole/spark/lib/oxygen/sceneserver/sceneserver.h
branches/treehole/spark/plugin/CMakeLists.txt
branches/treehole/spark/plugin/accelerometer/CMakeLists.txt
branches/treehole/spark/plugin/accelerometer/accelerometer.cpp
branches/treehole/spark/plugin/accelerometer/accelerometer.h
branches/treehole/spark/plugin/collisionperceptor/forceresistanceperceptor.cpp
branches/treehole/spark/plugin/collisionperceptor/forceresistanceperceptor.h
branches/treehole/spark/plugin/collisionperceptor/perceptorhandler.cpp
branches/treehole/spark/plugin/collisionperceptor/perceptorhandler.h
branches/treehole/spark/plugin/collisionperceptor/touchperceptorhandler.cpp
branches/treehole/spark/plugin/collisionperceptor/touchperceptorhandler.h
branches/treehole/spark/plugin/forceeffector/forceeffector.cpp
branches/treehole/spark/plugin/forceeffector/forceeffector.h
branches/treehole/spark/plugin/gyrorateperceptor/gyrorateperceptor.cpp
branches/treehole/spark/plugin/gyrorateperceptor/gyrorateperceptor.h
branches/treehole/spark/plugin/rosimporter/roselements.cpp
branches/treehole/spark/plugin/rosimporter/roselements.h
branches/treehole/spark/plugin/rosimporter/rosimporter.cpp
branches/treehole/spark/plugin/rosimporter/rosimporter.h
branches/treehole/spark/plugin/sparkagent/hinge2effector.cpp
branches/treehole/spark/plugin/sparkagent/hingeeffector.cpp
branches/treehole/spark/plugin/sparkagent/universaljointeffector.cpp
branches/treehole/spark/plugin/sparkmonitor/sparkmonitorclient.cpp
branches/treehole/spark/plugin/sparkmonitor/sparkmonitorlogfileserver.cpp
branches/treehole/spark/spark/spark.rb
branches/treehole/spark/test/scenetest/script/scenetest.rb
Added Paths:
-----------
branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
branches/treehole/spark/data/rsg/boxspheres/capsule.rsg
branches/treehole/spark/data/rsg/boxspheres/staticcapsule.rsg
branches/treehole/spark/lib/kerosin/sceneserver/capsule.cpp
branches/treehole/spark/lib/kerosin/sceneserver/capsule.h
branches/treehole/spark/lib/kerosin/sceneserver/capsule_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/capsulecollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/capsulecollider.h
branches/treehole/spark/lib/oxygen/physicsserver/capsulecollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/compoundcollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/compoundcollider.h
branches/treehole/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/concavecollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/concavecollider.h
branches/treehole/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/conecollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/conecollider.h
branches/treehole/spark/lib/oxygen/physicsserver/conecollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/conetwistjoint.h
branches/treehole/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/convexcollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/convexcollider.h
branches/treehole/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/cylindercollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/cylindercollider.h
branches/treehole/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/dynamicbody.cpp
branches/treehole/spark/lib/oxygen/physicsserver/dynamicbody.h
branches/treehole/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/emptycollider.cpp
branches/treehole/spark/lib/oxygen/physicsserver/emptycollider.h
branches/treehole/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
branches/treehole/spark/lib/oxygen/physicsserver/generic6dofjoint.h
branches/treehole/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
branches/treehole/spark/lib/oxygen/physicsserver/int/
branches/treehole/spark/lib/oxygen/physicsserver/int/angularmotorint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/balljointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/bodyint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/colliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/conecolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/fixedjointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/hingejointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/jointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/physicsserverint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/planecolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/raycolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/sliderjointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/softbodyint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/spaceint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/staticbodyint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/universaljointint.h
branches/treehole/spark/lib/oxygen/physicsserver/int/worldint.h
branches/treehole/spark/lib/oxygen/physicsserver/physicsobject.cpp
branches/treehole/spark/lib/oxygen/physicsserver/physicsobject.h
branches/treehole/spark/lib/oxygen/physicsserver/physicsobject_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/rigidbody.cpp
branches/treehole/spark/lib/oxygen/physicsserver/rigidbody.h
branches/treehole/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/softbody.cpp
branches/treehole/spark/lib/oxygen/physicsserver/softbody.h
branches/treehole/spark/lib/oxygen/physicsserver/softbody_c.cpp
branches/treehole/spark/lib/oxygen/physicsserver/staticbody.cpp
branches/treehole/spark/lib/oxygen/physicsserver/staticbody.h
branches/treehole/spark/lib/oxygen/physicsserver/staticbody_c.cpp
branches/treehole/spark/plugin/odeimps/
branches/treehole/spark/plugin/odeimps/CMakeLists.txt
branches/treehole/spark/plugin/odeimps/export.cpp
branches/treehole/spark/plugin/odeimps/odeangularmotor.cpp
branches/treehole/spark/plugin/odeimps/odeangularmotor.h
branches/treehole/spark/plugin/odeimps/odeangularmotor_c.cpp
branches/treehole/spark/plugin/odeimps/odeballjoint.cpp
branches/treehole/spark/plugin/odeimps/odeballjoint.h
branches/treehole/spark/plugin/odeimps/odeballjoint_c.cpp
branches/treehole/spark/plugin/odeimps/odebody.cpp
branches/treehole/spark/plugin/odeimps/odebody.h
branches/treehole/spark/plugin/odeimps/odebody_c.cpp
branches/treehole/spark/plugin/odeimps/odeboxcollider.cpp
branches/treehole/spark/plugin/odeimps/odeboxcollider.h
branches/treehole/spark/plugin/odeimps/odeboxcollider_c.cpp
branches/treehole/spark/plugin/odeimps/odecapsulecollider.cpp
branches/treehole/spark/plugin/odeimps/odecapsulecollider.h
branches/treehole/spark/plugin/odeimps/odecapsulecollider_c.cpp
branches/treehole/spark/plugin/odeimps/odecollider.cpp
branches/treehole/spark/plugin/odeimps/odecollider.h
branches/treehole/spark/plugin/odeimps/odecollider_c.cpp
branches/treehole/spark/plugin/odeimps/odecompoundcollider.cpp
branches/treehole/spark/plugin/odeimps/odecompoundcollider.h
branches/treehole/spark/plugin/odeimps/odecompoundcollider_c.cpp
branches/treehole/spark/plugin/odeimps/odeconcavecollider.cpp
branches/treehole/spark/plugin/odeimps/odeconcavecollider.h
branches/treehole/spark/plugin/odeimps/odeconcavecollider_c.cpp
branches/treehole/spark/plugin/odeimps/odeconecollider.cpp
branches/treehole/spark/plugin/odeimps/odeconecollider.h
branches/treehole/spark/plugin/odeimps/odeconecollider_c.cpp
branches/treehole/spark/plugin/odeimps/odeconetwistjoint.cpp
branches/treehole/spark/plugin/odeimps/odeconetwistjoint.h
branches/treehole/spark/plugin/odeimps/odeconetwistjoint_c.cpp
branches/treehole/spark/plugin/odeimps/odecontactjointhandler.cpp
branches/treehole/spark/plugin/odeimps/odecontactjointhandler.h
branches/treehole/spark/plugin/odeimps/odecontactjointhandler_c.cpp
branches/treehole/spark/plugin/odeimps/odeconvexcollider.cpp
branches/treehole/spark/plugin/odeimps/odeconvexcollider.h
branches/treehole/spark/plugin/odeimps/odeconvexcollider_c.cpp
branches/treehole/spark/plugin/odeimps/odecylindercollider.cpp
branches/treehole/spark/plugin/odeimps/odecylindercollider.h
branches/treehole/spark/plugin/odeimps/odecylindercollider_c.cpp
branches/treehole/spark/plugin/odeimps/odedynamicbody.cpp
branches/treehole/spark/plugin/odeimps/odedynamicbody.h
branches/treehole/spark/plugin/odeimps/odedynamicbody_c.cpp
branches/treehole/spark/plugin/odeimps/odeemptycollider.cpp
branches/treehole/spark/plugin/odeimps/odeemptycollider.h
branches/treehole/spark/plugin/odeimps/odeemptycollider_c.cpp
branches/treehole/spark/plugin/odeimps/odefixedjoint.cpp
branches/treehole/spark/plugin/odeimps/odefixedjoint.h
branches/treehole/spark/plugin/odeimps/odefixedjoint_c.cpp
branches/treehole/spark/plugin/odeimps/odegeneric6dofjoint.cpp
branches/treehole/spark/plugin/odeimps/odegeneric6dofjoint.h
branches/treehole/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
branches/treehole/spark/plugin/odeimps/odehinge2joint.cpp
branches/treehole/spark/plugin/odeimps/odehinge2joint.h
branches/treehole/spark/plugin/odeimps/odehinge2joint_c.cpp
branches/treehole/spark/plugin/odeimps/odehingejoint.cpp
branches/treehole/spark/plugin/odeimps/odehingejoint.h
branches/treehole/spark/plugin/odeimps/odehingejoint_c.cpp
branches/treehole/spark/plugin/odeimps/odejoint.cpp
branches/treehole/spark/plugin/odeimps/odejoint.h
branches/treehole/spark/plugin/odeimps/odejoint_c.cpp
branches/treehole/spark/plugin/odeimps/odephysicsobject.cpp
branches/treehole/spark/plugin/odeimps/odephysicsobject.h
branches/treehole/spark/plugin/odeimps/odephysicsobject_c.cpp
branches/treehole/spark/plugin/odeimps/odephysicsserver.cpp
branches/treehole/spark/plugin/odeimps/odephysicsserver.h
branches/treehole/spark/plugin/odeimps/odephysicsserver_c.cpp
branches/treehole/spark/plugin/odeimps/odeplanecollider.cpp
branches/treehole/spark/plugin/odeimps/odeplanecollider.h
branches/treehole/spark/plugin/odeimps/odeplanecollider_c.cpp
branches/treehole/spark/plugin/odeimps/oderaycollider.cpp
branches/treehole/spark/plugin/odeimps/oderaycollider.h
branches/treehole/spark/plugin/odeimps/oderaycollider_c.cpp
branches/treehole/spark/plugin/odeimps/oderigidbody.cpp
branches/treehole/spark/plugin/odeimps/oderigidbody.h
branches/treehole/spark/plugin/odeimps/oderigidbody_c.cpp
branches/treehole/spark/plugin/odeimps/odesliderjoint.cpp
branches/treehole/spark/plugin/odeimps/odesliderjoint.h
branches/treehole/spark/plugin/odeimps/odesliderjoint_c.cpp
branches/treehole/spark/plugin/odeimps/odesoftbody.cpp
branches/treehole/spark/plugin/odeimps/odesoftbody.h
branches/treehole/spark/plugin/odeimps/odesoftbody_c.cpp
branches/treehole/spark/plugin/odeimps/odespace.cpp
branches/treehole/spark/plugin/odeimps/odespace.h
branches/treehole/spark/plugin/odeimps/odespace_c.cpp
branches/treehole/spark/plugin/odeimps/odespherecollider.cpp
branches/treehole/spark/plugin/odeimps/odespherecollider.h
branches/treehole/spark/plugin/odeimps/odespherecollider_c.cpp
branches/treehole/spark/plugin/odeimps/odestaticbody.cpp
branches/treehole/spark/plugin/odeimps/odestaticbody.h
branches/treehole/spark/plugin/odeimps/odestaticbody_c.cpp
branches/treehole/spark/plugin/odeimps/odetransformcollider.cpp
branches/treehole/spark/plugin/odeimps/odetransformcollider.h
branches/treehole/spark/plugin/odeimps/odetransformcollider_c.cpp
branches/treehole/spark/plugin/odeimps/odeuniversaljoint.cpp
branches/treehole/spark/plugin/odeimps/odeuniversaljoint.h
branches/treehole/spark/plugin/odeimps/odeuniversaljoint_c.cpp
branches/treehole/spark/plugin/odeimps/odeworld.cpp
branches/treehole/spark/plugin/odeimps/odeworld.h
branches/treehole/spark/plugin/odeimps/odeworld_c.cpp
branches/treehole/spark/plugin/odeimps/odewrapper.h
Removed Paths:
-------------
branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
branches/treehole/spark/data/rsg/boxspheres/ccylinder.rsg
branches/treehole/spark/data/rsg/boxspheres/staticccylinder.rsg
branches/treehole/spark/lib/kerosin/sceneserver/ccylinder.cpp
branches/treehole/spark/lib/kerosin/sceneserver/ccylinder.h
branches/treehole/spark/lib/kerosin/sceneserver/ccylinder_c.cpp
Modified: branches/treehole/rcssserver3d/data/rsg/agent/ball.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/ball.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -15,7 +15,7 @@
(setScale $Radius $Radius $Radius)
)
- (nd Body
+ (nd RigidBody
(setName physics)
(setSphereTotal $Mass $Radius)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/hoap2.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/hoap2.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -142,7 +142,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -151,7 +151,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
)
@@ -373,7 +373,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -410,7 +410,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
@@ -16,4 +16,4 @@
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
-)
\ No newline at end of file
+)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/box_physics_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -4,7 +4,7 @@
(
(templ $lenX $lenY $lenZ $totalMass)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
Added: branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg (rev 0)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_appearance.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -0,0 +1,11 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $material)
+
+ (nd Capsule
+ (setParams $radius $length)
+ (setMaterial $material)
+ )
+)
Added: branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg (rev 0)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -0,0 +1,19 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius $length)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+
+ (nd CapsuleCollider
+ (setParams $radius $length)
+
+ (importScene rsg/agent/nao/contactjointhandler.rsg)
+ )
+ )
Added: branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg (rev 0)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/capsule_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -0,0 +1,13 @@
+; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $radius $length $totalMass)
+
+ (nd RigidBody
+ (setName capsuleBody)
+ (setCapsuleTotal $totalMass $radius)
+
+ (importScene rsg/agent/nao/dragcontroller.rsg)
+ )
+)
Deleted: branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_appearance.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -1,11 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $material)
-
- (nd CCylinder
- (setParams $radius $length)
- (setMaterial $material)
- )
-)
Deleted: branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -1,19 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius $length)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-
- (nd CCylinderCollider
- (setParams $radius $length)
-
- (importScene rsg/agent/nao/contactjointhandler.rsg)
- )
- )
Deleted: branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/ccylinder_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -1,13 +0,0 @@
-; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $radius $length $totalMass)
-
- (nd Body
- (setName ccylinderBody)
- (setCappedCylinderTotal $totalMass $radius)
-
- (importScene rsg/agent/nao/dragcontroller.rsg)
- )
-)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/naoneckhead.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -43,12 +43,12 @@
(setName neck)
(setLocalPos $Neck_X $Neck_Y $Neck_Z)
- (importScene rsg/agent/nao/ccylinder_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
- (importScene rsg/agent/nao/ccylinder_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
+ (importScene rsg/agent/nao/capsule_appearance.rsg $Neck_Radius $Neck_Length matDarkGrey)
+ (importScene rsg/agent/nao/capsule_physics.rsg $Neck_Radius $Neck_Length $Neck_Mass)
(importScene rsg/agent/nao/hingejoint.rsg
hj1 he1
- ../ccylinderBody ../../body/boxBody
+ ../capsuleBody ../../body/boxBody
0 0 0
0 0 1
$he1_min $he1_max)
@@ -80,7 +80,7 @@
(importScene rsg/agent/nao/hingejoint.rsg
hj2 he2
- ../sphereBody ../../neck/ccylinderBody
+ ../sphereBody ../../neck/capsuleBody
;../boxBody ../../body/boxBody
0 0 -0.005
1 0 0
Modified: branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/nao/sphere_physics_nocollider.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -4,7 +4,7 @@
(
(templ $radius $totalMass)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $totalMass $radius)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot055.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot055.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -168,7 +168,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -178,7 +178,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -336,7 +336,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -374,7 +374,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot056.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot056.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -204,7 +204,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -214,7 +214,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -409,7 +409,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -455,7 +455,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -771,7 +771,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -812,7 +812,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -8,17 +8,17 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
- (nd DragController
- (setAngularDrag 0.01)
- (setLinearDrag 0.01)
- )
+ (nd DragController
+ (setAngularDrag 0.01)
+ (setLinearDrag 0.01)
+ )
)
(nd BoxCollider
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/contactjointhandler.rsg)
)
- )
\ No newline at end of file
+ )
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_handler.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -8,7 +8,7 @@
(setMaterial $material)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
(setBoxTotal $totalMass $lenX $lenY $lenZ)
(nd DragController
@@ -21,4 +21,4 @@
(setBoxLengths $lenX $lenY $lenZ)
(importScene rsg/agent/nao/touchperceptorhandler.rsg)
)
- )
\ No newline at end of file
+ )
Added: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg (rev 0)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -0,0 +1,37 @@
+;; -*- mode: lisp; -*-
+
+(RSG 0 1)
+(
+ (templ $name $perceptorName $effectorName $attach
+ $x $y $z
+ $lenX $lenY $lenZ
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ $minDeg $maxDeg
+ $totalMass $material $ElbowRadius $ElbowLen)
+
+ (nd Transform
+ (setName $name)
+ (setLocalPos $x $y $z)
+ (importScene rsg/agent/soccerbot058/box.rsg
+ $lenX $lenY $lenZ
+ $totalMass $material)
+
+ ;; install hinge joint
+ (importScene rsg/agent/nao/hingejoint.rsg
+ $perceptorName $effectorName
+ ../boxBody $attach
+ $anchorX $anchorY $anchorZ
+ $axisX $axisY $axisZ
+ $minDeg $maxDeg)
+
+ ;; static cylinder for the elbow
+ (nd Transform
+ (setLocalPos $anchorX $anchorY $anchorZ)
+ (setLocalRotation 0 90 0)
+ (nd Capsule
+ (setMaterial matGrey)
+ (setParams $ElbowRadius $ElbowLen)
+ )
+ )
+ )
+ )
Deleted: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -1,37 +0,0 @@
-;; -*- mode: lisp; -*-
-
-(RSG 0 1)
-(
- (templ $name $perceptorName $effectorName $attach
- $x $y $z
- $lenX $lenY $lenZ
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ $minDeg $maxDeg
- $totalMass $material $ElbowRadius $ElbowLen)
-
- (nd Transform
- (setName $name)
- (setLocalPos $x $y $z)
- (importScene rsg/agent/soccerbot058/box.rsg
- $lenX $lenY $lenZ
- $totalMass $material)
-
- ;; install hinge joint
- (importScene rsg/agent/nao/hingejoint.rsg
- $perceptorName $effectorName
- ../boxBody $attach
- $anchorX $anchorY $anchorZ
- $axisX $axisY $axisZ
- $minDeg $maxDeg)
-
- ;; static cylinder for the elbow
- (nd Transform
- (setLocalPos $anchorX $anchorY $anchorZ)
- (setLocalRotation 0 90 0)
- (nd CCylinder
- (setMaterial matGrey)
- (setParams $ElbowRadius $ElbowLen)
- )
- )
- )
- )
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/head.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -9,7 +9,7 @@
(setName head)
(setLocalPos $HeadPosX $HeadPosY $HeadPosZ)
- (nd Body
+ (nd RigidBody
(setName sphereBody)
(setSphereTotal $headMass $headRadius
$HeadPosX $HeadPosY $HeadPosZ
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -38,7 +38,7 @@
(nd Transform
(setLocalPos $anchorX $anchorY $anchorZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLen)
)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/lowerarm_body.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -32,7 +32,7 @@
- (eval 0.04 * $scale)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
;; Lower arm
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbot.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -216,7 +216,7 @@
$offsetLeftShoulderCylY
$offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -228,7 +228,7 @@
$offsetRightShoulderCylY
$offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -434,7 +434,7 @@
- (eval $ShankHeight / 2.0)
- (eval 0.05 * $scale)))
(def $ShankAnchorZ (eval $ShankHeight * 0.5))
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
leftshank llj4 lle4 ../../leftthigh/boxBody
$LeftShankPosX $LeftShankPosY $LeftShankPosZ
$ShankLength $ShankWidth $ShankHeight
@@ -447,7 +447,7 @@
(def $RightShankPosX $RightThighPosX)
(def $RightShankPosY $RightThighPosY)
(def $RightShankPosZ $LeftShankPosZ)
- (importScene rsg/agent/soccerbot058/box_with_hj_with_ccylinder.rsg
+ (importScene rsg/agent/soccerbot058/box_with_hj_with_capsule.rsg
rightshank rlj4 rle4 ../../rightthigh/boxBody
$RightShankPosX $RightShankPosY $RightShankPosZ
$ShankLength $ShankWidth $ShankHeight
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbot058/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -16,7 +16,7 @@
; + (eval 0.1 * $scale))
; + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBoxTotal $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbotcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -203,7 +203,7 @@
(nd Transform
(setLocalPos $offsetLeftShoulderCylX $offsetLeftShoulderCylY $offsetLeftShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName leftshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -213,7 +213,7 @@
(nd Transform
(setLocalPos $offsetRightShoulderCylX $offsetRightShoulderCylY $offsetRightShoulderCylZ)
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setName rightshoulderpin)
(setMaterial matDarkGrey)
(setParams $TorsoCylinderRadius $TorsoCylinderLength)
@@ -369,7 +369,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -415,7 +415,7 @@
(nd Transform
(setLocalPos 0 0 (eval -1 * (eval (eval $UpperarmHeight / 2.0) + (eval $ElbowRadius / 2.0))))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matGrey)
(setParams $ElbowRadius $ElbowLength)
)
@@ -621,7 +621,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
@@ -662,7 +662,7 @@
(nd Transform
(setLocalPos 0 0 (eval (eval $ThighHeight * -0.5) - 0.025))
(setLocalRotation 0 90 0)
- (nd CCylinder
+ (nd Capsule
(setMaterial matRed)
(setParams 0.1 (eval $ThighLength - 0.2))
)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbotleftlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbotrightlowerarmcomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -44,7 +44,7 @@
- (eval $HandBox3Height / 2.0) ) - 0.04 ) )
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Lower arm mass
(setBox $LowerarmMass $LowerarmLength $LowerarmWidth $LowerarmHeight)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorso.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorso.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -10,7 +10,7 @@
;(setScale 1.0 1.0 1.0)
)
- (nd Body
+ (nd RigidBody
(setName boxBody)
;(setBoxTotal $totalMass $lenX $lenY $lenZ)
(setBox $totalMass $lenX $lenY $lenZ)
@@ -36,4 +36,4 @@
)
)
-)
\ No newline at end of file
+)
Modified: branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg
===================================================================
--- branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/data/rsg/agent/soccerbottorsocomp.rsg 2010-02-25 11:08:46 UTC (rev 175)
@@ -14,7 +14,7 @@
(def $HeadPosY 0.05)
(def $HeadPosZ (eval (eval (eval 0.5 * $upperLenZ) + 0.1) + (eval $headRadius / 2.0)))
- (nd Body
+ (nd RigidBody
(setName boxBody)
; Upper torso mass
(setBox $upperMass $upperLenX $upperLenY $upperLenZ)
Modified: branches/treehole/rcssserver3d/doc/users/robots.tex
===================================================================
--- branches/treehole/rcssserver3d/doc/users/robots.tex 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/doc/users/robots.tex 2010-02-25 11:08:46 UTC (rev 175)
@@ -237,11 +237,11 @@
box\_physics\_with\_handler.rsg & Not only do the job as file
“box\_physics.rsg”, but also install a touchperceptorhandler under
the BoxCollider Node. \\
- ccylinder\_appearance.rsg & Install a capped cylinder which is
+ capsule\_appearance.rsg & Install a capsule which is
for the GL render. \\
- ccylinder\_physics.rsg & Install a capped cylinder that has
+ capsule\_physics.rsg & Install a capsule that has
physics effect(ODE related) \\
- ccylinder\_physics\_nocollider.rsg & Install a capped cylinder that
+ capsule\_physics\_nocollider.rsg & Install a capsule that
only has dynamics effect (mass, linear velocity, etc). But it can
never collide to the others. \\
contactjointhandler.rsg & Install a contactjointhandler to
Modified: branches/treehole/rcssserver3d/plugin/soccer/agentstate/agentstate.h
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/agentstate/agentstate.h 2010-02-25 11:08:46 UTC (rev 175)
@@ -27,7 +27,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
}
class AgentState : public ObjectState
Modified: branches/treehole/rcssserver3d/plugin/soccer/ball/ball.cpp
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/ball/ball.cpp 2010-02-25 11:08:46 UTC (rev 175)
@@ -46,7 +46,7 @@
if (mBody.get() == 0)
{
- mBody = shared_dynamic_cast<Body>(GetChildOfClass("Body"));
+ mBody = shared_dynamic_cast<RigidBody>(GetChildOfClass("RigidBody"));
}
}
Modified: branches/treehole/rcssserver3d/plugin/soccer/ball/ball.h
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/ball/ball.h 2010-02-25 11:08:46 UTC (rev 175)
@@ -23,7 +23,7 @@
#define BALL_H
#include <oxygen/sceneserver/transform.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <salt/vector.h>
class BallStateAspect;
@@ -65,7 +65,7 @@
salt::Vector3f mForce;
salt::Vector3f mTorque;
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
boost::shared_ptr<oxygen::AgentAspect> mKickedLast;
boost::shared_ptr<BallStateAspect> mBallStateAspect;
};
Modified: branches/treehole/rcssserver3d/plugin/soccer/beameffector/beameffector.h
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/beameffector/beameffector.h 2010-02-25 11:08:46 UTC (rev 175)
@@ -23,7 +23,7 @@
#define BEAMEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <gamestateaspect/gamestateaspect.h>
class BeamEffector : public oxygen::Effector
@@ -51,7 +51,7 @@
protected:
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
/** the reference to the GameState */
boost::shared_ptr<GameStateAspect> mGameState;
Modified: branches/treehole/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/catcheffector/catcheffector.h 2010-02-25 11:08:46 UTC (rev 175)
@@ -22,7 +22,7 @@
#define CATCHEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <ball/ball.h>
#include <ballstateaspect/ballstateaspect.h>
@@ -33,7 +33,7 @@
namespace oxygen
{
- class Body;
+ class RigidBody;
class AgentAspect;
}
@@ -74,7 +74,7 @@
protected:
/** reference to the body node of the ball */
- boost::shared_ptr<oxygen::Body> mBallBody;
+ boost::shared_ptr<oxygen::RigidBody> mBallBody;
/** reference to the agent aspect */
boost::shared_ptr<oxygen::AgentAspect> mAgent;
/** reference to the agentstate */
Modified: branches/treehole/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/driveeffector/driveeffector.h 2010-02-25 11:08:46 UTC (rev 175)
@@ -24,7 +24,7 @@
#include <salt/random.h>
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include <agentstate/agentstate.h>
class DriveEffector : public oxygen::Effector
@@ -84,7 +84,7 @@
/** the reference to the parent transform node */
boost::shared_ptr<oxygen::Transform> mTransformParent;
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
//! a reference to the agent state
boost::shared_ptr<AgentState> mAgentState;
Modified: branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp 2010-02-25 11:08:46 UTC (rev 175)
@@ -141,7 +141,7 @@
// parent should be a transform, or some other node, which has a
// Body-child
- mBody = shared_dynamic_cast<Body>(parent->GetChildOfClass("Body"));
+ mBody = shared_dynamic_cast<RigidBody>(parent->GetChildOfClass("RigidBody"));
if (mBody.get() == 0)
{
@@ -264,11 +264,11 @@
double tpos = servo_target_pos[i];
float err = servo_gain[i] * (tpos - servo_angle[i]);
- joint->SetParameter(dParamVel, err);
+ joint->SetParameter(2 /*dParamVel*/, err);
if (abs(err) > 0.00001)
{
- shared_ptr<Body> body = joint->GetBody(Joint::BI_FIRST);
+ shared_ptr<RigidBody> body = joint->GetBody(Joint::BI_FIRST);
if (body && !body->IsEnabled())
{
body->Enable();
Modified: branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.h
===================================================================
--- branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.h 2010-02-25 09:22:37 UTC (rev 174)
+++ branches/treehole/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.h 2010-02-25 11:08:46 UTC (rev 175)
@@ -23,7 +23,7 @@
#define HMDPEFFECTOR_H
#include <oxygen/agentaspect/effector.h>
-#include <oxygen/physicsserver/body.h>
+#include <oxygen/physicsserver/rigidbody.h>
#include "naospecific.h"
//! make it possible to have a pointer to the perceptor
@@ -112,7 +112,7 @@
protected:
/** the reference to the parents body node */
- boost::shared_ptr<oxygen::Body> mBody;
+ boost::shared_ptr<oxygen::RigidBody> mBody;
};
DECLARE_CLASS(HMDPEffector)
Modified: branches/treehole/rcssserver3d/plugin/soc...
[truncated message content] |
|
From: <a-...@us...> - 2010-02-25 09:22:43
|
Revision: 174
http://simspark.svn.sourceforge.net/simspark/?rev=174&view=rev
Author: a-held
Date: 2010-02-25 09:22:37 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
Create a new branch to hopefully fix all that tree conflict crap
Added Paths:
-----------
branches/treehole/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-25 07:00:02
|
Revision: 173
http://simspark.svn.sourceforge.net/simspark/?rev=173&view=rev
Author: a-held
Date: 2010-02-25 06:59:54 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
Clean up after SVN merge
Modified Paths:
--------------
branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
branches/multiphys/spark/lib/oxygen/CMakeLists.txt
Modified: branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp
===================================================================
--- branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp 2010-02-25 06:41:58 UTC (rev 172)
+++ branches/multiphys/rcssserver3d/plugin/soccer/hmdp_effector/hmdpeffector.cpp 2010-02-25 06:59:54 UTC (rev 173)
@@ -264,7 +264,7 @@
double tpos = servo_target_pos[i];
float err = servo_gain[i] * (tpos - servo_angle[i]);
- joint->SetParameter(dParamVel, err);
+ joint->SetParameter(2 /*dParamVel*/, err);
if (abs(err) > 0.00001)
{
Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-25 06:41:58 UTC (rev 172)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-25 06:59:54 UTC (rev 173)
@@ -89,8 +89,8 @@
physicsserver/int/universaljointint.h
physicsserver/int/worldint.h
- #proxyserver/agentproxy.h
- #proxyserver/proxyserver.h
+ proxyserver/agentproxy.h
+ proxyserver/proxyserver.h
sceneserver/sceneimporter.h
sceneserver/basenode.h
sceneserver/fpscontroller.h
@@ -121,8 +121,6 @@
monitorserver/monitoritem.h
monitorserver/custommonitor.h
monitorserver/monitorcmdparser.h
- proxyserver/agentproxy.h
- proxyserver/proxyserver.h
)
if(SPADES_FOUND)
set(oxygen_LIB_HDRS
@@ -229,10 +227,6 @@
physicsserver/angularmotor.cpp
physicsserver/angularmotor_c.cpp
- proxyserver/agentproxy.cpp
- proxyserver/proxyserver.cpp
- proxyserver/agentproxy_c.cpp
- proxyserver/proxyserver_c.cpp
sceneserver/basenode.cpp
sceneserver/basenode_c.cpp
sceneserver/fpscontroller.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-25 06:42:05
|
Revision: 172
http://simspark.svn.sourceforge.net/simspark/?rev=172&view=rev
Author: a-held
Date: 2010-02-25 06:41:58 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
merge trunk into branch to bring branch up to date
Modified Paths:
--------------
branches/multiphys/rcssserver3d/CMakeLists.txt
branches/multiphys/rcssserver3d/ChangeLog
branches/multiphys/rcssserver3d/NEWS
branches/multiphys/rcssserver3d/RELEASE
branches/multiphys/rcssserver3d/doc/users/definitions.tex
branches/multiphys/rcssserver3d/doc/users/gettingstarted.tex
branches/multiphys/rcssserver3d/doc/users/simulations.tex
branches/multiphys/rcssserver3d/doc/users/user-manual.tex
branches/multiphys/rcssserver3d/rcssmonitor3d/main.cpp
branches/multiphys/rcssserver3d/windows/install_extra.nsi
branches/multiphys/rcssserver3d/windows/uninstall_extra.nsi
branches/multiphys/spark/CMakeLists.txt
branches/multiphys/spark/ChangeLog
branches/multiphys/spark/NEWS
branches/multiphys/spark/RELEASE
branches/multiphys/spark/lib/oxygen/CMakeLists.txt
branches/multiphys/spark/lib/oxygen/physicsserver/world.h
Removed Paths:
-------------
branches/multiphys/rsgedit/.cproject
branches/multiphys/rsgedit/.project
Property Changed:
----------------
branches/multiphys/
branches/multiphys/rcssserver3d/rcssserver3d/
Property changes on: branches/multiphys
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:95-101
+ /trunk:95-171
Modified: branches/multiphys/rcssserver3d/CMakeLists.txt
===================================================================
--- branches/multiphys/rcssserver3d/CMakeLists.txt 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/CMakeLists.txt 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(rcssserver3d CXX C)
-set(PACKAGE_VERSION "0.6.2")
+set(PACKAGE_VERSION "0.6.3")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -86,29 +86,6 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
-if (WIN32) # try to find and install third-party .dlls to bin/ directory
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
- if (EXISTS ${ODEDLL})
- install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
- endif (EXISTS ${ODEDLL})
-
- install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
-
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
- if (EXISTS ${DevIL_DLL})
- install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
- endif (EXISTS ${DevIL_DLL})
-
- install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
- FILES_MATCHING PATTERN "*.dll")
-
- set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
- if (EXISTS ${SDL_DLL})
- install(PROGRAMS ${SDL_DLL} DESTINATION ${BINDIR})
- endif (EXISTS ${SDL_DLL})
-endif (WIN32)
-
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Modified: branches/multiphys/rcssserver3d/ChangeLog
===================================================================
--- branches/multiphys/rcssserver3d/ChangeLog 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/ChangeLog 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,3 +1,31 @@
+2010-01-18 Hedayat Vatankhah <he...@gr...>
+
+ * windows/uninstall_extra.nsi:
+ - rename: simspark -> rcssserver3d
+
+2010-01-17 Hedayat Vatankhah <he...@gr...>
+
+ * doc/users/gettingstarted.tex:
+ * doc/users/simulations.tex:
+ * doc/users/user-manual.tex:
+ - updated to reflect some new changes
+
+ * RELEASE:
+ * NEWS:
+ - preparing for a new release
+
+ * CMakeLists.txt:
+ - removed installation of third party libraries. these are now included
+ in simspark package.
+ - bumped package version to 0.6.3
+
+ * windows/install_extra.nsi:
+ - use rcssserver3d instead of simspark.
+ - added thirdparty library path to the path
+
+ * rcssserver3d/CMakeLists.txt:
+ - do not install shell scripts and symbolic links on Windows
+
2010-01-11 Hedayat Vatankhah <he...@gr...>
* RELEASE:
Modified: branches/multiphys/rcssserver3d/NEWS
===================================================================
--- branches/multiphys/rcssserver3d/NEWS 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/NEWS 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,3 +1,33 @@
+[0.6.3]
+In this release, we are preparing for a simulation with more robots than before.
+The current target is to have 6 vs 6 games, so we have made some changes to
+make the simulator more suitable for it. The most notable changes made in
+rcssserver3d package in this direction are:
+1. Disabling the internal monitor by default: starting from this version, the
+simulation server (simspark binary, now called rcssserver3d) no longer brings
+up a monitor when run. To actually view the simulation, a monitor (e.g.
+rcsmonitor3d which is included in this package) should be run separately. This
+separation noticeably improves the performance of the server. A new executable
+called "rcsoccersim3d" is provided which runs both the simulation server and a
+monitor on the local machine.
+2. Bigger field: in this version, field dimensions and goal width are 1.5 times
+larger than before to provide enough area for 6 vs 6 games.
+
+* New names:
+ - rcssserver3d: the old simspark binary has been renamed to rcssserver3d, as
+ it more clearly shows the functionality of the simulator. A symbolic link
+ called simspark is provided for compatibility.
+ - rcsoccersim3d: as stated above, running rcssserver3d (formerly simspark)
+ no longer starts a monitor to view the simulation, and a monitor should be
+ run separately. For users' convenience a new executable called rcsoccersim3d
+ is provided which runs both rcssserver3d and rcssmonitor3 to connect to
+ the running simulator.
+
+* Other notable changes:
+ - Added HMDP effector/perceptor
+ - Some compilation fixes
+ - Improved Windows support
+
[0.6.2]
This release is mainly a bug-fix release, and is the last release before
RoboCup 2009 competitions.
Modified: branches/multiphys/rcssserver3d/RELEASE
===================================================================
--- branches/multiphys/rcssserver3d/RELEASE 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/RELEASE 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,10 +1,30 @@
-RELEASE News of rcssserver3d-0.6.3 (In progress)
+RELEASE News of rcssserver3d-0.6.3
-* Most notable changes:
- - Name change: simspark -> rcssserver3d. To make the functionality more clear.
- - No internal monitor by default. Run rcssmonitor3d separately to see the game.
- As another option, you might run rcsoccersim3d which runs both
- rcssserver3d (simspark) and rcssmonitor3d on the local machine.
+In this release, we are preparing for a simulation with more robots than before.
+The current target is to have 6 vs 6 games, so we have made some changes to
+make the simulator more suitable for it. The most notable changes made in
+rcssserver3d package in this direction are:
+1. Disabling the internal monitor by default: starting from this version, the
+simulation server (simspark binary, now called rcssserver3d) no longer brings
+up a monitor when run. To actually view the simulation, a monitor (e.g.
+rcsmonitor3d which is included in this package) should be run separately. This
+separation noticeably improves the performance of the server. A new executable
+called "rcsoccersim3d" is provided which runs both the simulation server and a
+monitor on the local machine.
+2. Bigger field: in this version, field dimensions and goal width are 1.5 times
+larger than before to provide enough area for 6 vs 6 games.
+
+* New names:
+ - rcssserver3d: the old simspark binary has been renamed to rcssserver3d, as
+ it more clearly shows the functionality of the simulator. A symbolic link
+ called simspark is provided for compatibility.
+ - rcsoccersim3d: as stated above, running rcssserver3d (formerly simspark)
+ no longer starts a monitor to view the simulation, and a monitor should be
+ run separately. For users' convenience a new executable called rcsoccersim3d
+ is provided which runs both rcssserver3d and rcssmonitor3 to connect to
+ the running simulator.
+
+* Other notable changes:
- Added HMDP effector/perceptor
- Some compilation fixes
- Improved Windows support
Modified: branches/multiphys/rcssserver3d/doc/users/definitions.tex
===================================================================
--- branches/multiphys/rcssserver3d/doc/users/definitions.tex 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/doc/users/definitions.tex 2010-02-25 06:41:58 UTC (rev 172)
@@ -128,7 +128,7 @@
\vspace*{-0.25cm}
\hspace*{-3cm}%
\begin{minipage}[b]{3cm}
- \textsf{\Large\flushleft{February 2009}}
+ \textsf{\Large\flushleft{January 2010}}
\end{minipage}
\end{titlepage}%
Modified: branches/multiphys/rcssserver3d/doc/users/gettingstarted.tex
===================================================================
--- branches/multiphys/rcssserver3d/doc/users/gettingstarted.tex 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/doc/users/gettingstarted.tex 2010-02-25 06:41:58 UTC (rev 172)
@@ -5,8 +5,6 @@
\section{Download and Installation Instructions}
\label{section:install}
-%Currently the simspark SVN builds only for Linux (the Win32 build system is not yet ported/tested, so we should focus on *nix systems.
-
This chapter explains how to install SimSpark on an Ubuntu Linux. It should work with
slight modifications on other distributions like Fedora, Suse and
especially Debian system\footnote{For more guides please visit Simspark Wiki:
@@ -50,18 +48,21 @@
\begin{enumerate}
\item Ruby
\item The Open Dynamics Engine (ODE)
-\item The boost C++ libraries
+\item The Boost C++ Libraries
+\item Freetype
+\item Developer Image Library (DevIL)
+\item OpenGL
+\item SDL
\end{enumerate}
-The rendering of SimSpark can be omitted from the build process
+Some parts of SimSpark can be omitted from the build process
therefore these packages are optional:
\begin{enumerate}
-\item OpenGL
-\item SDL
-\item Freetype
-\item Developer Image Library (DevIL)
-\item Tiff library (libtiff)
+\item wxWidgets Library
+\item FMOD Sound Library
+\item Latex (pdflatex): to generate developers manual
+\item Doxygen: to generate API documentation
\end{enumerate}
\texttt{\$ sudo apt-get install g++ subversion cmake libfreetype6-dev libode0-dev libsdl-dev ruby1.8 ruby1.8-dev libdevil-dev libboost-dev libboost-thread-dev libboost-regex-dev}
@@ -145,7 +146,7 @@
\item Run the simulation
-\texttt{\$ simspark}
+\texttt{\$ rcsoccersim3d}
\item Optionally
@@ -197,7 +198,7 @@
\item{Start the Server}
The first step is to start the simulation server. To do this type
-\texttt{simspark} on the console. The server is by default configured
+\texttt{rcssserver3d} on the console. The server is by default configured
to run without internal monitor support and to start the soccer
simulation.
@@ -206,7 +207,7 @@
\begin{verbatim}
-simspark, a monolithic simulator 0.1
+rcssserver3d, a monolithic simulator 0.6.x
Copyright (C) 2004 Markus Rollmann,
Universit�t Koblenz.
Copyright (C) 2004, The RoboCup Soccer Server Maintenance Group.
Modified: branches/multiphys/rcssserver3d/doc/users/simulations.tex
===================================================================
--- branches/multiphys/rcssserver3d/doc/users/simulations.tex 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/doc/users/simulations.tex 2010-02-25 06:41:58 UTC (rev 172)
@@ -9,7 +9,7 @@
\subsection{Overview}
-We implemented a simulation for SimSpark where two teams of up to 5
+We implemented a simulation for SimSpark where two teams of up to 6
humanoid robots play soccer against each other. This seemingly simple
setup poses a challenge to agent implementers on several levels.
@@ -48,12 +48,12 @@
\subsection{Environment and Objects on the Field}
-The dimensions of the soccer field are 50 by 32 meters. The center
-spot has a radius of 4.5 meters. Each goal is 9 by 2 meter with a
-height of 4 meters. The soccer field is surrounded by a border of 10
+The dimensions of the soccer field are 18 by 12 meters. The center
+spot has a radius of 4.5 meters. Each goal is 2.1 by 0.6 meter with a
+height of 0.8 meters. The soccer field is surrounded by a border of 10
meters in each direction. Space outside this border area is not
-reachable by an agent. The soccer ball has a radius of 0.4 meter and a
-mass of 430 gram.
+reachable by an agent. The soccer ball has a radius of 0.04 meter and a
+mass of 26 grams.
At each corner of the soccer field, and at the goal posts, a distinctive
flag is placed. The positions of these flags are fixed and known to
Modified: branches/multiphys/rcssserver3d/doc/users/user-manual.tex
===================================================================
--- branches/multiphys/rcssserver3d/doc/users/user-manual.tex 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/doc/users/user-manual.tex 2010-02-25 06:41:58 UTC (rev 172)
@@ -4,7 +4,7 @@
\\ Feng Xue \\ Marian Buchta \\ Hedayat Vatankhah}
\title{Simspark User Manual}
-\date{February 2009}
+\date{January 2010}
\begin{document}
Modified: branches/multiphys/rcssserver3d/rcssmonitor3d/main.cpp
===================================================================
--- branches/multiphys/rcssserver3d/rcssmonitor3d/main.cpp 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/rcssmonitor3d/main.cpp 2010-02-25 06:41:58 UTC (rev 172)
@@ -31,7 +31,7 @@
#endif
#if __APPLE__
-#include <SDL.h>
+#include <SDL/SDL.h>
#endif
using namespace spark;
Property changes on: branches/multiphys/rcssserver3d/rcssserver3d
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/rcssserver3d/simspark:95-101
+ /trunk/rcssserver3d/rcssserver3d:102-171
/trunk/rcssserver3d/simspark:95-101
Modified: branches/multiphys/rcssserver3d/windows/install_extra.nsi
===================================================================
--- branches/multiphys/rcssserver3d/windows/install_extra.nsi 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/windows/install_extra.nsi 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,24 +1,24 @@
-CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Simspark.lnk" "$INSTDIR\bin\simspark.cmd"
+CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSServer3D.lnk" "$INSTDIR\bin\rcssserver3d.cmd"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSMonitor3D.lnk" "$INSTDIR\bin\rcssmonitor3d.cmd"
!insertmacro MUI_STARTMENU_WRITE_END
!define MUI_STARTMENUPAGE_CURRENT_ID "SOMETHING_NOT_AVAILABLE"
WriteRegExpandStr HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR' '$INSTDIR'
ClearErrors
-FileOpen $0 $INSTDIR\bin\simspark.cmd w
-FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileOpen $0 $INSTDIR\bin\rcssserver3d.cmd w
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
-FileWrite $0 'simspark.exe %1 %2 %3 %4'
+FileWrite $0 'rcssserver3d.exe %1 %2 %3 %4'
FileClose $0
ClearErrors
FileOpen $0 $INSTDIR\bin\rcssmonitor3d.cmd w
-FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
FileWrite $0 'rcssmonitor3d.exe %1 %2 %3 %4'
FileClose $0
ClearErrors
FileOpen $0 $INSTDIR\bin\rcssagent3d.cmd w
-FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
+FileWrite $0 'PATH=%PATH%;%SPARK_DIR%\lib\simspark;%SPARK_DIR%\lib\thirdparty;%RCSSSERVER3D_DIR%\lib\rcssserver3d$\n'
FileWrite $0 'cd "%RCSSSERVER3D_DIR%\bin\"$\n'
FileWrite $0 'rcssagent3d.exe %1 %2 %3 %4'
FileClose $0
Modified: branches/multiphys/rcssserver3d/windows/uninstall_extra.nsi
===================================================================
--- branches/multiphys/rcssserver3d/windows/uninstall_extra.nsi 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rcssserver3d/windows/uninstall_extra.nsi 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,4 +1,4 @@
-Delete '$INSTDIR\bin\simspark.cmd'
+Delete '$INSTDIR\bin\rcssserver3d.cmd'
Delete '$INSTDIR\bin\rcssmonitor3d.cmd'
Delete '$INSTDIR\bin\rcssagent3d.cmd'
DeleteRegValue HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR'
@@ -6,5 +6,5 @@
Var /GLOBAL STARTMENU_DIR_FORLINKS
!insertmacro MUI_STARTMENU_GETFOLDER Application $STARTMENU_DIR_FORLINKS
-Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\Simspark.lnk"
+Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\RCSSServer3D.lnk"
Delete "$SMPROGRAMS\$STARTMENU_DIR_FORLINKS\RCSSMonitor3D.lnk"
Deleted: branches/multiphys/rsgedit/.cproject
===================================================================
--- branches/multiphys/rsgedit/.cproject 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rsgedit/.cproject 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="org.eclipse.linuxtools.cdt.autotools.configuration.build.1624744412">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.configuration.build.1624744412" moduleId="org.eclipse.cdt.core.settings" name="Build (GNU)">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.linuxtools.cdt.autotools.AutotoolsScannerInfoProvider" point="org.eclipse.cdt.core.ScannerInfoProvider"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="rsgedit" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.configuration.build.1624744412" name="Build (GNU)" parent="org.eclipse.linuxtools.cdt.autotools.configuration.build">
-<folderInfo id="org.eclipse.linuxtools.cdt.autotools.configuration.build.1624744412." name="/" resourcePath="">
-<toolChain id="org.eclipse.linuxtools.cdt.autotools.toolChain.1056057064" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.toolChain">
-<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform.757894881" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform"/>
-<builder buildPath="${workspace_loc:/rsgedit/build}" id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.2124673284" managedBuildOn="true" name="Autotools Makefile Generator.Build (GNU)" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.builder"/>
-<tool id="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure.1477411908" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure"/>
-<tool id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen.2131199809" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen"/>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.configuration.build.1624744412;org.eclipse.linuxtools.cdt.autotools.configuration.build.1624744412.">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="rsgedit.org.eclipse.linuxtools.cdt.autotools.projectType.255708800" name="GNU Autotools" projectType="org.eclipse.linuxtools.cdt.autotools.projectType"/>
-</storageModule>
-</cproject>
Deleted: branches/multiphys/rsgedit/.project
===================================================================
--- branches/multiphys/rsgedit/.project 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/rsgedit/.project 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>rsgedit</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.linuxtools.cdt.autotools.genmakebuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.cdt.core.ccnature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
- <nature>org.eclipse.cdt.core.cnature</nature>
- </natures>
-</projectDescription>
Modified: branches/multiphys/spark/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/CMakeLists.txt 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/spark/CMakeLists.txt 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(simspark CXX C)
-set(PACKAGE_VERSION "0.1.2")
+set(PACKAGE_VERSION "0.2")
########## check for headerfiles/libraries ##########
include(CheckIncludeFile)
@@ -143,15 +143,15 @@
set(SALT_SO_VERSION 0)
set(SALT_VERSION ${SALT_SO_VERSION}.3.2)
set(ZEITGEIST_SO_VERSION 3)
-set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.0.2)
+set(ZEITGEIST_VERSION ${ZEITGEIST_SO_VERSION}.1.0)
set(OXYGEN_SO_VERSION 3)
-set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.2.4)
+set(OXYGEN_VERSION ${OXYGEN_SO_VERSION}.3.0)
set(KEROSIN_SO_VERSION 1)
-set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.0.2)
+set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.1.0)
set(SPARK_SO_VERSION 0)
set(SPARK_VERSION ${SPARK_SO_VERSION}.0.0)
set(RCSSNET_SO_VERSION 0)
-set(RCSSNET_VERSION ${RCSSNET_SO_VERSION}.0.0)
+set(RCSSNET_VERSION ${RCSSNET_SO_VERSION}.1.0)
########## additional variables for -config scripts ##########
set(prefix ${CMAKE_INSTALL_PREFIX})
@@ -190,6 +190,35 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sparkconfig.h DESTINATION
${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+if (WIN32) # try to find and install third-party .dlls to lib/thirdparty directory
+ set(THLIBDIR ${LIBDIR}/thirdparty)
+
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
+ if (EXISTS ${ODEDLL})
+ install(PROGRAMS ${ODEDLL} DESTINATION ${THLIBDIR})
+ endif (EXISTS ${ODEDLL})
+
+ install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${THLIBDIR}
+ FILES_MATCHING PATTERN "*.dll")
+
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
+ if (EXISTS ${DevIL_DLL})
+ install(PROGRAMS ${DevIL_DLL} DESTINATION ${THLIBDIR})
+ endif (EXISTS ${DevIL_DLL})
+
+ 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 "*.dll")
+
+ set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
+ if (EXISTS ${SDL_DLL})
+ install(PROGRAMS ${SDL_DLL} DESTINATION ${THLIBDIR})
+ endif (EXISTS ${SDL_DLL})
+endif (WIN32)
+
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Modified: branches/multiphys/spark/ChangeLog
===================================================================
--- branches/multiphys/spark/ChangeLog 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/spark/ChangeLog 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,3 +1,19 @@
+2010-01-17 Hedayat Vatankhah <he...@gr...>
+
+ * NEWS:
+ * RELEASE:
+ - preparing for the new release (0.2)
+
+ * lib/oxygen/proxyserver/agentproxy.cpp:
+ - added a temporary workaround to allow compilation under windows
+
+ * CMakeLists.txt:
+ - add required third party .dlls on windows to simspark rather than
+ rcssserver3d, which will be installed in lib/thirdparty directory.
+ ruby dlls will be included too.
+ - bumped library major versions: zeitgeist, oxygen, kerosin and rcssnet
+ - bumped package version to 0.2
+
2010-01-01 Hedayat Vatankhah <he...@gr...>
* lib/oxygen/proxyserver/proxyserver.h:
Modified: branches/multiphys/spark/NEWS
===================================================================
--- branches/multiphys/spark/NEWS 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/spark/NEWS 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,3 +1,37 @@
+[0.2]
+In this release you can find some bug and compilation fixes, improved Windows
+support and some new features including a new sensor and features to facilitate
+agent debugging and development. It also provides a more deterministic behavior
+for agents which should make them more reliable.
+
+* New features:
+ - An Accelerometer sensor which reports the linear acceleration
+ - A "Sync Mode" operation is introduced. In this mode, the server will not
+ advance to the next cycle until all connected agents send a "(syn)" command
+ to the server. You can use this mode by setting "agentSyncMode" to true in
+ simspark.rb (or spark.rb)
+ - Simulator will run in simulation time mode instead of real time
+ if "useRealTime" variable is set to false in simspark.rb (or spark.rb)
+
+* More deterministic agent-server communication
+ - Simspark will now collect received commands right before sending
+ sense data of the last cycle. So, any commands which is sent by agents
+ after receiving new sense data will be executed in the next cycle, not the
+ current one. This results in a more deterministic behavior, and agents'
+ efficiency should not change between remote and local runs considerably.
+
+* More convenience:
+ - Simspark should always accept connections. No more "Connection refused"
+ messages and the need to wait for simspark's network port to be freed!
+ - To make changes to most of the resource files (e.g. simspark.rb), you can
+ create a copy in ~/.simspark directory and make desired changes there. The
+ directory structure of the original files should be preserved (e.g.
+ rsg/agent/nao/nao.rgs)
+
+* Fixes:
+ - Compilation fixes
+ - Fixed some rendering bugs (agents not visible through goals)
+
[0.1.2]
This release brings some bugfixes, better performance and also better Windows
support. A Windows installer will be available too. This is the first version
Modified: branches/multiphys/spark/RELEASE
===================================================================
--- branches/multiphys/spark/RELEASE 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/spark/RELEASE 2010-02-25 06:41:58 UTC (rev 172)
@@ -1,12 +1,20 @@
-RELEASE News of simspark-0.1.3 (in progress)
+RELEASE News of simspark-0.2
-SOME INTERESTING COMMENTS!
+In this release you can find some bug and compilation fixes, improved Windows
+support and some new features including a new sensor and features to facilitate
+agent debugging and development. It also provides a more deterministic behavior
+for agents which should make them more reliable.
-Main changes of this release are:
- - Compilation fixes
- - Improved Windows support
- - Simspark should always accept connections. No more "Connection refused"
- messages and the need to wait for simspark's network port to be freed!
+* New features:
+ - An Accelerometer sensor which reports the linear acceleration
+ - A "Sync Mode" operation is introduced. In this mode, the server will not
+ advance to the next cycle until all connected agents send a "(syn)" command
+ to the server. You can use this mode by setting "agentSyncMode" to true in
+ simspark.rb (or spark.rb)
+ - Simulator will run in simulation time mode instead of real time
+ if "useRealTime" variable is set to false in simspark.rb (or spark.rb)
+
+* More deterministic agent-server communication
- Simspark will now collect received commands right before sending
sense data of the last cycle. So, any commands which is sent by agents
after receiving new sense data will be executed in the next cycle, not the
@@ -25,5 +33,17 @@
directory structure of the original files should be preserved (e.g.
rsg/agent/nao/nao.rgs)
+* More convenience:
+ - Simspark should always accept connections. No more "Connection refused"
+ messages and the need to wait for simspark's network port to be freed!
+ - To make changes to most of the resource files (e.g. simspark.rb), you can
+ create a copy in ~/.simspark directory and make desired changes there. The
+ directory structure of the original files should be preserved (e.g.
+ rsg/agent/nao/nao.rgs)
+
+* Fixes:
+ - Compilation fixes
+ - Fixed some rendering bugs (agents not visible through goals)
+
You can get the package on the Simspark page on SourceForge
at http://sourceforge.net/projects/simspark/
Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-25 06:41:58 UTC (rev 172)
@@ -121,6 +121,8 @@
monitorserver/monitoritem.h
monitorserver/custommonitor.h
monitorserver/monitorcmdparser.h
+ proxyserver/agentproxy.h
+ proxyserver/proxyserver.h
)
if(SPADES_FOUND)
set(oxygen_LIB_HDRS
@@ -283,6 +285,10 @@
monitorserver/custommonitor_c.cpp
monitorserver/monitorcmdparser.cpp
monitorserver/monitorcmdparser_c.cpp
+ proxyserver/agentproxy.cpp
+ proxyserver/agentproxy_c.cpp
+ proxyserver/proxyserver.cpp
+ proxyserver/proxyserver_c.cpp
)
if(SPADES_FOUND)
set(oxygen_LIB_SRCS
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/world.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/world.h 2010-02-24 05:31:06 UTC (rev 171)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/world.h 2010-02-25 06:41:58 UTC (rev 172)
@@ -127,6 +127,6 @@
DECLARE_CLASS(World);
-}
+};
#endif //OXYGEN_WORLD_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-24 05:31:13
|
Revision: 171
http://simspark.svn.sourceforge.net/simspark/?rev=171&view=rev
Author: a-held
Date: 2010-02-24 05:31:06 +0000 (Wed, 24 Feb 2010)
Log Message:
-----------
Set SVN properties of the rest of the new files (or did I forget some?)
Modified Paths:
--------------
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/staticbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/universaljointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/worldint.h
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/softbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/softbody_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody_c.cpp
Property Changed:
----------------
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/staticbodyint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/transformcolliderint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/universaljointint.h
branches/multiphys/spark/lib/oxygen/physicsserver/int/worldint.h
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/softbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/softbody_c.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody_c.cpp
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: joint.h 107 2009-11-25 06:09:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: joint.h 107 2009-11-25 06:09:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: body.h 106 2009-11-19 10:10:50Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: joint.h 107 2009-11-25 06:09:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: joint.h 107 2009-11-25 06:09:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp 2010-02-24 05:31:06 UTC (rev 171)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: odeobject_c.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/genericphysicsobjects.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/genericphysicsobjects.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: joint.h 107 2009-11-25 06:09:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/genericphysicsobjects.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/angularmotorint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/balljointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/bodyint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/boxcolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/capsulecolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/colliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/compoundcolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/concavecolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/conecolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/conetwistjointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $Id$
This program is free software= 0; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/contactjointhandlerint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/convexcolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/cylindercolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/dynamicbodyint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/emptycolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: fixedjoint.h 108 2009-11-25 10:20:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/fixedjointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/generic6dofjointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: hingejoint.h 108 2009-11-25 10:20:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/hinge2jointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: hingejoint.h 108 2009-11-25 10:20:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/hingejointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/jointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsobjectint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/planecolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: raycolliderint.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/raycolliderint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/rigidbodyint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/sliderjointint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/softbodyint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h 2010-02-24 05:22:23 UTC (rev 170)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h 2010-02-24 05:31:06 UTC (rev 171)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/lib/oxygen/physicsserver/int/spaceint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/spherecolliderint.h
====================================...
[truncated message content] |
|
From: <a-...@us...> - 2010-02-24 05:22:30
|
Revision: 170
http://simspark.svn.sourceforge.net/simspark/?rev=170&view=rev
Author: a-held
Date: 2010-02-24 05:22:23 +0000 (Wed, 24 Feb 2010)
Log Message:
-----------
Set svn:keywords property to Id
Modified Paths:
--------------
branches/multiphys/spark/plugin/odeimps/export.cpp
branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp
branches/multiphys/spark/plugin/odeimps/odeangularmotor.h
branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp
branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp
branches/multiphys/spark/plugin/odeimps/odeballjoint.h
branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odebody.cpp
branches/multiphys/spark/plugin/odeimps/odebody.h
branches/multiphys/spark/plugin/odeimps/odebody_c.cpp
branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp
branches/multiphys/spark/plugin/odeimps/odeboxcollider.h
branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp
branches/multiphys/spark/plugin/odeimps/odecapsulecollider.h
branches/multiphys/spark/plugin/odeimps/odecapsulecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecollider.cpp
branches/multiphys/spark/plugin/odeimps/odecollider.h
branches/multiphys/spark/plugin/odeimps/odecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecompoundcollider.cpp
branches/multiphys/spark/plugin/odeimps/odecompoundcollider.h
branches/multiphys/spark/plugin/odeimps/odecompoundcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconcavecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconcavecollider.h
branches/multiphys/spark/plugin/odeimps/odeconcavecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconecollider.h
branches/multiphys/spark/plugin/odeimps/odeconecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.cpp
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.h
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.cpp
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.h
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconvexcollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconvexcollider.h
branches/multiphys/spark/plugin/odeimps/odeconvexcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecylindercollider.cpp
branches/multiphys/spark/plugin/odeimps/odecylindercollider.h
branches/multiphys/spark/plugin/odeimps/odecylindercollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odedynamicbody.cpp
branches/multiphys/spark/plugin/odeimps/odedynamicbody.h
branches/multiphys/spark/plugin/odeimps/odedynamicbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odeemptycollider.cpp
branches/multiphys/spark/plugin/odeimps/odeemptycollider.h
branches/multiphys/spark/plugin/odeimps/odeemptycollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odefixedjoint.cpp
branches/multiphys/spark/plugin/odeimps/odefixedjoint.h
branches/multiphys/spark/plugin/odeimps/odefixedjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.cpp
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.h
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odehinge2joint.cpp
branches/multiphys/spark/plugin/odeimps/odehinge2joint.h
branches/multiphys/spark/plugin/odeimps/odehinge2joint_c.cpp
branches/multiphys/spark/plugin/odeimps/odehingejoint.cpp
branches/multiphys/spark/plugin/odeimps/odehingejoint.h
branches/multiphys/spark/plugin/odeimps/odehingejoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odejoint.cpp
branches/multiphys/spark/plugin/odeimps/odejoint.h
branches/multiphys/spark/plugin/odeimps/odejoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsobject.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsobject.h
branches/multiphys/spark/plugin/odeimps/odephysicsobject_c.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsserver.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsserver.h
branches/multiphys/spark/plugin/odeimps/odephysicsserver_c.cpp
branches/multiphys/spark/plugin/odeimps/odeplanecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeplanecollider.h
branches/multiphys/spark/plugin/odeimps/odeplanecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/oderaycollider.cpp
branches/multiphys/spark/plugin/odeimps/oderaycollider.h
branches/multiphys/spark/plugin/odeimps/oderaycollider_c.cpp
branches/multiphys/spark/plugin/odeimps/oderigidbody.cpp
branches/multiphys/spark/plugin/odeimps/oderigidbody.h
branches/multiphys/spark/plugin/odeimps/oderigidbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odesliderjoint.cpp
branches/multiphys/spark/plugin/odeimps/odesliderjoint.h
branches/multiphys/spark/plugin/odeimps/odesliderjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odesoftbody.cpp
branches/multiphys/spark/plugin/odeimps/odesoftbody.h
branches/multiphys/spark/plugin/odeimps/odesoftbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odespace.cpp
branches/multiphys/spark/plugin/odeimps/odespace.h
branches/multiphys/spark/plugin/odeimps/odespace_c.cpp
branches/multiphys/spark/plugin/odeimps/odespherecollider.cpp
branches/multiphys/spark/plugin/odeimps/odespherecollider.h
branches/multiphys/spark/plugin/odeimps/odespherecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odestaticbody.cpp
branches/multiphys/spark/plugin/odeimps/odestaticbody.h
branches/multiphys/spark/plugin/odeimps/odestaticbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odetransformcollider.cpp
branches/multiphys/spark/plugin/odeimps/odetransformcollider.h
branches/multiphys/spark/plugin/odeimps/odetransformcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint.cpp
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint.h
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odeworld.cpp
branches/multiphys/spark/plugin/odeimps/odeworld.h
branches/multiphys/spark/plugin/odeimps/odeworld_c.cpp
branches/multiphys/spark/plugin/odeimps/odewrapper.h
Property Changed:
----------------
branches/multiphys/spark/plugin/odeimps/CMakeLists.txt
branches/multiphys/spark/plugin/odeimps/export.cpp
branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp
branches/multiphys/spark/plugin/odeimps/odeangularmotor.h
branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp
branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp
branches/multiphys/spark/plugin/odeimps/odeballjoint.h
branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odebody.cpp
branches/multiphys/spark/plugin/odeimps/odebody.h
branches/multiphys/spark/plugin/odeimps/odebody_c.cpp
branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp
branches/multiphys/spark/plugin/odeimps/odeboxcollider.h
branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp
branches/multiphys/spark/plugin/odeimps/odecapsulecollider.h
branches/multiphys/spark/plugin/odeimps/odecapsulecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecollider.cpp
branches/multiphys/spark/plugin/odeimps/odecollider.h
branches/multiphys/spark/plugin/odeimps/odecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecompoundcollider.cpp
branches/multiphys/spark/plugin/odeimps/odecompoundcollider.h
branches/multiphys/spark/plugin/odeimps/odecompoundcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconcavecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconcavecollider.h
branches/multiphys/spark/plugin/odeimps/odeconcavecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconecollider.h
branches/multiphys/spark/plugin/odeimps/odeconecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.cpp
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.h
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.cpp
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.h
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconvexcollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconvexcollider.h
branches/multiphys/spark/plugin/odeimps/odeconvexcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecylindercollider.cpp
branches/multiphys/spark/plugin/odeimps/odecylindercollider.h
branches/multiphys/spark/plugin/odeimps/odecylindercollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odedynamicbody.cpp
branches/multiphys/spark/plugin/odeimps/odedynamicbody.h
branches/multiphys/spark/plugin/odeimps/odedynamicbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odeemptycollider.cpp
branches/multiphys/spark/plugin/odeimps/odeemptycollider.h
branches/multiphys/spark/plugin/odeimps/odeemptycollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odefixedjoint.cpp
branches/multiphys/spark/plugin/odeimps/odefixedjoint.h
branches/multiphys/spark/plugin/odeimps/odefixedjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.cpp
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.h
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odehinge2joint.cpp
branches/multiphys/spark/plugin/odeimps/odehinge2joint.h
branches/multiphys/spark/plugin/odeimps/odehinge2joint_c.cpp
branches/multiphys/spark/plugin/odeimps/odehingejoint.cpp
branches/multiphys/spark/plugin/odeimps/odehingejoint.h
branches/multiphys/spark/plugin/odeimps/odehingejoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odejoint.cpp
branches/multiphys/spark/plugin/odeimps/odejoint.h
branches/multiphys/spark/plugin/odeimps/odejoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsobject.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsobject.h
branches/multiphys/spark/plugin/odeimps/odephysicsobject_c.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsserver.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsserver.h
branches/multiphys/spark/plugin/odeimps/odephysicsserver_c.cpp
branches/multiphys/spark/plugin/odeimps/odeplanecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeplanecollider.h
branches/multiphys/spark/plugin/odeimps/odeplanecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/oderaycollider.cpp
branches/multiphys/spark/plugin/odeimps/oderaycollider.h
branches/multiphys/spark/plugin/odeimps/oderaycollider_c.cpp
branches/multiphys/spark/plugin/odeimps/oderigidbody.cpp
branches/multiphys/spark/plugin/odeimps/oderigidbody.h
branches/multiphys/spark/plugin/odeimps/oderigidbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odesliderjoint.cpp
branches/multiphys/spark/plugin/odeimps/odesliderjoint.h
branches/multiphys/spark/plugin/odeimps/odesliderjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odesoftbody.cpp
branches/multiphys/spark/plugin/odeimps/odesoftbody.h
branches/multiphys/spark/plugin/odeimps/odesoftbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odespace.cpp
branches/multiphys/spark/plugin/odeimps/odespace.h
branches/multiphys/spark/plugin/odeimps/odespace_c.cpp
branches/multiphys/spark/plugin/odeimps/odespherecollider.cpp
branches/multiphys/spark/plugin/odeimps/odespherecollider.h
branches/multiphys/spark/plugin/odeimps/odespherecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odestaticbody.cpp
branches/multiphys/spark/plugin/odeimps/odestaticbody.h
branches/multiphys/spark/plugin/odeimps/odestaticbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odetransformcollider.cpp
branches/multiphys/spark/plugin/odeimps/odetransformcollider.h
branches/multiphys/spark/plugin/odeimps/odetransformcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint.cpp
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint.h
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odeworld.cpp
branches/multiphys/spark/plugin/odeimps/odeworld.h
branches/multiphys/spark/plugin/odeimps/odeworld_c.cpp
branches/multiphys/spark/plugin/odeimps/odewrapper.h
Property changes on: branches/multiphys/spark/plugin/odeimps/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/export.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/export.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/export.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: export.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/export.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: angularmotor.cpp 127 2009-12-22 08:21:04Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeangularmotor.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeangularmotor.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeangularmotor.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeangularmotor.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: balljoint.cpp 112 2009-12-02 10:06:02Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeballjoint.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeballjoint.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeballjoint.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeballjoint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odebody.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odebody.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odebody.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odebody.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odebody.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odebody.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odebody.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odebody.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odebody.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odebody_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odebody_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odebody_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odebody_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: boxcollider.cpp 108 2009-11-25 10:20:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeboxcollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeboxcollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeboxcollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,8 +4,8 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.h 56 2009-03-17 18:03:47Z hedayat $
- $Id: odeobject.h 56 2009-03-17 18:03:47Z hedayat $
+ $Id$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeboxcollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: capsulecollider.cpp 108 2009-11-25 10:20:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecapsulecollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecapsulecollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecapsulecollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecapsulecollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecapsulecollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecapsulecollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecapsulecollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecapsulecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -3,7 +3,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: collider.cpp 115 2009-12-07 08:43:40Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: space.h 102 2009-11-18 07:24:29Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecompoundcollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecompoundcollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecompoundcollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecompoundcollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecompoundcollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecompoundcollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecompoundcollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecompoundcollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecompoundcollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecompoundcollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecompoundcollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecompoundcollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconcavecollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconcavecollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconcavecollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconcavecollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconcavecollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconcavecollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconcavecollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconcavecollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconcavecollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconcavecollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconcavecollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconcavecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconecollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconecollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconecollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconecollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconecollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconecollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconecollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconecollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconecollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconecollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconecollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconecollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconetwistjoint_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconetwistjoint_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconetwistjoint_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconetwistjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: universaljoint.cpp 112 2009-12-02 10:06:02Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecontactjointhandler_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecontactjointhandler_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecontactjointhandler_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecontactjointhandler_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconvexcollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconvexcollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconvexcollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconvexcollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconvexcollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconvexcollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconvexcollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconvexcollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeconvexcollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeconvexcollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeconvexcollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeconvexcollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecylindercollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecylindercollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecylindercollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecylindercollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecylindercollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecylindercollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecylindercollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecylindercollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odecylindercollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecylindercollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odecylindercollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odecylindercollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odedynamicbody.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odedynamicbody.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odedynamicbody.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odedynamicbody.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odedynamicbody.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odedynamicbody.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odedynamicbody.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odedynamicbody.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odedynamicbody_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odedynamicbody_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odedynamicbody_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odedynamicbody_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeemptycollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeemptycollider.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeemptycollider.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeemptycollider.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeemptycollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeemptycollider.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeemptycollider.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeemptycollider.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odeemptycollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeemptycollider_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odeemptycollider_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odeemptycollider_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odefixedjoint.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odefixedjoint.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odefixedjoint.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: fixedjoint.cpp 112 2009-12-02 10:06:02Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odefixedjoint.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odefixedjoint.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odefixedjoint.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odefixedjoint.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: fixedjoint.h 108 2009-11-25 10:20:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odefixedjoint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odefixedjoint_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odefixedjoint_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odefixedjoint_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odefixedjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -4,7 +4,7 @@
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
- $Id: odeobject.cpp 3 2008-11-21 02:38:08Z hedayat $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odehinge2joint.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odehinge2joint.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odehinge2joint.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: hinge2joint.cpp 112 2009-12-02 10:06:02Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odehinge2joint.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odehinge2joint.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odehinge2joint.h 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odehinge2joint.h 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: hingejoint.h 108 2009-11-25 10:20:10Z a-held $
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odehinge2joint.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odehinge2joint_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odehinge2joint_c.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odehinge2joint_c.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $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
Property changes on: branches/multiphys/spark/plugin/odeimps/odehinge2joint_c.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: branches/multiphys/spark/plugin/odeimps/odehingejoint.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odehingejoint.cpp 2010-02-24 05:11:43 UTC (rev 169)
+++ branches/multiphys/spark/plugin/odeimps/odehingejoint.cpp 2010-02-24 05:22:23 UTC (rev 170)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2003 Koblenz University
- $Id: hingejoint.cpp 112 2009-12-02 10:06:02Z a-held $
+ $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
Property changes on: branches/multiph...
[truncated message content] |
|
From: <a-...@us...> - 2010-02-24 05:11:50
|
Revision: 169
http://simspark.svn.sourceforge.net/simspark/?rev=169&view=rev
Author: a-held
Date: 2010-02-24 05:11:43 +0000 (Wed, 24 Feb 2010)
Log Message:
-----------
Undo some temporal changes to prepare for svn merge
Modified Paths:
--------------
branches/multiphys/rcssserver3d/data/rsg/agent/nao/soccer.rsg
branches/multiphys/rcssserver3d/rcssserver3d/rcsoccersim3d.in
branches/multiphys/spark/lib/oxygen/CMakeLists.txt
Modified: branches/multiphys/rcssserver3d/data/rsg/agent/nao/soccer.rsg
===================================================================
--- branches/multiphys/rcssserver3d/data/rsg/agent/nao/soccer.rsg 2010-02-23 09:13:36 UTC (rev 168)
+++ branches/multiphys/rcssserver3d/data/rsg/agent/nao/soccer.rsg 2010-02-24 05:11:43 UTC (rev 169)
@@ -81,49 +81,6 @@
)
)
-; create falling box
- (nd AgentAspect
- (setName fallBox)
- (setLocalPos -4.9 -3.5 200)
- (importScene rsg/boxspheres/box.rsg 1 1 1 100 matGrey)
-)
-
- (nd AgentAspect
- (setName 2Box)
- (setLocalPos -4.9 -3.5 0.5)
- (importScene rsg/boxspheres/box.rsg 1 0.1 2 1 matRed)
-)
-
-(nd AgentAspect
- (setName 3Box)
- (setLocalPos -4.9 -2 0.5)
- (importScene rsg/boxspheres/box.rsg 1 0.1 2 1 matRed)
-)
-
-(nd AgentAspect
- (setName 4Box)
- (setLocalPos -4.9 -0.5 0.5)
- (importScene rsg/boxspheres/box.rsg 1 0.1 2 2 matRed)
-)
-
-(nd AgentAspect
- (setName 5Box)
- (setLocalPos -4.9 1 0.5)
- (importScene rsg/boxspheres/box.rsg 1 0.1 2 2 matRed)
-)
-
-(nd AgentAspect
- (setName 6Box)
- (setLocalPos -4.9 2.5 0.5)
- (importScene rsg/boxspheres/box.rsg 1 0.1 2 3 matRed)
-)
-
-(nd AgentAspect
- (setName Sphere)
- (setLocalPos -4.9 -4.2 0.5)
- (importScene rsg/boxspheres/sphere.rsg 0.5 0.2 matYellow)
-)
-
; create skybox
(nd Transform
(setLocalPos 0 0 0)
Modified: branches/multiphys/rcssserver3d/rcssserver3d/rcsoccersim3d.in
===================================================================
--- branches/multiphys/rcssserver3d/rcssserver3d/rcsoccersim3d.in 2010-02-23 09:13:36 UTC (rev 168)
+++ branches/multiphys/rcssserver3d/rcssserver3d/rcsoccersim3d.in 2010-02-24 05:11:43 UTC (rev 169)
@@ -67,6 +67,6 @@
sleep 2
-$MON & $AGT
+$MON
kill_server
Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-23 09:13:36 UTC (rev 168)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-24 05:11:43 UTC (rev 169)
@@ -227,10 +227,10 @@
physicsserver/angularmotor.cpp
physicsserver/angularmotor_c.cpp
- #proxyserver/agentproxy.cpp
- #proxyserver/proxyserver.cpp
- #proxyserver/agentproxy_c.cpp
- #proxyserver/proxyserver_c.cpp
+ proxyserver/agentproxy.cpp
+ proxyserver/proxyserver.cpp
+ proxyserver/agentproxy_c.cpp
+ proxyserver/proxyserver_c.cpp
sceneserver/basenode.cpp
sceneserver/basenode_c.cpp
sceneserver/fpscontroller.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-23 09:13:44
|
Revision: 168
http://simspark.svn.sourceforge.net/simspark/?rev=168&view=rev
Author: a-held
Date: 2010-02-23 09:13:36 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
Completely separated odeimps as a plugin
Modified Paths:
--------------
branches/multiphys/spark/lib/oxygen/CMakeLists.txt
branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h
branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.h
branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/softbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.h
branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp
Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt 2010-02-23 09:13:36 UTC (rev 168)
@@ -302,7 +302,7 @@
add_library(oxygen ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES}
- ${ODE_LIBRARY} ${oxygen_require_libs} odeimps)
+ ${ODE_LIBRARY} ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -42,6 +42,8 @@
void Body::OnLink()
{
+ PhysicsObject::OnLink();
+
if (mBodyImp.get() == 0)
mBodyImp = shared_dynamic_cast<BodyInt>
(GetCore()->New("BodyImp"));
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,25 +20,21 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/odeboxcollider.h>
#include <oxygen/physicsserver/boxcollider.h>
#include <oxygen/physicsserver/int/boxcolliderint.h>
+#include <iostream>
using namespace oxygen;
using namespace salt;
+using namespace boost;
boost::shared_ptr<BoxColliderInt> BoxCollider::mBoxColliderImp;
BoxCollider::BoxCollider() : ConvexCollider()
{
- mBoxColliderImp = boost::shared_ptr<BoxColliderImp>(new BoxColliderImp());
-}
+
+}
-void BoxCollider::OnLink()
-{
- Collider::OnLink();
-}
-
void BoxCollider::SetBoxLengths(const Vector3f& extents)
{
mBoxColliderImp->SetBoxLengths(extents, mGeomID);
@@ -46,6 +42,17 @@
bool BoxCollider::ConstructInternal()
{
+ if (mBoxColliderImp.get() == 0)
+ mBoxColliderImp = shared_dynamic_cast<BoxColliderInt>
+ (GetCore()->New("BoxColliderImp"));
+
+ if (mBoxColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(BoxCollider) ERROR: Found no implementation at '/classes/BoxColliderImp'";
+ return false;
+ }
+
if (! Collider::ConstructInternal())
{
return false;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -38,7 +38,6 @@
//
public:
BoxCollider();
- virtual void OnLink();
/** sets the side lengths of the box geom */
void SetBoxLengths(const salt::Vector3f& extents);
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,18 @@
*/
#include <oxygen/physicsserver/capsulecollider.h>
-#include <../plugin/odeimps/odecapsulecollider.h>
+#include <oxygen/physicsserver/int/capsulecolliderint.h>
+#include <iostream>
using namespace oxygen;
using namespace salt;
+using namespace boost;
boost::shared_ptr<CapsuleColliderInt> CapsuleCollider::mCapsuleColliderImp;
CapsuleCollider::CapsuleCollider() : ConvexCollider()
{
- mCapsuleColliderImp = boost::shared_ptr<CapsuleColliderImp>(new CapsuleColliderImp());
+
}
void CapsuleCollider::SetParams(float radius, float length)
@@ -64,6 +66,17 @@
bool CapsuleCollider::ConstructInternal()
{
+ if (mCapsuleColliderImp.get() == 0)
+ mCapsuleColliderImp = shared_dynamic_cast<CapsuleColliderInt>
+ (GetCore()->New("CapsuleColliderImp"));
+
+ if (mCapsuleColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(CapsuleCollider) ERROR: Found no implementation at '/classes/CapsuleColliderImp'";
+ return false;
+ }
+
if (! Collider::ConstructInternal())
{
return false;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,7 +20,7 @@
*/
#include <oxygen/physicsserver/genericphysicsobjects.h>
#include <oxygen/physicsserver/collider.h>
-#include <../plugin/odeimps/odecollider.h>
+#include <oxygen/physicsserver/int/colliderint.h>
#include <oxygen/physicsserver/collisionhandler.h>
#include <oxygen/physicsserver/space.h>
#include <oxygen/physicsserver/transformcollider.h>
@@ -38,7 +38,7 @@
Collider::Collider() : PhysicsObject(), mGeomID(0)
{
- mColliderImp = boost::shared_ptr<ColliderImp>(new ColliderImp());
+
}
Collider::~Collider()
@@ -48,6 +48,11 @@
void Collider::OnLink()
{
PhysicsObject::OnLink();
+
+ if (mColliderImp.get() == 0)
+ mColliderImp = shared_dynamic_cast<ColliderInt>
+ (GetCore()->New("ColliderImp"));
+
if (mGeomID == 0) return;
weak_ptr<Node> parent = GetParent();
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,40 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/compoundcollider.h>
-#include <../plugin/odeimps/odecompoundcollider.h>
+#include <oxygen/physicsserver/int/compoundcolliderint.h>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<CompoundColliderInt> CompoundCollider::mCompoundColliderImp;
-CompoundCollider::CompoundCollider() : Collider(){
- mCompoundColliderImp = boost::shared_ptr<CompoundColliderImp>(new CompoundColliderImp());;
+CompoundCollider::CompoundCollider() : Collider()
+{
+
}
-CompoundCollider::~CompoundCollider(){
+CompoundCollider::~CompoundCollider()
+{
}
+
+bool CompoundCollider::ConstructInternal()
+{
+ if (mCompoundColliderImp.get() == 0)
+ mCompoundColliderImp = shared_dynamic_cast<CompoundColliderInt>
+ (GetCore()->New("CompoundColliderImp"));
+
+ if (mCompoundColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(CompoundCollider) ERROR: No implementation found at '/classes/CompoundColliderImp'";
+ return false;
+ }
+
+ if (!Collider::ConstructInternal()) return false;
+
+ //we can't use the logserver here
+ std::cerr << "(CompoundCollider) ERROR: CompoundCollider is not implemented yet. Did nothing";
+
+ return true;
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
CompoundCollider();
virtual ~CompoundCollider();
+ virtual bool ConstructInternal();
+
private:
static boost::shared_ptr<CompoundColliderInt> mCompoundColliderImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,41 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/concavecollider.h>
-#include <../plugin/odeimps/odeconcavecollider.h>
+#include <oxygen/physicsserver/int/concavecolliderint.h>
+#include <iostream>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<ConcaveColliderInt> ConcaveCollider::mConcaveColliderImp;
-ConcaveCollider::ConcaveCollider() : Collider(){
- mConcaveColliderImp = boost::shared_ptr<ConcaveColliderImp>(new ConcaveColliderImp());
+ConcaveCollider::ConcaveCollider() : Collider()
+{
+
}
-ConcaveCollider::~ConcaveCollider(){
+ConcaveCollider::~ConcaveCollider()
+{
}
+
+bool ConcaveCollider::ConstructInternal()
+{
+ if (mConcaveColliderImp.get() == 0)
+ mConcaveColliderImp = shared_dynamic_cast<ConcaveColliderInt>
+ (GetCore()->New("ConcaveColliderImp"));
+
+ if (mConcaveColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(ConcaveCollider) ERROR: No implementation found at '/classes/ConcaveColliderImp'";
+ return false;
+ }
+
+ if (!Collider::ConstructInternal()) return false;
+
+ //we can't use the logserver here
+ std::cerr << "(ConcaveCollider) ERROR: ConcaveCollider is not implemented yet. Did nothing";
+
+ return true;
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
ConcaveCollider();
virtual ~ConcaveCollider();
+ virtual bool ConstructInternal();
+
private:
static boost::shared_ptr<ConcaveColliderInt> mConcaveColliderImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,41 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/conecollider.h>
-#include <../plugin/odeimps/odeconecollider.h>
+#include <oxygen/physicsserver/int/conecolliderint.h>
+#include <iostream>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<ConeColliderInt> ConeCollider::mConeColliderImp;
-ConeCollider::ConeCollider() : ConvexCollider(){
- mConeColliderImp = boost::shared_ptr<ConeColliderImp>(new ConeColliderImp());
+ConeCollider::ConeCollider() : ConvexCollider()
+{
+
}
-ConeCollider::~ConeCollider(){
+ConeCollider::~ConeCollider()
+{
}
+
+bool ConeCollider::ConstructInternal()
+{
+ if (mConeColliderImp.get() == 0)
+ mConeColliderImp = shared_dynamic_cast<ConeColliderInt>
+ (GetCore()->New("ConeColliderImp"));
+
+ if (mConeColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(ConeCollider) ERROR: No implementation found at '/classes/ConeColliderImp'";
+ return false;
+ }
+
+ if (!Collider::ConstructInternal()) return false;
+
+ //we can't use the logserver here
+ std::cerr << "(ConeCollider) ERROR: ConeCollider is not implemented yet. Did nothing";
+
+ return true;
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
ConeCollider();
virtual ~ConeCollider();
+ virtual bool ConstructInternal();
+
private:
static boost::shared_ptr<ConeColliderInt> mConeColliderImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -21,24 +21,38 @@
*/
#include <oxygen/physicsserver/conetwistjoint.h>
-#include <../plugin/odeimps/odeconetwistjoint.h>
+#include <oxygen/physicsserver/int/conetwistjointint.h>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<ConeTwistJointInt> ConeTwistJoint::mConeTwistJointImp;
-ConeTwistJoint::ConeTwistJoint() : Generic6DOFJoint(){
- mConeTwistJointImp = boost::shared_ptr<ConeTwistJointImp>(new ConeTwistJointImp());
+ConeTwistJoint::ConeTwistJoint() : Generic6DOFJoint()
+{
+
}
-ConeTwistJoint::~ConeTwistJoint(){
+ConeTwistJoint::~ConeTwistJoint()
+{
}
-void ConeTwistJoint::SetParameter(int parameter, float value){
+void ConeTwistJoint::OnLink()
+{
+ Joint::OnLink();
+ if (mConeTwistJointImp.get() == 0)
+ mConeTwistJointImp = shared_dynamic_cast<ConeTwistJointInt>
+ (GetCore()->New("ConeTwistJointImp"));
}
-float ConeTwistJoint::GetParameter(int parameter) const{
+void ConeTwistJoint::SetParameter(int parameter, float value)
+{
+
+}
+
+float ConeTwistJoint::GetParameter(int parameter) const
+{
return 0.0;
}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -40,6 +40,8 @@
ConeTwistJoint();
virtual ~ConeTwistJoint();
+ virtual void OnLink();
+
//overwrite pure virtual methods inherited from Joint
//to shut the compiler up
void SetParameter(int parameter, float value);
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,7 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/contactjointhandler.h>
-#include <../plugin/odeimps/odecontactjointhandler.h>
+#include <oxygen/physicsserver/int/contactjointhandlerint.h>
#include <oxygen/physicsserver/collider.h>
#include <oxygen/physicsserver/space.h>
#include <oxygen/physicsserver/world.h>
@@ -33,8 +33,7 @@
ContactJointHandler::ContactJointHandler() : CollisionHandler()
{
- mContactJointHandlerImp = boost::shared_ptr<ContactJointHandlerImp>(new ContactJointHandlerImp());
- mSurfaceParameter = mContactJointHandlerImp->Initialize();
+
}
ContactJointHandler::~ContactJointHandler()
@@ -42,6 +41,19 @@
delete mSurfaceParameter;
}
+void ContactJointHandler::OnLink()
+{
+ CollisionHandler::OnLink();
+
+ if (mContactJointHandlerImp.get() == 0)
+ mContactJointHandlerImp = shared_dynamic_cast<ContactJointHandlerInt>
+ (GetCore()->New("ContactJointHandlerImp"));
+
+ //no failsaving here
+ //if mCJHImp is a nullpointer at this point it will just crash later, anyway
+ mSurfaceParameter = mContactJointHandlerImp->Initialize();
+}
+
void
ContactJointHandler::HandleCollision(shared_ptr<Collider> collidee, GenericContact& contact)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -39,6 +39,8 @@
public:
ContactJointHandler();
virtual ~ContactJointHandler();
+
+ virtual void OnLink();
/** Check if the collidee also has a ContactJoint handler
registered to it. If yes, create a contact joint between the
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,39 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/convexcollider.h>
-#include <../plugin/odeimps/odeconvexcollider.h>
+#include <oxygen/physicsserver/int/convexcolliderint.h>
+#include <iostream>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<ConvexColliderInt> ConvexCollider::mConvexColliderImp;
ConvexCollider::ConvexCollider() : Collider(){
- mConvexColliderImp = boost::shared_ptr<ConvexColliderImp>(new ConvexColliderImp());
+
}
ConvexCollider::~ConvexCollider(){
}
+
+bool ConvexCollider::ConstructInternal()
+{
+ if (mConvexColliderImp.get() == 0)
+ mConvexColliderImp = shared_dynamic_cast<ConvexColliderInt>
+ (GetCore()->New("ConvexColliderImp"));
+
+ if (mConvexColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(ConvexCollider) ERROR: No implementation found at '/classes/ConvexColliderImp'";
+ return false;
+ }
+
+ if (!Collider::ConstructInternal()) return false;
+
+ //we can't use the logserver here
+ std::cerr << "(ConvexCollider) ERROR: ConvexCollider is not implemented yet. Did nothing";
+
+ return true;
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -40,6 +40,8 @@
ConvexCollider();
virtual ~ConvexCollider();
+ virtual bool ConstructInternal();
+
private:
static boost::shared_ptr<ConvexColliderInt> mConvexColliderImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,39 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/cylindercollider.h>
-#include <../plugin/odeimps/odecylindercollider.h>
+#include <oxygen/physicsserver/int/cylindercolliderint.h>
+#include <iostream>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<CylinderColliderInt> CylinderCollider::mCylinderColliderImp;
CylinderCollider::CylinderCollider() : ConvexCollider(){
- mCylinderColliderImp = boost::shared_ptr<CylinderColliderImp>(new CylinderColliderImp());
+
}
CylinderCollider::~CylinderCollider(){
}
+
+bool CylinderCollider::ConstructInternal()
+{
+ if (mCylinderColliderImp.get() == 0)
+ mCylinderColliderImp = shared_dynamic_cast<CylinderColliderInt>
+ (GetCore()->New("CylinderColliderImp"));
+
+ if (mCylinderColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(CylinderCollider) ERROR: No implementation found at '/classes/CylinderColliderImp'";
+ return false;
+ }
+
+ if (!Collider::ConstructInternal()) return false;
+
+ //we can't use the logserver here
+ std::cerr << "(CylinderCollider) ERROR: CylinderCollider is not implemented yet. Did nothing";
+
+ return true;
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -42,6 +42,8 @@
CylinderCollider();
virtual ~CylinderCollider();
+ virtual bool ConstructInternal();
+
private:
static boost::shared_ptr<CylinderColliderInt> mCylinderColliderImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,26 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/dynamicbody.h>
-#include <../plugin/odeimps/odedynamicbody.h>
+#include <oxygen/physicsserver/int/dynamicbodyint.h>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<DynamicBodyInt> DynamicBody::mDynamicBodyImp;
DynamicBody::DynamicBody() : Body(){
- mDynamicBodyImp = boost::shared_ptr<DynamicBodyImp>(new DynamicBodyImp());
+
}
DynamicBody::~DynamicBody(){
}
+
+void DynamicBody::OnLink()
+{
+ Body::OnLink();
+
+ if (mDynamicBodyImp.get() == 0)
+ mDynamicBodyImp = shared_dynamic_cast<DynamicBodyInt>
+ (GetCore()->New("DynamicBodyImp"));
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
DynamicBody();
virtual ~DynamicBody();
+ virtual void OnLink();
+
private:
static boost::shared_ptr<DynamicBodyInt> mDynamicBodyImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,17 +20,40 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/odeemptycollider.h>
+#include <oxygen/physicsserver/int/emptycolliderint.h>
#include <oxygen/physicsserver/emptycollider.h>
+#include <iostream>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<EmptyColliderInt> EmptyCollider::mEmptyColliderImp;
EmptyCollider::EmptyCollider() : Collider(){
- mEmptyColliderImp = boost::shared_ptr<EmptyColliderImp>(new EmptyColliderImp());
+
}
EmptyCollider::~EmptyCollider(){
}
+
+bool EmptyCollider::ConstructInternal()
+{
+ if (mEmptyColliderImp.get() == 0)
+ mEmptyColliderImp = shared_dynamic_cast<EmptyColliderInt>
+ (GetCore()->New("EmptyColliderImp"));
+
+ if (mEmptyColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(EmptyCollider) ERROR: No implementation found at '/classes/EmptyColliderImp'";
+ return false;
+ }
+
+ if (!Collider::ConstructInternal()) return false;
+
+ //we can't use the logserver here
+ std::cerr << "(EmptyCollider) ERROR: EmptyCollider is not implemented yet. Did nothing";
+
+ return true;
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
EmptyCollider();
virtual ~EmptyCollider();
+ virtual bool ConstructInternal();
+
private:
static boost::shared_ptr<EmptyColliderInt> mEmptyColliderImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -18,16 +18,17 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/fixedjoint.h>
-#include <../plugin/odeimps/odefixedjoint.h>
+#include <oxygen/physicsserver/int/fixedjointint.h>
#include <zeitgeist/logserver/logserver.h>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<FixedJointInt> FixedJoint::mFixedJointImp;
FixedJoint::FixedJoint() : Generic6DOFJoint()
{
- mFixedJointImp = boost::shared_ptr<FixedJointImp>(new FixedJointImp());
+
}
FixedJoint::~FixedJoint()
@@ -36,6 +37,12 @@
void FixedJoint::OnLink()
{
+ Joint::OnLink();
+
+ if (mFixedJointImp.get() == 0)
+ mFixedJointImp = shared_dynamic_cast<FixedJointInt>
+ (GetCore()->New("FixedJointImp"));
+
long world = GetWorldID();
if (world == 0)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -21,16 +21,26 @@
*/
#include <oxygen/physicsserver/generic6dofjoint.h>
-#include <../plugin/odeimps/odegeneric6dofjoint.h>
+#include <oxygen/physicsserver/int/generic6dofjointint.h>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<Generic6DOFJointInt> Generic6DOFJoint::mGeneric6DOFJointImp;
Generic6DOFJoint::Generic6DOFJoint() : Joint(){
- mGeneric6DOFJointImp = boost::shared_ptr<Generic6DOFJointInt>(new Generic6DOFJointImp());
+
}
Generic6DOFJoint::~Generic6DOFJoint(){
}
+
+void Generic6DOFJoint::OnLink()
+{
+ Joint::OnLink();
+
+ if (mGeneric6DOFJointImp.get() == 0)
+ mGeneric6DOFJointImp = shared_dynamic_cast<Generic6DOFJointInt>
+ (GetCore()->New("Generic6DOFJointImp"));
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
Generic6DOFJoint();
virtual ~Generic6DOFJoint();
+ virtual void OnLink();
+
private:
static boost::shared_ptr<Generic6DOFJointInt> mGeneric6DOFJointImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -18,7 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/hinge2joint.h>
-#include <../plugin/odeimps/odehinge2joint.h>
+#include <oxygen/physicsserver/int/hinge2jointint.h>
#include <zeitgeist/logserver/logserver.h>
using namespace oxygen;
@@ -29,7 +29,7 @@
Hinge2Joint::Hinge2Joint() : Generic6DOFJoint()
{
- mHinge2JointImp = boost::shared_ptr<Hinge2JointImp>(new Hinge2JointImp());
+
}
Hinge2Joint::~Hinge2Joint()
@@ -38,6 +38,12 @@
void Hinge2Joint::OnLink()
{
+ Joint::OnLink();
+
+ if (mHinge2JointImp.get() == 0)
+ mHinge2JointImp = shared_dynamic_cast<Hinge2JointInt>
+ (GetCore()->New("Hinge2JointImp"));
+
long world = GetWorldID();
if (world == 0)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -18,7 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/hingejoint.h>
-#include <../plugin/odeimps/odehingejoint.h>
+#include <oxygen/physicsserver/int/hingejointint.h>
#include <oxygen/physicsserver/int/jointint.h>
#include <zeitgeist/logserver/logserver.h>
@@ -30,7 +30,7 @@
HingeJoint::HingeJoint() : Generic6DOFJoint()
{
- mHingeJointImp = boost::shared_ptr<HingeJointImp>(new HingeJointImp());
+
}
HingeJoint::~HingeJoint()
@@ -39,6 +39,12 @@
void HingeJoint::OnLink()
{
+ Joint::OnLink();
+
+ if (mHingeJointImp.get() == 0)
+ mHingeJointImp = shared_dynamic_cast<HingeJointInt>
+ (GetCore()->New("HingeJointImp"));
+
long world = GetWorldID();
if (world == 0)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -19,7 +19,7 @@
*/
#include <oxygen/physicsserver/joint.h>
#include <oxygen/physicsserver/rigidbody.h>
-#include <../plugin/odeimps/odejoint.h>
+#include <oxygen/physicsserver/int/jointint.h>
#include <zeitgeist/logserver/logserver.h>
using namespace oxygen;
@@ -34,7 +34,7 @@
mJointMaxSpeed1(0), mJointMaxSpeed2(0),
mIsLimitJointMaxSpeed1(false), mIsLimitJointMaxSpeed2(false)
{
- mJointImp = boost::shared_ptr<JointInt>(new JointImp());
+
}
Joint::~Joint()
@@ -43,6 +43,10 @@
void Joint::OnLink()
{
+ if (mJointImp.get() == 0)
+ mJointImp = shared_dynamic_cast<JointInt>
+ (GetCore()->New("JointImp"));
+
if (mJointID == 0)
{
return;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -24,7 +24,7 @@
#include <oxygen/physicsserver/physicsobject.h>
#include <oxygen/physicsserver/space.h>
#include <oxygen/physicsserver/world.h>
-#include <../plugin/odeimps/odephysicsobject.h>
+#include <oxygen/physicsserver/int/physicsobjectint.h>
#include <oxygen/sceneserver/scene.h>
#include <zeitgeist/logserver/logserver.h>
@@ -35,13 +35,20 @@
PhysicsObject::PhysicsObject() : BaseNode()
{
- mPhysicsObjectImp = boost::shared_ptr<PhysicsObjectInt>(new PhysicsObjectImp());
+
}
PhysicsObject::~PhysicsObject()
{
}
+void PhysicsObject::OnLink()
+{
+ if (mPhysicsObjectImp.get() == 0)
+ mPhysicsObjectImp = shared_dynamic_cast<PhysicsObjectInt>
+ (GetCore()->New("PhysicsObjectImp"));
+}
+
void PhysicsObject::OnUnlink()
{
DestroyPhysicsObject();
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -43,6 +43,8 @@
//
PhysicsObject();
virtual ~PhysicsObject();
+
+ virtual void OnLink();
/** This rountine is called, before the hierarchy object is
removed from the parent. It can be overridden to support
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,17 +20,19 @@
*/
#include <oxygen/physicsserver/planecollider.h>
-#include <../plugin/odeimps/odeplanecollider.h>
+#include <oxygen/physicsserver/int/planecolliderint.h>
#include <zeitgeist/logserver/logserver.h>
+#include <iostream>
using namespace oxygen;
using namespace salt;
+using namespace boost;
boost::shared_ptr<PlaneColliderInt> PlaneCollider::mPlaneColliderImp;
PlaneCollider::PlaneCollider() : Collider()
{
- mPlaneColliderImp = boost::shared_ptr<PlaneColliderImp>(new PlaneColliderImp());
+
}
void PlaneCollider::SetParams(float a, float b, float c, float d)
@@ -50,6 +52,17 @@
bool PlaneCollider::ConstructInternal()
{
+ if (mPlaneColliderImp.get() == 0)
+ mPlaneColliderImp = shared_dynamic_cast<PlaneColliderInt>
+ (GetCore()->New("PlaneColliderImp"));
+
+ if (mPlaneColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(PlaneCollider) ERROR: No implementation found at '/classes/PlaneColliderImp'";
+ return false;
+ }
+
if (! Collider::ConstructInternal())
{
return false;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -19,16 +19,18 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/oderaycollider.h>
+#include <oxygen/physicsserver/int/raycolliderint.h>
#include <oxygen/physicsserver/raycollider.h>
+#include <iostream>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<RayColliderInt> RayCollider::mRayColliderImp;
RayCollider::RayCollider() : Collider()
{
- mRayColliderImp = boost::shared_ptr<RayColliderImp>(new RayColliderImp());
+
}
void RayCollider::SetParams(salt::Vector3f pos,
@@ -39,6 +41,17 @@
bool RayCollider::ConstructInternal()
{
+ if (mRayColliderImp.get() == 0)
+ mRayColliderImp = shared_dynamic_cast<RayColliderInt>
+ (GetCore()->New("RayColliderImp"));
+
+ if (mRayColliderImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(RayCollider) ERROR: No implementation found at '/classes/RayColliderImp'";
+ return false;
+ }
+
if (! Collider::ConstructInternal())
{
return false;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,10 +20,11 @@
#include <oxygen/physicsserver/rigidbody.h>
#include <oxygen/physicsserver/transformcollider.h>
#include <oxygen/physicsserver/world.h>
-#include <../plugin/odeimps/oderigidbody.h>
+#include <oxygen/physicsserver/int/rigidbodyint.h>
#include <oxygen/sceneserver/scene.h>
#include <oxygen/sceneserver/transform.h>
#include <zeitgeist/logserver/logserver.h>
+#include <iostream>
using namespace boost;
using namespace oxygen;
@@ -34,7 +35,7 @@
RigidBody::RigidBody() : Body()
{
- mRigidBodyImp = boost::shared_ptr<RigidBodyImp>(new RigidBodyImp());
+
}
RigidBody::~RigidBody()
@@ -78,6 +79,17 @@
return true;
}
+ if (mRigidBodyImp.get() == 0)
+ mRigidBodyImp = shared_dynamic_cast<RigidBodyInt>
+ (GetCore()->New("RigidBodyImp"));
+
+ if (mRigidBodyImp.get() == 0)
+ {
+ //we can't use the logserver here
+ std::cerr << "(RigidBody) ERROR: No implementation found at '/classes/RigidBodyImp'";
+ return false;
+ }
+
long world = (long) GetWorldID();
if (world == 0)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -18,7 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/sliderjoint.h>
-#include <../plugin/odeimps/odesliderjoint.h>
+#include <oxygen/physicsserver/int/sliderjointint.h>
#include <zeitgeist/logserver/logserver.h>
using namespace oxygen;
@@ -29,7 +29,7 @@
SliderJoint::SliderJoint() : Generic6DOFJoint()
{
- mSliderJointImp = boost::shared_ptr<SliderJointImp>(new SliderJointImp());
+
}
SliderJoint::~SliderJoint()
@@ -38,6 +38,10 @@
void SliderJoint::OnLink()
{
+ if (mSliderJointImp.get() == 0)
+ mSliderJointImp = shared_dynamic_cast<SliderJointInt>
+ (GetCore()->New("SliderJointImp"));
+
long world = GetWorldID();
if (world == 0)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,24 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/softbody.h>
-#include <../plugin/odeimps/odesoftbody.h>
+#include <oxygen/physicsserver/int/softbodyint.h>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<SoftBodyInt> SoftBody::mSoftBodyImp;
SoftBody::SoftBody() : Body(){
- mSoftBodyImp = boost::shared_ptr<SoftBodyImp>(new SoftBodyImp());
+
}
SoftBody::~SoftBody(){
}
+
+void SoftBody::OnLink()
+{
+ if (mSoftBodyImp.get() == 0)
+ mSoftBodyImp = shared_dynamic_cast<SoftBodyInt>
+ (GetCore()->New("SoftBodyImp"));
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/softbody.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/softbody.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/softbody.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
SoftBody();
virtual ~SoftBody();
+ virtual void OnLink();
+
static boost::shared_ptr<SoftBodyInt> mSoftBodyImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,7 +20,7 @@
*/
#include <oxygen/physicsserver/space.h>
-#include <../plugin/odeimps/odespace.h>
+#include <oxygen/physicsserver/int/spaceint.h>
#include <oxygen/physicsserver/collider.h>
#include <oxygen/physicsserver/world.h>
#include <oxygen/sceneserver/scene.h>
@@ -35,7 +35,7 @@
Space::Space() : PhysicsObject(), mSpaceID(0)
{
- mSpaceImp = boost::shared_ptr<SpaceInt>(new SpaceImp());
+
}
Space::~Space()
@@ -179,6 +179,10 @@
bool Space::ConstructInternal()
{
+ if (mSpaceImp.get() == 0)
+ mSpaceImp = shared_dynamic_cast<SpaceInt>
+ (GetCore()->New("SpaceImp"));
+
mContactGroupID = mSpaceImp->CreateContactGroup();
return (mContactGroupID != 0);
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,17 @@
*/
#include <oxygen/physicsserver/spherecollider.h>
-#include <../plugin/odeimps/odespherecollider.h>
+#include <oxygen/physicsserver/int/spherecolliderint.h>
using namespace oxygen;
using namespace salt;
+using namespace boost;
boost::shared_ptr<SphereColliderInt> SphereCollider::mSphereColliderImp;
SphereCollider::SphereCollider() : ConvexCollider()
{
- mSphereColliderImp = boost::shared_ptr<SphereColliderImp>(new SphereColliderImp());
+
}
void SphereCollider::SetRadius(float r)
@@ -43,7 +44,11 @@
}
bool SphereCollider::ConstructInternal()
-{
+{
+ if (mSphereColliderImp.get() == 0)
+ mSphereColliderImp = shared_dynamic_cast<SphereColliderInt>
+ (GetCore()->New("SphereColliderImp"));
+
if (!Collider::ConstructInternal())
{
return false;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,16 +20,24 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/staticbody.h>
-#include <../plugin/odeimps/odestaticbody.h>
+#include <oxygen/physicsserver/int/staticbodyint.h>
using namespace oxygen;
+using namespace boost;
boost::shared_ptr<StaticBodyInt> StaticBody::mStaticBodyImp;
StaticBody::StaticBody() : Body(){
- mStaticBodyImp = boost::shared_ptr<StaticBodyImp>(new StaticBodyImp());
+
}
StaticBody::~StaticBody(){
}
+
+void StaticBody::OnLink()
+{
+ if (mStaticBodyImp.get() == 0)
+ mStaticBodyImp = shared_dynamic_cast<StaticBodyInt>
+ (GetCore()->New("StaticBodyImp"));
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.h 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.h 2010-02-23 09:13:36 UTC (rev 168)
@@ -41,6 +41,8 @@
StaticBody();
virtual ~StaticBody();
+ virtual void OnLink();
+
static boost::shared_ptr<StaticBodyInt> mStaticBodyImp;
};
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -20,21 +20,27 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/odetransformcollider.h>
+#include <oxygen/physicsserver/int/transformcolliderint.h>
#include <oxygen/physicsserver/transformcollider.h>
+#include <iostream>
using namespace oxygen;
using namespace salt;
+using namespace boost;
boost::shared_ptr<TransformColliderInt> TransformCollider::mTransformColliderImp;
TransformCollider::TransformCollider() : Collider()
{
- mTransformColliderImp = boost::shared_ptr<TransformColliderImp>(new TransformColliderImp());
+
}
bool TransformCollider::ConstructInternal()
-{
+{
+ if (mTransformColliderImp.get() == 0)
+ mTransformColliderImp = shared_dynamic_cast<TransformColliderInt>
+ (GetCore()->New("TransformColliderImp"));
+
if (! Collider::ConstructInternal())
{
return false;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -18,7 +18,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <oxygen/physicsserver/universaljoint.h>
-#include <../plugin/odeimps/odeuniversaljoint.h>
+#include <oxygen/physicsserver/int/universaljointint.h>
+#include <oxygen/physicsserver/int/jointint.h>
#include <zeitgeist/logserver/logserver.h>
using namespace oxygen;
@@ -29,7 +30,7 @@
UniversalJoint::UniversalJoint() : Generic6DOFJoint()
{
- mUniversalJointImp = boost::shared_ptr<UniversalJointImp>(new UniversalJointImp());
+
}
UniversalJoint::~UniversalJoint()
@@ -37,7 +38,13 @@
}
void UniversalJoint::OnLink()
-{
+{
+ Joint::OnLink();
+
+ if (mUniversalJointImp.get() == 0)
+ mUniversalJointImp = shared_dynamic_cast<UniversalJointInt>
+ (GetCore()->New("UniversalJointImp"));
+
long world = GetWorldID();
if (world == 0)
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp 2010-02-23 06:44:39 UTC (rev 167)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp 2010-02-23 09:13:36 UTC (rev 168)
@@ -19,7 +19,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/odeworld.h>
+#include <oxygen/physicsserver/int/worldint.h>
#include <oxygen/physicsserver/space.h>
#include <oxygen/physicsserver/world.h>
#include <oxygen/sceneserver/scene.h>
@@ -32,7 +32,7 @@
World::World() : PhysicsObject()
{
- mWorldImp = boost::shared_ptr<WorldInt>(new WorldImp());
+
}
World::~World()
@@ -101,6 +101,10 @@
bool World::ConstructInternal()
{
+ if (mWorldImp.get() == 0)
+ mWorldImp = shared_dynamic_cast<WorldInt>
+ (GetCore()->New("WorldImp"));
+
mWorldID = mWorldImp->CreateWorld();
return (mWorldID != 0);
@@ -116,7 +120,7 @@
recurseLock = true;
- shared_ptr<Space> space = GetSpace();
+ shared_ptr<World> space = GetWorld();
if (space.get() != 0)
{
space->DestroyPhysicsObject();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <a-...@us...> - 2010-02-23 06:44:48
|
Revision: 167
http://simspark.svn.sourceforge.net/simspark/?rev=167&view=rev
Author: a-held
Date: 2010-02-23 06:44:39 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
Add factories for all implementation classes to SceneGraph
Modified Paths:
--------------
branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/body.h
branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h
branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.h
branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp
branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp
branches/multiphys/spark/lib/oxygen/sceneserver/sceneserver.cpp
branches/multiphys/spark/plugin/odeimps/CMakeLists.txt
branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp
branches/multiphys/spark/plugin/odeimps/odeangularmotor.h
branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp
branches/multiphys/spark/plugin/odeimps/odeballjoint.h
branches/multiphys/spark/plugin/odeimps/odebody.cpp
branches/multiphys/spark/plugin/odeimps/odebody.h
branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp
branches/multiphys/spark/plugin/odeimps/odeboxcollider.h
branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp
branches/multiphys/spark/plugin/odeimps/odecapsulecollider.h
branches/multiphys/spark/plugin/odeimps/odecollider.cpp
branches/multiphys/spark/plugin/odeimps/odecollider.h
branches/multiphys/spark/plugin/odeimps/odecompoundcollider.cpp
branches/multiphys/spark/plugin/odeimps/odecompoundcollider.h
branches/multiphys/spark/plugin/odeimps/odeconcavecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconcavecollider.h
branches/multiphys/spark/plugin/odeimps/odeconecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconecollider.h
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.cpp
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint.h
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.cpp
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler.h
branches/multiphys/spark/plugin/odeimps/odeconvexcollider.cpp
branches/multiphys/spark/plugin/odeimps/odeconvexcollider.h
branches/multiphys/spark/plugin/odeimps/odecylindercollider.cpp
branches/multiphys/spark/plugin/odeimps/odecylindercollider.h
branches/multiphys/spark/plugin/odeimps/odedynamicbody.cpp
branches/multiphys/spark/plugin/odeimps/odedynamicbody.h
branches/multiphys/spark/plugin/odeimps/odeemptycollider.cpp
branches/multiphys/spark/plugin/odeimps/odeemptycollider.h
branches/multiphys/spark/plugin/odeimps/odefixedjoint.cpp
branches/multiphys/spark/plugin/odeimps/odefixedjoint.h
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.cpp
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint.h
branches/multiphys/spark/plugin/odeimps/odehinge2joint.cpp
branches/multiphys/spark/plugin/odeimps/odehinge2joint.h
branches/multiphys/spark/plugin/odeimps/odehingejoint.cpp
branches/multiphys/spark/plugin/odeimps/odehingejoint.h
branches/multiphys/spark/plugin/odeimps/odejoint.cpp
branches/multiphys/spark/plugin/odeimps/odejoint.h
branches/multiphys/spark/plugin/odeimps/odephysicsobject.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsobject.h
branches/multiphys/spark/plugin/odeimps/odephysicsserver.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsserver.h
branches/multiphys/spark/plugin/odeimps/odeplanecollider.cpp
branches/multiphys/spark/plugin/odeimps/odeplanecollider.h
branches/multiphys/spark/plugin/odeimps/oderaycollider.cpp
branches/multiphys/spark/plugin/odeimps/oderaycollider.h
branches/multiphys/spark/plugin/odeimps/oderigidbody.cpp
branches/multiphys/spark/plugin/odeimps/oderigidbody.h
branches/multiphys/spark/plugin/odeimps/odesliderjoint.cpp
branches/multiphys/spark/plugin/odeimps/odesliderjoint.h
branches/multiphys/spark/plugin/odeimps/odesoftbody.cpp
branches/multiphys/spark/plugin/odeimps/odesoftbody.h
branches/multiphys/spark/plugin/odeimps/odespace.cpp
branches/multiphys/spark/plugin/odeimps/odespace.h
branches/multiphys/spark/plugin/odeimps/odespherecollider.cpp
branches/multiphys/spark/plugin/odeimps/odespherecollider.h
branches/multiphys/spark/plugin/odeimps/odestaticbody.cpp
branches/multiphys/spark/plugin/odeimps/odestaticbody.h
branches/multiphys/spark/plugin/odeimps/odetransformcollider.cpp
branches/multiphys/spark/plugin/odeimps/odetransformcollider.h
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint.cpp
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint.h
branches/multiphys/spark/plugin/odeimps/odeworld.cpp
branches/multiphys/spark/plugin/odeimps/odeworld.h
branches/multiphys/spark/spark/spark.rb
Added Paths:
-----------
branches/multiphys/spark/plugin/odeimps/export.cpp
branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp
branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odebody_c.cpp
branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecapsulecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecompoundcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconcavecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconetwistjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odecontactjointhandler_c.cpp
branches/multiphys/spark/plugin/odeimps/odeconvexcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odecylindercollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odedynamicbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odeemptycollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odefixedjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odegeneric6dofjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odehinge2joint_c.cpp
branches/multiphys/spark/plugin/odeimps/odehingejoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odejoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsobject_c.cpp
branches/multiphys/spark/plugin/odeimps/odephysicsserver_c.cpp
branches/multiphys/spark/plugin/odeimps/odeplanecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/oderaycollider_c.cpp
branches/multiphys/spark/plugin/odeimps/oderigidbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odesliderjoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odesoftbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odespace_c.cpp
branches/multiphys/spark/plugin/odeimps/odespherecollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odestaticbody_c.cpp
branches/multiphys/spark/plugin/odeimps/odetransformcollider_c.cpp
branches/multiphys/spark/plugin/odeimps/odeuniversaljoint_c.cpp
branches/multiphys/spark/plugin/odeimps/odeworld_c.cpp
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/angularmotor.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -18,8 +18,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/odeangularmotor.h>
#include <oxygen/physicsserver/angularmotor.h>
+#include <oxygen/physicsserver/int/angularmotorint.h>
#include <oxygen/physicsserver/int/jointint.h>
#include <zeitgeist/logserver/logserver.h>
@@ -31,7 +31,7 @@
AngularMotor::AngularMotor() : Joint()
{
- mAngularMotorImp = boost::shared_ptr<ODEAngularMotor>(new ODEAngularMotor());
+
}
AngularMotor::~AngularMotor()
@@ -40,10 +40,12 @@
void AngularMotor::OnLink()
{
- //pseudocode
- //CoreContext core;
- //mAngularMotorImp = core.get("???/odeangularmotor")
+ Joint::OnLink();
+ if (mAngularMotorImp.get() == 0)
+ mAngularMotorImp = shared_dynamic_cast<AngularMotorInt>
+ (GetCore()->New("AngularMotorImp"));
+
long world = GetWorldID();
if (world == 0)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/balljoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -18,7 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/odeballjoint.h>
+#include <oxygen/physicsserver/int/balljointint.h>
#include <oxygen/physicsserver/balljoint.h>
#include <zeitgeist/logserver/logserver.h>
@@ -30,7 +30,7 @@
BallJoint::BallJoint() : Generic6DOFJoint()
{
- mBallJointImp = shared_ptr<ODEBallJoint>(new ODEBallJoint());
+
}
BallJoint::~BallJoint()
@@ -39,6 +39,12 @@
void BallJoint::OnLink()
{
+ Joint::OnLink();
+
+ if (mBallJointImp.get() == 0)
+ mBallJointImp = shared_dynamic_cast<BallJointInt>
+ (GetCore()->New("BallJointImp"));
+
long world = GetWorldID();
if (world == 0)
{
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/body.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -20,7 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <../plugin/odeimps/odebody.h>
+#include <oxygen/physicsserver/int/bodyint.h>
#include <oxygen/physicsserver/body.h>
using namespace oxygen;
@@ -28,12 +28,21 @@
boost::shared_ptr<BodyInt> Body::mBodyImp;
-Body::Body() : PhysicsObject(), mBodyID(0), mMassTransformed(false),
- mMassTrans(0,0,0)
+Body::Body() : PhysicsObject(), mBodyID(0),
+ mMassTransformed(false),
+ mMassTrans(0,0,0)
{
- mBodyImp = shared_ptr<ODEBody>(new ODEBody());
+
}
-Body::~Body(){
+Body::~Body()
+{
}
+
+void Body::OnLink()
+{
+ if (mBodyImp.get() == 0)
+ mBodyImp = shared_dynamic_cast<BodyInt>
+ (GetCore()->New("BodyImp"));
+}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/body.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/body.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/body.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -39,6 +39,7 @@
public:
Body();
virtual ~Body();
+ virtual void OnLink();
protected:
long mBodyID;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -20,8 +20,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <../plugin/odeimps/odeboxcollider.h>
#include <oxygen/physicsserver/boxcollider.h>
-#include <../plugin/odeimps/odeboxcollider.h>
+#include <oxygen/physicsserver/int/boxcolliderint.h>
using namespace oxygen;
using namespace salt;
@@ -30,9 +31,14 @@
BoxCollider::BoxCollider() : ConvexCollider()
{
- mBoxColliderImp = boost::shared_ptr<ODEBoxCollider>(new ODEBoxCollider());
+ mBoxColliderImp = boost::shared_ptr<BoxColliderImp>(new BoxColliderImp());
}
+void BoxCollider::OnLink()
+{
+ Collider::OnLink();
+}
+
void BoxCollider::SetBoxLengths(const Vector3f& extents)
{
mBoxColliderImp->SetBoxLengths(extents, mGeomID);
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/boxcollider.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -38,6 +38,7 @@
//
public:
BoxCollider();
+ virtual void OnLink();
/** sets the side lengths of the box geom */
void SetBoxLengths(const salt::Vector3f& extents);
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/capsulecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -29,7 +29,7 @@
CapsuleCollider::CapsuleCollider() : ConvexCollider()
{
- mCapsuleColliderImp = boost::shared_ptr<ODECapsuleCollider>(new ODECapsuleCollider());
+ mCapsuleColliderImp = boost::shared_ptr<CapsuleColliderImp>(new CapsuleColliderImp());
}
void CapsuleCollider::SetParams(float radius, float length)
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/collider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -38,7 +38,7 @@
Collider::Collider() : PhysicsObject(), mGeomID(0)
{
- mColliderImp = boost::shared_ptr<ODECollider>(new ODECollider());
+ mColliderImp = boost::shared_ptr<ColliderImp>(new ColliderImp());
}
Collider::~Collider()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/compoundcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<CompoundColliderInt> CompoundCollider::mCompoundColliderImp;
CompoundCollider::CompoundCollider() : Collider(){
- mCompoundColliderImp = boost::shared_ptr<ODECompoundCollider>(new ODECompoundCollider());;
+ mCompoundColliderImp = boost::shared_ptr<CompoundColliderImp>(new CompoundColliderImp());;
}
CompoundCollider::~CompoundCollider(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/concavecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<ConcaveColliderInt> ConcaveCollider::mConcaveColliderImp;
ConcaveCollider::ConcaveCollider() : Collider(){
- mConcaveColliderImp = boost::shared_ptr<ODEConcaveCollider>(new ODEConcaveCollider());
+ mConcaveColliderImp = boost::shared_ptr<ConcaveColliderImp>(new ConcaveColliderImp());
}
ConcaveCollider::~ConcaveCollider(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<ConeColliderInt> ConeCollider::mConeColliderImp;
ConeCollider::ConeCollider() : ConvexCollider(){
- mConeColliderImp = boost::shared_ptr<ODEConeCollider>(new ODEConeCollider());
+ mConeColliderImp = boost::shared_ptr<ConeColliderImp>(new ConeColliderImp());
}
ConeCollider::~ConeCollider(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/conetwistjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -28,7 +28,7 @@
boost::shared_ptr<ConeTwistJointInt> ConeTwistJoint::mConeTwistJointImp;
ConeTwistJoint::ConeTwistJoint() : Generic6DOFJoint(){
- mConeTwistJointImp = boost::shared_ptr<ODEConeTwistJoint>(new ODEConeTwistJoint());
+ mConeTwistJointImp = boost::shared_ptr<ConeTwistJointImp>(new ConeTwistJointImp());
}
ConeTwistJoint::~ConeTwistJoint(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/contactjointhandler.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -33,7 +33,7 @@
ContactJointHandler::ContactJointHandler() : CollisionHandler()
{
- mContactJointHandlerImp = boost::shared_ptr<ODEContactJointHandler>(new ODEContactJointHandler());
+ mContactJointHandlerImp = boost::shared_ptr<ContactJointHandlerImp>(new ContactJointHandlerImp());
mSurfaceParameter = mContactJointHandlerImp->Initialize();
}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/convexcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<ConvexColliderInt> ConvexCollider::mConvexColliderImp;
ConvexCollider::ConvexCollider() : Collider(){
- mConvexColliderImp = boost::shared_ptr<ODEConvexCollider>(new ODEConvexCollider());
+ mConvexColliderImp = boost::shared_ptr<ConvexColliderImp>(new ConvexColliderImp());
}
ConvexCollider::~ConvexCollider(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/cylindercollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<CylinderColliderInt> CylinderCollider::mCylinderColliderImp;
CylinderCollider::CylinderCollider() : ConvexCollider(){
- mCylinderColliderImp = boost::shared_ptr<ODECylinderCollider>(new ODECylinderCollider());
+ mCylinderColliderImp = boost::shared_ptr<CylinderColliderImp>(new CylinderColliderImp());
}
CylinderCollider::~CylinderCollider(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/dynamicbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<DynamicBodyInt> DynamicBody::mDynamicBodyImp;
DynamicBody::DynamicBody() : Body(){
- mDynamicBodyImp = boost::shared_ptr<ODEDynamicBody>(new ODEDynamicBody());
+ mDynamicBodyImp = boost::shared_ptr<DynamicBodyImp>(new DynamicBodyImp());
}
DynamicBody::~DynamicBody(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/emptycollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -28,7 +28,7 @@
boost::shared_ptr<EmptyColliderInt> EmptyCollider::mEmptyColliderImp;
EmptyCollider::EmptyCollider() : Collider(){
- mEmptyColliderImp = boost::shared_ptr<ODEEmptyCollider>(new ODEEmptyCollider());
+ mEmptyColliderImp = boost::shared_ptr<EmptyColliderImp>(new EmptyColliderImp());
}
EmptyCollider::~EmptyCollider(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/fixedjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
FixedJoint::FixedJoint() : Generic6DOFJoint()
{
- mFixedJointImp = boost::shared_ptr<ODEFixedJoint>(new ODEFixedJoint());
+ mFixedJointImp = boost::shared_ptr<FixedJointImp>(new FixedJointImp());
}
FixedJoint::~FixedJoint()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/generic6dofjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -28,7 +28,7 @@
boost::shared_ptr<Generic6DOFJointInt> Generic6DOFJoint::mGeneric6DOFJointImp;
Generic6DOFJoint::Generic6DOFJoint() : Joint(){
- mGeneric6DOFJointImp = boost::shared_ptr<ODEGeneric6DOFJoint>(new ODEGeneric6DOFJoint());
+ mGeneric6DOFJointImp = boost::shared_ptr<Generic6DOFJointInt>(new Generic6DOFJointImp());
}
Generic6DOFJoint::~Generic6DOFJoint(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/hinge2joint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -29,7 +29,7 @@
Hinge2Joint::Hinge2Joint() : Generic6DOFJoint()
{
- mHinge2JointImp = boost::shared_ptr<ODEHinge2Joint>(new ODEHinge2Joint());
+ mHinge2JointImp = boost::shared_ptr<Hinge2JointImp>(new Hinge2JointImp());
}
Hinge2Joint::~Hinge2Joint()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/hingejoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -30,7 +30,7 @@
HingeJoint::HingeJoint() : Generic6DOFJoint()
{
- mHingeJointImp = boost::shared_ptr<ODEHingeJoint>(new ODEHingeJoint());
+ mHingeJointImp = boost::shared_ptr<HingeJointImp>(new HingeJointImp());
}
HingeJoint::~HingeJoint()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/int/physicsserverint.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -29,8 +29,11 @@
{
class OXYGEN_API PhysicsServerInt
-{
+{
+public:
+ /** Initialises the physics engine */
+ virtual void InitEngine() = 0;
};
} //namespace oxygen
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/joint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -34,7 +34,7 @@
mJointMaxSpeed1(0), mJointMaxSpeed2(0),
mIsLimitJointMaxSpeed1(false), mIsLimitJointMaxSpeed2(false)
{
- mJointImp = boost::shared_ptr<ODEJoint>(new ODEJoint());
+ mJointImp = boost::shared_ptr<JointInt>(new JointImp());
}
Joint::~Joint()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/physicsobject.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -35,7 +35,7 @@
PhysicsObject::PhysicsObject() : BaseNode()
{
- mPhysicsObjectImp = boost::shared_ptr<ODEPhysicsObject>(new ODEPhysicsObject());
+ mPhysicsObjectImp = boost::shared_ptr<PhysicsObjectInt>(new PhysicsObjectImp());
}
PhysicsObject::~PhysicsObject()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -20,7 +20,7 @@
*/
#include <oxygen/physicsserver/physicsserver.h>
-#include <../plugin/odeimps/odephysicsserver.h>
+#include <oxygen/physicsserver/int/physicsserverint.h>
#include <oxygen/physicsserver/rigidbody.h>
#include <oxygen/physicsserver/world.h>
#include <oxygen/physicsserver/space.h>
@@ -37,14 +37,24 @@
PhysicsServer::PhysicsServer() : Leaf()
{
- mPhysicsServerImp = boost::shared_ptr<ODEPhysicsServer>(new ODEPhysicsServer());
+
}
-void PhysicsServer::ResetCache(){
+void PhysicsServer::ResetCache()
+{
mActiveSpace.reset();
mActiveWorld.reset();
}
+void PhysicsServer::OnLink()
+{
+ if (mPhysicsServerImp.get() == 0)
+ mPhysicsServerImp = shared_dynamic_cast<PhysicsServerInt>
+ (GetCore()->New("PhysicsServerImp"));
+
+ mPhysicsServerImp->InitEngine();
+}
+
void PhysicsServer::UpdateCache(shared_ptr<Scene> activeScene)
{
if (mActiveSpace.get() == 0)
@@ -62,7 +72,8 @@
}
}
-void PhysicsServer::DoCollisions(){
+void PhysicsServer::DoCollisions()
+{
if (mActiveSpace.get() != 0)
{
mActiveSpace->Collide();
@@ -84,9 +95,3 @@
body->SetName(name);
}
}
-
-void PhysicsServer::ConfirmExistence()
-{
- GetLog()->Normal() <<
- "(PhysicsServer) I print, therefore I am\n";
-}
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.h
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/physicsserver.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -45,6 +45,8 @@
PhysicsServer();
virtual ~PhysicsServer(){};
+ virtual void OnLink();
+
/** Resets the active space and active world */
void ResetCache();
@@ -60,9 +62,6 @@
/** Creates a new Box and adds it to the SceneGraph */
void SetUpBox(boost::shared_ptr<RigidBody> body, std::string name);
- /** Used for debugging */
- void ConfirmExistence();
-
private:
static boost::shared_ptr<PhysicsServerInt> mPhysicsServerImp;
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/planecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -30,7 +30,7 @@
PlaneCollider::PlaneCollider() : Collider()
{
- mPlaneColliderImp = boost::shared_ptr<ODEPlaneCollider>(new ODEPlaneCollider());
+ mPlaneColliderImp = boost::shared_ptr<PlaneColliderImp>(new PlaneColliderImp());
}
void PlaneCollider::SetParams(float a, float b, float c, float d)
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/raycollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -28,7 +28,7 @@
RayCollider::RayCollider() : Collider()
{
- mRayColliderImp = boost::shared_ptr<ODERayCollider>(new ODERayCollider());
+ mRayColliderImp = boost::shared_ptr<RayColliderImp>(new RayColliderImp());
}
void RayCollider::SetParams(salt::Vector3f pos,
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/rigidbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -34,7 +34,7 @@
RigidBody::RigidBody() : Body()
{
- mRigidBodyImp = boost::shared_ptr<ODERigidBody>(new ODERigidBody());
+ mRigidBodyImp = boost::shared_ptr<RigidBodyImp>(new RigidBodyImp());
}
RigidBody::~RigidBody()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/sliderjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -29,7 +29,7 @@
SliderJoint::SliderJoint() : Generic6DOFJoint()
{
- mSliderJointImp = boost::shared_ptr<ODESliderJoint>(new ODESliderJoint());
+ mSliderJointImp = boost::shared_ptr<SliderJointImp>(new SliderJointImp());
}
SliderJoint::~SliderJoint()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/softbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<SoftBodyInt> SoftBody::mSoftBodyImp;
SoftBody::SoftBody() : Body(){
- mSoftBodyImp = boost::shared_ptr<ODESoftBody>(new ODESoftBody());
+ mSoftBodyImp = boost::shared_ptr<SoftBodyImp>(new SoftBodyImp());
}
SoftBody::~SoftBody(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/space.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -35,7 +35,7 @@
Space::Space() : PhysicsObject(), mSpaceID(0)
{
- mSpaceImp = boost::shared_ptr<ODESpace>(new ODESpace());
+ mSpaceImp = boost::shared_ptr<SpaceInt>(new SpaceImp());
}
Space::~Space()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/spherecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -29,7 +29,7 @@
SphereCollider::SphereCollider() : ConvexCollider()
{
- mSphereColliderImp = boost::shared_ptr<ODESphereCollider>(new ODESphereCollider());
+ mSphereColliderImp = boost::shared_ptr<SphereColliderImp>(new SphereColliderImp());
}
void SphereCollider::SetRadius(float r)
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/staticbody.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -27,7 +27,7 @@
boost::shared_ptr<StaticBodyInt> StaticBody::mStaticBodyImp;
StaticBody::StaticBody() : Body(){
- mStaticBodyImp = boost::shared_ptr<ODEStaticBody>(new ODEStaticBody());
+ mStaticBodyImp = boost::shared_ptr<StaticBodyImp>(new StaticBodyImp());
}
StaticBody::~StaticBody(){
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/transformcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -30,7 +30,7 @@
TransformCollider::TransformCollider() : Collider()
{
- mTransformColliderImp = boost::shared_ptr<ODETransformCollider>(new ODETransformCollider());
+ mTransformColliderImp = boost::shared_ptr<TransformColliderImp>(new TransformColliderImp());
}
bool TransformCollider::ConstructInternal()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/universaljoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -29,7 +29,7 @@
UniversalJoint::UniversalJoint() : Generic6DOFJoint()
{
- mUniversalJointImp = boost::shared_ptr<ODEUniversalJoint>(new ODEUniversalJoint());
+ mUniversalJointImp = boost::shared_ptr<UniversalJointImp>(new UniversalJointImp());
}
UniversalJoint::~UniversalJoint()
Modified: branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/world.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -32,7 +32,7 @@
World::World() : PhysicsObject()
{
- mWorldImp = boost::shared_ptr<ODEWorld>(new ODEWorld());
+ mWorldImp = boost::shared_ptr<WorldInt>(new WorldImp());
}
World::~World()
Modified: branches/multiphys/spark/lib/oxygen/sceneserver/sceneserver.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/sceneserver/sceneserver.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/lib/oxygen/sceneserver/sceneserver.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -60,13 +60,6 @@
GetLog()->Error() <<
"(SceneServer) ERROR: PhysicsServer not found at /sys/server/physics\n";
}
- else
- {
- GetLog()->Normal() <<
- "(SceneServer) Found PhysicsServer\n";
-
- mPhysicsServer->ConfirmExistence();
- }
}
bool SceneServer::CreateScene(const std::string &location)
Modified: branches/multiphys/spark/plugin/odeimps/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/plugin/odeimps/CMakeLists.txt 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/CMakeLists.txt 2010-02-23 06:44:39 UTC (rev 167)
@@ -1,76 +1,110 @@
########### next target ###############
set(odeimps_LIB_SRCS
+ export.cpp
odeangularmotor.cpp
odeangularmotor.h
+ odeangularmotor_c.cpp
odeballjoint.cpp
odeballjoint.h
+ odeballjoint_c.cpp
odebody.cpp
odebody.h
+ odebody_c.cpp
odeboxcollider.cpp
odeboxcollider.h
+ odeboxcollider_c.cpp
odecapsulecollider.cpp
odecapsulecollider.h
+ odecapsulecollider_c.cpp
odecollider.cpp
odecollider.h
+ odecollider_c.cpp
odecompoundcollider.cpp
odecompoundcollider.h
+ odecompoundcollider_c.cpp
odeconcavecollider.cpp
odeconcavecollider.h
+ odeconcavecollider_c.cpp
odeconecollider.cpp
odeconecollider.h
+ odeconecollider_c.cpp
odeconetwistjoint.cpp
odeconetwistjoint.h
+ odeconetwistjoint_c.cpp
odecontactjointhandler.cpp
odecontactjointhandler.h
+ odecontactjointhandler_c.cpp
odeconvexcollider.cpp
odeconvexcollider.h
+ odeconvexcollider_c.cpp
odecylindercollider.cpp
odecylindercollider.h
+ odecylindercollider_c.cpp
odedynamicbody.cpp
odedynamicbody.h
+ odedynamicbody_c.cpp
odeemptycollider.cpp
odeemptycollider.h
+ odeemptycollider_c.cpp
odefixedjoint.cpp
odefixedjoint.h
+ odefixedjoint_c.cpp
odegeneric6dofjoint.cpp
odegeneric6dofjoint.h
+ odegeneric6dofjoint_c.cpp
odehinge2joint.cpp
odehinge2joint.h
+ odehinge2joint_c.cpp
odehingejoint.cpp
odehingejoint.h
+ odehingejoint_c.cpp
odejoint.cpp
odejoint.h
+ odejoint_c.cpp
odephysicsobject.cpp
odephysicsobject.h
+ odephysicsobject_c.cpp
odephysicsserver.cpp
odephysicsserver.h
+ odephysicsserver_c.cpp
odeplanecollider.cpp
odeplanecollider.h
+ odeplanecollider_c.cpp
oderaycollider.cpp
oderaycollider.h
+ oderaycollider_c.cpp
oderigidbody.cpp
oderigidbody.h
+ oderigidbody_c.cpp
odesliderjoint.cpp
odesliderjoint.h
+ odesliderjoint_c.cpp
odesoftbody.cpp
odesoftbody.h
+ odesoftbody_c.cpp
odespace.cpp
odespace.h
+ odespace_c.cpp
odespherecollider.cpp
odespherecollider.h
+ odespherecollider_c.cpp
odestaticbody.cpp
odestaticbody.h
+ odestaticbody_c.cpp
odetransformcollider.cpp
odetransformcollider.h
+ odetransformcollider_c.cpp
odeuniversaljoint.cpp
odeuniversaljoint.h
+ odeuniversaljoint_c.cpp
odeworld.cpp
odeworld.h
+ odeworld_c.cpp
odewrapper.h
)
-add_library(odeimps ${odeimps_LIB_SRCS})
+add_library(odeimps MODULE ${odeimps_LIB_SRCS})
target_link_libraries(odeimps ${spark_libs})
Added: branches/multiphys/spark/plugin/odeimps/export.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/export.cpp (rev 0)
+++ branches/multiphys/spark/plugin/odeimps/export.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -0,0 +1,93 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Fri May 9 2003
+ Copyright (C) 2002,2003 Koblenz University
+ Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
+ $Id: export.cpp 3 2008-11-21 02:38:08Z hedayat $
+
+ 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.
+*/
+
+#include <zeitgeist/zeitgeist.h>
+
+#include "odeangularmotor.h"
+#include "odeballjoint.h"
+#include "odebody.h"
+#include "odeboxcollider.h"
+#include "odecapsulecollider.h"
+#include "odecollider.h"
+#include "odecompoundcollider.h"
+#include "odeconcavecollider.h"
+#include "odeconecollider.h"
+#include "odeconetwistjoint.h"
+#include "odecontactjointhandler.h"
+#include "odeconvexcollider.h"
+#include "odecylindercollider.h"
+#include "odedynamicbody.h"
+#include "odeemptycollider.h"
+#include "odefixedjoint.h"
+#include "odegeneric6dofjoint.h"
+#include "odehinge2joint.h"
+#include "odehingejoint.h"
+#include "odejoint.h"
+#include "odephysicsobject.h"
+#include "odephysicsserver.h"
+#include "odeplanecollider.h"
+#include "oderaycollider.h"
+#include "oderigidbody.h"
+#include "odesliderjoint.h"
+#include "odesoftbody.h"
+#include "odespace.h"
+#include "odespherecollider.h"
+#include "odestaticbody.h"
+#include "odetransformcollider.h"
+#include "odeuniversaljoint.h"
+#include "odeworld.h"
+
+ZEITGEIST_EXPORT_BEGIN()
+ ZEITGEIST_EXPORT(AngularMotorImp);
+ ZEITGEIST_EXPORT(BallJointImp);
+ ZEITGEIST_EXPORT(BodyImp);
+ ZEITGEIST_EXPORT(BoxColliderImp);
+ ZEITGEIST_EXPORT(CapsuleColliderImp);
+ ZEITGEIST_EXPORT(ColliderImp);
+ ZEITGEIST_EXPORT(CompoundColliderImp);
+ ZEITGEIST_EXPORT(ConcaveColliderImp);
+ ZEITGEIST_EXPORT(ConeColliderImp);
+ ZEITGEIST_EXPORT(ConeTwistJointImp);
+ ZEITGEIST_EXPORT(ContactJointHandlerImp);
+ ZEITGEIST_EXPORT(ConvexColliderImp);
+ ZEITGEIST_EXPORT(CylinderColliderImp);
+ ZEITGEIST_EXPORT(DynamicBodyImp);
+ ZEITGEIST_EXPORT(EmptyColliderImp);
+ ZEITGEIST_EXPORT(FixedJointImp);
+ ZEITGEIST_EXPORT(Generic6DOFJointImp);
+ ZEITGEIST_EXPORT(Hinge2JointImp);
+ ZEITGEIST_EXPORT(HingeJointImp);
+ ZEITGEIST_EXPORT(JointImp);
+ ZEITGEIST_EXPORT(PhysicsObjectImp);
+ ZEITGEIST_EXPORT(PhysicsServerImp);
+ ZEITGEIST_EXPORT(PlaneColliderImp);
+ ZEITGEIST_EXPORT(RayColliderImp);
+ ZEITGEIST_EXPORT(RigidBodyImp);
+ ZEITGEIST_EXPORT(SliderJointImp);
+ ZEITGEIST_EXPORT(SoftBodyImp);
+ ZEITGEIST_EXPORT(SpaceImp);
+ ZEITGEIST_EXPORT(SphereColliderImp);
+ ZEITGEIST_EXPORT(StaticBodyImp);
+ ZEITGEIST_EXPORT(TransformColliderImp);
+ ZEITGEIST_EXPORT(UniversalJointImp);
+ ZEITGEIST_EXPORT(WorldImp);
+ZEITGEIST_EXPORT_END()
Modified: branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odeangularmotor.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -22,28 +22,28 @@
using namespace oxygen;
using namespace salt;
-ODEAngularMotor::ODEAngularMotor() : ODEJoint()
+AngularMotorImp::AngularMotorImp() : JointImp()
{
}
-long ODEAngularMotor::CreateAngularMotor(long worldID){
+long AngularMotorImp::CreateAngularMotor(long worldID){
dWorldID ODEWorld = (dWorldID) worldID;
dJointID ODEJoint = dJointCreateAMotor(ODEWorld, 0);
return (long) ODEJoint;
}
-void ODEAngularMotor::SetModeUserMode(long jointID){
+void AngularMotorImp::SetModeUserMode(long jointID){
dJointID ODEJoint = (dJointID) jointID;
dJointSetAMotorMode(ODEJoint, dAMotorUser);
}
-void ODEAngularMotor::SetModeEulerMode(long jointID){
+void AngularMotorImp::SetModeEulerMode(long jointID){
dJointID ODEJoint = (dJointID) jointID;
dJointSetAMotorMode(ODEJoint, dAMotorEuler);
}
-int ODEAngularMotor::GetMode(long jointID){
+int AngularMotorImp::GetMode(long jointID){
dJointID ODEJoint = (dJointID) jointID;
int motorMode = dJointGetAMotorMode(ODEJoint);
if (motorMode = dAMotorUser)
@@ -52,48 +52,48 @@
return 1;
}
-void ODEAngularMotor::SetNumAxes(int num, long jointID){
+void AngularMotorImp::SetNumAxes(int num, long jointID){
dJointID ODEJoint = (dJointID) jointID;
dJointSetAMotorNumAxes(ODEJoint, num);
}
-int ODEAngularMotor::GetNumAxes(long jointID){
+int AngularMotorImp::GetNumAxes(long jointID){
dJointID ODEJoint = (dJointID) jointID;
return dJointGetAMotorNumAxes(ODEJoint);
}
-void ODEAngularMotor::SetMotorAxis(int idx, int anchor, Vector3f axis, long jointID){
+void AngularMotorImp::SetMotorAxis(int idx, int anchor, Vector3f axis, long jointID){
dJointID ODEJoint = (dJointID) jointID;
dJointSetAMotorAxis (ODEJoint, idx, anchor,
axis[0], axis[1], axis[2]);
}
-int ODEAngularMotor::GetAxisAnchor(int idx, long jointID){
+int AngularMotorImp::GetAxisAnchor(int idx, long jointID){
dJointID ODEJoint = (dJointID) jointID;
return dJointGetAMotorAxisRel(ODEJoint, idx);
}
-Vector3f ODEAngularMotor::GetMotorAxis(int idx, long jointID){
+Vector3f AngularMotorImp::GetMotorAxis(int idx, long jointID){
dJointID ODEJoint = (dJointID) jointID;
dVector3 dAxis;
dJointGetAMotorAxis(ODEJoint,idx,dAxis);
return Vector3f(dAxis[0],dAxis[1],dAxis[2]);
}
-void ODEAngularMotor::SetAxisAngle(int idx, float degAngle, long jointID)
+void AngularMotorImp::SetAxisAngle(int idx, float degAngle, long jointID)
{
dJointID ODEJoint = (dJointID) jointID;
dJointSetAMotorAngle(ODEJoint, idx, gDegToRad(degAngle));
}
-float ODEAngularMotor::GetAxisAngle(int idx, long jointID)
+float AngularMotorImp::GetAxisAngle(int idx, long jointID)
{
dJointID ODEJoint = (dJointID) jointID;
return gRadToDeg(dJointGetAMotorAngle(ODEJoint, idx));
}
-float ODEAngularMotor::GetAxisAngleRate(int idx, long jointID)
+float AngularMotorImp::GetAxisAngleRate(int idx, long jointID)
{
dJointID ODEJoint = (dJointID) jointID;
return gRadToDeg(dJointGetAMotorAngleRate(ODEJoint,idx));
Modified: branches/multiphys/spark/plugin/odeimps/odeangularmotor.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeangularmotor.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odeangularmotor.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -26,7 +26,7 @@
#include <oxygen/physicsserver/int/angularmotorint.h>
#include "odejoint.h"
-class ODEAngularMotor : public oxygen::AngularMotorInt, public ODEJoint{
+class AngularMotorImp : public oxygen::AngularMotorInt, public JointImp{
/** An angular motor allows the relative angular velocities of two
bodies to be controlled. The angular velocity can be controlled on
@@ -37,7 +37,7 @@
*/
public:
- ODEAngularMotor();
+ AngularMotorImp();
long CreateAngularMotor(long worldID);
void SetModeUserMode(long jointID);
void SetModeEulerMode(long jointID);
@@ -52,4 +52,6 @@
float GetAxisAngleRate(int idx, long jointID);
};
+DECLARE_CLASS(AngularMotorImp);
+
#endif //ODEANGULARMOTOR_H
Added: branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp (rev 0)
+++ branches/multiphys/spark/plugin/odeimps/odeangularmotor_c.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -0,0 +1,27 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2008 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.
+*/
+
+#include "odeangularmotor.h"
+#include <zeitgeist/zeitgeist.h>
+
+void CLASS(AngularMotorImp)::DefineClass()
+{
+ DEFINE_BASECLASS(JointImp);
+}
Modified: branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odeballjoint.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -23,24 +23,24 @@
using namespace boost;
using namespace salt;
-ODEBallJoint::ODEBallJoint() : ODEGeneric6DOFJoint()
+BallJointImp::BallJointImp() : Generic6DOFJointImp()
{
}
-long ODEBallJoint::CreateBallJoint(long worldID)
+long BallJointImp::CreateBallJoint(long worldID)
{
dWorldID ODEWorld = (dWorldID) worldID;
dJointID ODEJoint = dJointCreateBall(ODEWorld, 0);
return (long) ODEJoint;
}
-void ODEBallJoint::SetAnchor(const Vector3f& gAnchor, long jointID)
+void BallJointImp::SetAnchor(const Vector3f& gAnchor, long jointID)
{
dJointID ODEJoint = (dJointID) jointID;
dJointSetBallAnchor (ODEJoint, gAnchor[0], gAnchor[1], gAnchor[2]);
}
-Vector3f ODEBallJoint::GetAnchor1(long jointID)
+Vector3f BallJointImp::GetAnchor1(long jointID)
{
dJointID ODEJoint = (dJointID) jointID;
dReal anchor[3];
@@ -50,7 +50,7 @@
return pos;
}
-Vector3f ODEBallJoint::GetAnchor2(long jointID)
+Vector3f BallJointImp::GetAnchor2(long jointID)
{
dJointID ODEJoint = (dJointID) jointID;
dReal anchor[3];
Modified: branches/multiphys/spark/plugin/odeimps/odeballjoint.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeballjoint.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odeballjoint.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -26,16 +26,18 @@
#include "odegeneric6dofjoint.h"
#include <oxygen/physicsserver/int/balljointint.h>
-class ODEBallJoint : public oxygen::BallJointInt, public ODEGeneric6DOFJoint
+class BallJointImp : public oxygen::BallJointInt, public Generic6DOFJointImp
{
/** See physicsserver/int/balljointint.h for documentation */
public:
- ODEBallJoint();
+ BallJointImp();
void SetAnchor(const salt::Vector3f& anchor, long jointID);
salt::Vector3f GetAnchor1(long jointID);
salt::Vector3f GetAnchor2(long jointID);
long CreateBallJoint(long worldID);
};
+DECLARE_CLASS(BallJointImp);
+
#endif //ODEBALLJOINT_H
Added: branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp (rev 0)
+++ branches/multiphys/spark/plugin/odeimps/odeballjoint_c.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -0,0 +1,27 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2008 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.
+*/
+
+#include "odeballjoint.h"
+#include <zeitgeist/zeitgeist.h>
+
+void CLASS(BallJointImp)::DefineClass()
+{
+ DEFINE_BASECLASS(Generic6DOFJointImp);
+}
Modified: branches/multiphys/spark/plugin/odeimps/odebody.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odebody.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odebody.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -24,6 +24,6 @@
using namespace oxygen;
-ODEBody::ODEBody() : ODEPhysicsObject(){
+BodyImp::BodyImp() : PhysicsObjectImp(){
}
Modified: branches/multiphys/spark/plugin/odeimps/odebody.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odebody.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odebody.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -25,10 +25,12 @@
#include "odephysicsobject.h"
#include <oxygen/physicsserver/int/bodyint.h>
-class ODEBody : public oxygen::BodyInt, public ODEPhysicsObject
+class BodyImp : public oxygen::BodyInt, public PhysicsObjectImp
{
public:
- ODEBody();
+ BodyImp();
};
+DECLARE_CLASS(BodyImp);
+
#endif //ODEBODY_H
Added: branches/multiphys/spark/plugin/odeimps/odebody_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odebody_c.cpp (rev 0)
+++ branches/multiphys/spark/plugin/odeimps/odebody_c.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -0,0 +1,27 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2008 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.
+*/
+
+#include "odebody.h"
+#include <zeitgeist/zeitgeist.h>
+
+void CLASS(BodyImp)::DefineClass()
+{
+ DEFINE_BASECLASS(PhysicsObjectImp);
+}
Modified: branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odeboxcollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -24,11 +24,11 @@
using namespace oxygen;
using namespace salt;
-ODEBoxCollider::ODEBoxCollider() : ODEConvexCollider()
+BoxColliderImp::BoxColliderImp() : ConvexColliderImp()
{
}
-void ODEBoxCollider::SetBoxLengths(const Vector3f& extents, long geomID)
+void BoxColliderImp::SetBoxLengths(const Vector3f& extents, long geomID)
{
dGeomID ODEGeom = (dGeomID) geomID;
dGeomBoxSetLengths(
@@ -39,13 +39,13 @@
);
}
-long ODEBoxCollider::CreateBox()
+long BoxColliderImp::CreateBox()
{
dGeomID ODEGeom = dCreateBox (0, 1.0f, 1.0f, 1.0f);
return (long) ODEGeom;
}
-void ODEBoxCollider::GetBoxLengths(Vector3f& extents, long geomID)
+void BoxColliderImp::GetBoxLengths(Vector3f& extents, long geomID)
{
dGeomID ODEGeom = (dGeomID) geomID;
dVector3 lengths;
@@ -55,7 +55,7 @@
extents[2] = lengths[2];
}
-float ODEBoxCollider::GetPointDepth(const Vector3f& pos, long geomID)
+float BoxColliderImp::GetPointDepth(const Vector3f& pos, long geomID)
{
dGeomID ODEGeom = (dGeomID) geomID;
return dGeomBoxPointDepth
Modified: branches/multiphys/spark/plugin/odeimps/odeboxcollider.h
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeboxcollider.h 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odeboxcollider.h 2010-02-23 06:44:39 UTC (rev 167)
@@ -26,16 +26,18 @@
#include "odeconvexcollider.h"
#include <oxygen/physicsserver/int/boxcolliderint.h>
-class ODEBoxCollider : public oxygen::BoxColliderInt, public ODEConvexCollider
+class BoxColliderImp : public oxygen::BoxColliderInt, public ConvexColliderImp
{
/** See physicsserver/int/boxcolliderint.h for documentation */
public:
- ODEBoxCollider();
+ BoxColliderImp();
void SetBoxLengths(const salt::Vector3f& extents, long geomID);
void GetBoxLengths(salt::Vector3f& extents, long geomID);
float GetPointDepth(const salt::Vector3f& pos, long geomID);
long CreateBox();
};
+DECLARE_CLASS(BoxColliderImp);
+
#endif //ODEBOXCOLLIDER_H
Added: branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp (rev 0)
+++ branches/multiphys/spark/plugin/odeimps/odeboxcollider_c.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -0,0 +1,27 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+
+ this file is part of rcssserver3D
+ Copyright (C) 2008 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.
+*/
+
+#include "odeboxcollider.h"
+#include <zeitgeist/zeitgeist.h>
+
+void CLASS(BoxColliderImp)::DefineClass()
+{
+ DEFINE_BASECLASS(ConvexColliderImp);
+}
Modified: branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp
===================================================================
--- branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp 2010-02-19 03:14:27 UTC (rev 166)
+++ branches/multiphys/spark/plugin/odeimps/odecapsulecollider.cpp 2010-02-23 06:44:39 UTC (rev 167)
@@ -24,27 +24,27 @@
using namespace oxygen;
using namespace salt;
-ODECapsuleCollider::ODECapsuleCollider() : ODEConvexCollider()
+CapsuleColliderImp::CapsuleColliderImp() : ConvexColliderImp()
{
}
-void ODECapsuleCollider::SetParams(float radius, float length, long geomID)
+void CapsuleColliderImp::SetParams(float radius, float length, long geomID)
{
dGeomID ODEGeom = (dGeomID) geomID;
dGeomCapsuleSetParams (ODEGeom, radius, length);
}
-void ODECapsuleCollider::SetRadius(float radius, long geomID)
+void CapsuleColliderImp::SetRadius(float radius, long geomID)
{
SetParams(radius, GetLength(geomID), geomID);
}
-vo...
[truncated message content] |
