[simspark-svn] SF.net SVN: simspark:[154] branches/multiphys/spark/lib/oxygen

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

Revision: 154
          http://simspark.svn.sourceforge.net/simspark/?rev=154&view=rev
Author:   a-held
Date:     2010-01-28 07:24:51 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
move staticphysicsmethods_ode.cpp in physicsserver/ode folder

Modified Paths:
--------------
    branches/multiphys/spark/lib/oxygen/CMakeLists.txt

Added Paths:
-----------
    branches/multiphys/spark/lib/oxygen/physicsserver/ode/staticphysicsmethods_ode.cpp

Removed Paths:
-------------
    branches/multiphys/spark/lib/oxygen/physicsserver/staticphysicsmethods_ode.cpp

Modified: branches/multiphys/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2010-01-28 07:17:35 UTC (rev 153)
+++ branches/multiphys/spark/lib/oxygen/CMakeLists.txt	2010-01-28 07:24:51 UTC (rev 154)
@@ -93,7 +93,7 @@
     physicsserver/int/worldint.h
     
     #ode-specific files
-    physicsserver/staticphysicsmethods_ode.cpp
+    physicsserver/ode/staticphysicsmethods_ode.cpp
     physicsserver/ode/odeangularmotor.h
     physicsserver/ode/odeballjoint.h
     physicsserver/ode/odebody.h

Added: branches/multiphys/spark/lib/oxygen/physicsserver/ode/staticphysicsmethods_ode.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/ode/staticphysicsmethods_ode.cpp	                        (rev 0)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/ode/staticphysicsmethods_ode.cpp	2010-01-28 07:24:51 UTC (rev 154)
@@ -0,0 +1,56 @@
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+   this file is part of rcssserver3D
+   Fri May 9 2003
+   Copyright (C) 2003 Koblenz University
+   $Id: body.cpp 106 2009-11-19 10:10:50Z a-held $
+
+   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 <oxygen/physicsserver/staticphysicsmethods.h>
+#include <oxygen/physicsserver/collider.h>
+#include <oxygen/physicsserver/joint.h>
+#include <oxygen/physicsserver/rigidbody.h>
+#include <oxygen/physicsserver/space.h>
+#include <oxygen/physicsserver/ode/odewrapper.h>
+
+using namespace oxygen;
+using namespace boost;
+
+Collider* StaticPhysicsMethods::GetColliderPointer(long geomID){
+    dGeomID ODEGeom = (dGeomID) geomID;
+    return static_cast<Collider*>(dGeomGetData(ODEGeom));
+}
+
+Joint* StaticPhysicsMethods::GetJoint(long jointID){
+    dJointID ODEJoint = (dJointID) jointID;
+    return static_cast<Joint*>(dJointGetData(ODEJoint));
+}
+
+RigidBody* StaticPhysicsMethods::GetBodyPointer(long bodyID){
+    dBodyID ODEBody = (dBodyID) bodyID;
+    return static_cast<RigidBody*>(dBodyGetData(ODEBody));
+}
+
+bool StaticPhysicsMethods::AreConnected(long bodyID1, long bodyID2){
+    dBodyID ODEBody1 = (dBodyID) bodyID1;
+    dBodyID ODEBody2 = (dBodyID) bodyID2;
+    return dAreConnected(ODEBody1, ODEBody2) == 1;
+}
+
+bool StaticPhysicsMethods::AreConnectedExcluding(long bodyID1, long bodyID2, int joint_type){
+    dBodyID ODEBody1 = (dBodyID) bodyID1;
+    dBodyID ODEBody2 = (dBodyID) bodyID2;
+    return dAreConnectedExcluding(ODEBody1, ODEBody2, joint_type) == 1;
+}

Deleted: branches/multiphys/spark/lib/oxygen/physicsserver/staticphysicsmethods_ode.cpp
===================================================================
--- branches/multiphys/spark/lib/oxygen/physicsserver/staticphysicsmethods_ode.cpp	2010-01-28 07:17:35 UTC (rev 153)
+++ branches/multiphys/spark/lib/oxygen/physicsserver/staticphysicsmethods_ode.cpp	2010-01-28 07:24:51 UTC (rev 154)
@@ -1,56 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-   this file is part of rcssserver3D
-   Fri May 9 2003
-   Copyright (C) 2003 Koblenz University
-   $Id: body.cpp 106 2009-11-19 10:10:50Z a-held $
-
-   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 <oxygen/physicsserver/staticphysicsmethods.h>
-#include <oxygen/physicsserver/collider.h>
-#include <oxygen/physicsserver/joint.h>
-#include <oxygen/physicsserver/rigidbody.h>
-#include <oxygen/physicsserver/space.h>
-#include <oxygen/physicsserver/ode/odewrapper.h>
-
-using namespace oxygen;
-using namespace boost;
-
-Collider* StaticPhysicsMethods::GetColliderPointer(long geomID){
-    dGeomID ODEGeom = (dGeomID) geomID;
-    return static_cast<Collider*>(dGeomGetData(ODEGeom));
-}
-
-Joint* StaticPhysicsMethods::GetJoint(long jointID){
-    dJointID ODEJoint = (dJointID) jointID;
-    return static_cast<Joint*>(dJointGetData(ODEJoint));
-}
-
-RigidBody* StaticPhysicsMethods::GetBodyPointer(long bodyID){
-    dBodyID ODEBody = (dBodyID) bodyID;
-    return static_cast<RigidBody*>(dBodyGetData(ODEBody));
-}
-
-bool StaticPhysicsMethods::AreConnected(long bodyID1, long bodyID2){
-    dBodyID ODEBody1 = (dBodyID) bodyID1;
-    dBodyID ODEBody2 = (dBodyID) bodyID2;
-    return dAreConnected(ODEBody1, ODEBody2) == 1;
-}
-
-bool StaticPhysicsMethods::AreConnectedExcluding(long bodyID1, long bodyID2, int joint_type){
-    dBodyID ODEBody1 = (dBodyID) bodyID1;
-    dBodyID ODEBody2 = (dBodyID) bodyID2;
-    return dAreConnectedExcluding(ODEBody1, ODEBody2, joint_type) == 1;
-}


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