[Opal-commits] opal/src BoxShapeData.h,1.2,1.3 CapsuleShapeData.h,1.2,1.3 Defines.h,1.63,1.64 Joint.
Status: Inactive
Brought to you by:
tylerstreeter
|
From: tylerstreeter <tyl...@us...> - 2005-03-03 06:30:40
|
Update of /cvsroot/opal/opal/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19074/src Modified Files: BoxShapeData.h CapsuleShapeData.h Defines.h Joint.h PlaneShapeData.h RayShapeData.h SphereShapeData.h Log Message: minor fixes Index: CapsuleShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/CapsuleShapeData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CapsuleShapeData.h 22 Feb 2005 19:46:29 -0000 1.2 --- CapsuleShapeData.h 3 Mar 2005 02:32:28 -0000 1.3 *************** *** 42,47 **** { mType = CAPSULE_SHAPE; ! radius = 0; ! length = 0; } --- 42,47 ---- { mType = CAPSULE_SHAPE; ! radius = defaults::shape::capsuleRadius; ! length = defaults::shape::capsuleLength; } Index: SphereShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/SphereShapeData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SphereShapeData.h 22 Feb 2005 19:46:40 -0000 1.2 --- SphereShapeData.h 3 Mar 2005 02:32:28 -0000 1.3 *************** *** 42,46 **** { mType = SPHERE_SHAPE; ! radius = 0; } --- 42,46 ---- { mType = SPHERE_SHAPE; ! radius = defaults::shape::sphereRadius; } Index: PlaneShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/PlaneShapeData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlaneShapeData.h 22 Feb 2005 19:46:30 -0000 1.2 --- PlaneShapeData.h 3 Mar 2005 02:32:28 -0000 1.3 *************** *** 45,49 **** for (int i=0; i<4; ++i) { ! abcd[i] = 0; } } --- 45,49 ---- for (int i=0; i<4; ++i) { ! abcd[i] = defaults::shape::planeABCD[i]; } } Index: Joint.h =================================================================== RCS file: /cvsroot/opal/opal/src/Joint.h,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Joint.h 1 Mar 2005 05:04:22 -0000 1.58 --- Joint.h 3 Mar 2005 02:32:28 -0000 1.59 *************** *** 90,94 **** /// at all. virtual void OPAL_CALL setBreakParams(JointBreakMode mode, ! real breakThresh, real accumThresh); /// Restores accumulated damage to breakable Joints in accumulated --- 90,94 ---- /// at all. virtual void OPAL_CALL setBreakParams(JointBreakMode mode, ! real breakThresh, real accumThresh=0); /// Restores accumulated damage to breakable Joints in accumulated Index: Defines.h =================================================================== RCS file: /cvsroot/opal/opal/src/Defines.h,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Defines.h 1 Mar 2005 05:04:22 -0000 1.63 --- Defines.h 3 Mar 2005 02:32:28 -0000 1.64 *************** *** 298,302 **** namespace shape { ! const Material material(opal::globals::woodMaterial); } --- 298,309 ---- namespace shape { ! const Material material = opal::globals::woodMaterial; ! const Vec3r boxDimensions = Vec3r(1, 1, 1); ! const real sphereRadius = 1; ! const real capsuleRadius = 1; ! const real capsuleLength = 1; ! const real planeABCD[4] = {0, 1, 0, 0}; ! const Point3r rayOrigin = Point3r(0, 0, 0); ! const Vec3r rayDir = Vec3r(0, 0, -1); } Index: RayShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/RayShapeData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RayShapeData.h 22 Feb 2005 19:46:30 -0000 1.2 --- RayShapeData.h 3 Mar 2005 02:32:28 -0000 1.3 *************** *** 42,46 **** { mType = RAY_SHAPE; ! // "ray" is already initialized from its constructor. } --- 42,47 ---- { mType = RAY_SHAPE; ! ray.setOrigin(defaults::shape::rayOrigin); ! ray.setDir(defaults::shape::rayDir); } Index: BoxShapeData.h =================================================================== RCS file: /cvsroot/opal/opal/src/BoxShapeData.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BoxShapeData.h 22 Feb 2005 19:46:29 -0000 1.2 --- BoxShapeData.h 3 Mar 2005 02:32:28 -0000 1.3 *************** *** 42,46 **** { mType = BOX_SHAPE; ! // "dimensions" is already initialized from its constructor. } --- 42,46 ---- { mType = BOX_SHAPE; ! dimensions = defaults::shape::boxDimensions; } |