Update of /cvsroot/opal/opal/src/ODE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32461/src/ODE
Modified Files:
ODESimulator.cpp ODESimulator.h
Log Message:
made data classes exported through win32 dll interface
Index: ODESimulator.h
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESimulator.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** ODESimulator.h 10 Mar 2005 21:12:53 -0000 1.61
--- ODESimulator.h 11 Mar 2005 05:31:57 -0000 1.62
***************
*** 97,103 ****
void OPAL_CALL internal_addCollidedSolid(Solid* solid);
! virtual const RaycastResult& OPAL_CALL internal_fireRay( const Rayr& r);
!
! virtual const RaycastResult& OPAL_CALL internal_fireRay( const Rayr& r, real length );
/// Helper function used for ray casting.
--- 97,102 ----
void OPAL_CALL internal_addCollidedSolid(Solid* solid);
! virtual const RaycastResult& OPAL_CALL internal_fireRay(
! const Rayr& r, real length);
/// Helper function used for ray casting.
Index: ODESimulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESimulator.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** ODESimulator.cpp 10 Mar 2005 21:12:53 -0000 1.88
--- ODESimulator.cpp 11 Mar 2005 05:31:57 -0000 1.89
***************
*** 852,875 ****
}
! const RaycastResult& ODESimulator::internal_fireRay(const Rayr& r)
! {
! real length = r.getLength();
! mRaycastResult = internal_fireRay( r, length );
! return mRaycastResult;
! }
!
! const RaycastResult& ODESimulator::internal_fireRay( const Rayr& r, real length )
{
Point3r origin = r.getOrigin();
Vec3r dir = r.getDir();
- /* I don't think ODE requires this since ray length is separate from the direction -- Andres
- // Normalized the vector if possible.
- if (0 != length)
- {
- dir.normalize();
- }
- */
-
mRaycastResult.solid = NULL;
mRaycastResult.intersection.set(0,0,0);
--- 852,861 ----
}
! const RaycastResult& ODESimulator::internal_fireRay(const Rayr& r,
! real length)
{
Point3r origin = r.getOrigin();
Vec3r dir = r.getDir();
mRaycastResult.solid = NULL;
mRaycastResult.intersection.set(0,0,0);
|
