[simspark-cvs] simspark/spark/oxygen/physicsserver transformcollider_c.cpp, NONE, 1.1.2.1 angularmotor_c.cpp, 1.1, 1.1.2.1 contactjointhandler_c.cpp, 1.1, 1.1.2.1 joint.cpp, 1.4, 1.4.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347/oxygen/physicsserver

Modified Files:
      Tag: WIN32
	angularmotor_c.cpp contactjointhandler_c.cpp joint.cpp 
Added Files:
      Tag: WIN32
	transformcollider_c.cpp 
Log Message:


--- NEW FILE: transformcollider_c.cpp ---
/* -*- 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: transformcollider_c.cpp,v 1.1.2.1 2007/02/09 20:11:56 rollmark Exp $

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 "transformcollider.h"

using namespace oxygen;
using namespace boost;
using namespace salt;

void CLASS(TransformCollider)::DefineClass()
{
    DEFINE_BASECLASS(oxygen/Collider);
}

Index: angularmotor_c.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/angularmotor_c.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** angularmotor_c.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- angularmotor_c.cpp	9 Feb 2007 20:11:56 -0000	1.1.2.1
***************
*** 116,120 ****
          }
  
!     obj->SetAxisAngle(static_cast<Joint::EAxisIndex>(inAxisIdx),inDegAngle);
      return true;
  }
--- 116,120 ----
          }
  
!     obj->SetAxisAngle(static_cast<Joint::EAxisIndex>(inAxisIdx),static_cast<float>(inDegAngle));
      return true;
  }

Index: contactjointhandler_c.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/contactjointhandler_c.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** contactjointhandler_c.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- contactjointhandler_c.cpp	9 Feb 2007 20:11:56 -0000	1.1.2.1
***************
*** 50,54 ****
          }
  
!     obj->SetMinBounceVel(inVel);
      return true;
  }
--- 50,54 ----
          }
  
!     obj->SetMinBounceVel(static_cast<float>(inVel));
      return true;
  }
***************
*** 65,69 ****
          }
  
!     obj->SetBounceValue(inValue);
      return true;
  }
--- 65,69 ----
          }
  
!     obj->SetBounceValue(static_cast<float>(inValue));
      return true;
  }
***************
*** 95,99 ****
          }
  
!     obj->SetContactSoftERP(inERP);
      return true;
  }
--- 95,99 ----
          }
  
!     obj->SetContactSoftERP(static_cast<float>(inERP));
      return true;
  }
***************
*** 125,129 ****
          }
  
!     obj->SetContactSoftCFM(inCFM);
      return true;
  }
--- 125,129 ----
          }
  
!     obj->SetContactSoftCFM(static_cast<float>(inCFM));
      return true;
  }
***************
*** 155,159 ****
          }
  
!     obj->SetContactSlip(inSlip);
      return true;
  }
--- 155,159 ----
          }
  
!     obj->SetContactSlip(static_cast<float>(inSlip));
      return true;
  }
***************
*** 170,174 ****
          }
  
!     obj->SetContactMu(inMu);
      return true;
  
--- 170,174 ----
          }
  
!     obj->SetContactMu(static_cast<float>(inMu));
      return true;
  

Index: joint.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/joint.cpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** joint.cpp	12 Feb 2006 11:36:52 -0000	1.4
--- joint.cpp	9 Feb 2007 20:11:56 -0000	1.4.2.1
***************
*** 182,186 ****
          }
  
!     return dAreConnected(body1->GetODEBody(),body2->GetODEBody());
  }
  
--- 182,190 ----
          }
  
!     const bool connected =
!         (dAreConnected(body1->GetODEBody(),body2->GetODEBody())
!          == 1);
! 
!     return connected;
  }
  
***************
*** 197,202 ****
          }
  
!     return dAreConnectedExcluding(body1->GetODEBody(),body2->GetODEBody(),
!                                   joint_type);
  }
  
--- 201,212 ----
          }
  
!     const bool connected =
!         (dAreConnectedExcluding(body1->GetODEBody(),
!                                 body2->GetODEBody(),
!                                 joint_type
!                                 )
!          == 1);
! 
!     return connected;
  }