From 22fe8935c3190aca10781fd633d392426ccc552e Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Tue, 12 May 2009 22:28:45 +0000 Subject: [PATCH] updated test1.oec with a few static objects fix Maya plugin hinge constraint support update copyright year in BulletCollision/CollisionShapes. --- Demos/Gpu2dDemo/BasicDemo.cpp | 12 +- Demos/Gpu2dDemo/oecakeLoader.cpp | 14 +- .../constraint/hingeConstraintNode.cpp | 1 + .../CollisionShapes/btBoxShape.cpp | 3 +- .../CollisionShapes/btBoxShape.h | 2 +- .../btBvhTriangleMeshShape.cpp | 2 +- .../CollisionShapes/btBvhTriangleMeshShape.h | 2 +- .../CollisionShapes/btCapsuleShape.cpp | 2 +- .../CollisionShapes/btCapsuleShape.h | 2 +- .../CollisionShapes/btCollisionMargin.h | 2 +- .../CollisionShapes/btCollisionShape.cpp | 4 +- .../CollisionShapes/btCollisionShape.h | 2 +- .../CollisionShapes/btCompoundShape.cpp | 11 +- .../CollisionShapes/btCompoundShape.h | 2 +- .../CollisionShapes/btConcaveShape.cpp | 3 +- .../CollisionShapes/btConcaveShape.h | 2 +- .../CollisionShapes/btConeShape.cpp | 2 +- .../CollisionShapes/btConeShape.h | 2 +- .../CollisionShapes/btConvexHullShape.cpp | 4 +- .../CollisionShapes/btConvexHullShape.h | 3 +- .../CollisionShapes/btConvexInternalShape.cpp | 2 +- .../CollisionShapes/btConvexInternalShape.h | 14 ++ .../btConvexPointCloudShape.cpp | 3 +- .../CollisionShapes/btConvexPointCloudShape.h | 2 +- .../CollisionShapes/btConvexShape.cpp | 2 +- .../CollisionShapes/btConvexShape.h | 2 +- .../btConvexTriangleMeshShape.cpp | 3 +- .../btConvexTriangleMeshShape.h | 14 ++ .../CollisionShapes/btCylinderShape.cpp | 3 +- .../CollisionShapes/btCylinderShape.h | 2 +- .../CollisionShapes/btEmptyShape.cpp | 2 +- .../CollisionShapes/btEmptyShape.h | 2 +- .../btHeightfieldTerrainShape.cpp | 2 +- .../btHeightfieldTerrainShape.h | 2 +- .../CollisionShapes/btMaterial.h | 2 +- .../CollisionShapes/btMinkowskiSumShape.cpp | 3 +- .../CollisionShapes/btMinkowskiSumShape.h | 2 +- .../CollisionShapes/btMultiSphereShape.cpp | 33 ++-- .../CollisionShapes/btMultiSphereShape.h | 18 +- .../btMultimaterialTriangleMeshShape.cpp | 2 +- .../btMultimaterialTriangleMeshShape.h | 2 +- .../CollisionShapes/btOptimizedBvh.cpp | 3 +- .../CollisionShapes/btOptimizedBvh.h | 4 +- .../btPolyhedralConvexShape.cpp | 2 +- .../CollisionShapes/btPolyhedralConvexShape.h | 2 +- .../btScaledBvhTriangleMeshShape.cpp | 3 +- .../btScaledBvhTriangleMeshShape.h | 2 +- .../CollisionShapes/btShapeHull.cpp | 11 +- .../CollisionShapes/btShapeHull.h | 10 +- .../CollisionShapes/btSphereShape.cpp | 2 +- .../CollisionShapes/btSphereShape.h | 3 +- .../CollisionShapes/btStaticPlaneShape.cpp | 2 +- .../CollisionShapes/btStaticPlaneShape.h | 2 +- .../btStridingMeshInterface.cpp | 2 +- .../CollisionShapes/btStridingMeshInterface.h | 2 +- .../CollisionShapes/btTetrahedronShape.cpp | 4 +- .../CollisionShapes/btTetrahedronShape.h | 2 +- .../CollisionShapes/btTriangleBuffer.cpp | 2 +- .../CollisionShapes/btTriangleBuffer.h | 2 +- .../CollisionShapes/btTriangleCallback.cpp | 2 +- .../CollisionShapes/btTriangleCallback.h | 2 +- .../btTriangleIndexVertexArray.cpp | 6 +- .../btTriangleIndexVertexArray.h | 10 +- .../btTriangleIndexVertexMaterialArray.cpp | 7 +- .../btTriangleIndexVertexMaterialArray.h | 2 +- .../CollisionShapes/btTriangleMesh.cpp | 3 +- .../CollisionShapes/btTriangleMesh.h | 3 +- .../CollisionShapes/btTriangleMeshShape.cpp | 2 +- .../CollisionShapes/btTriangleMeshShape.h | 2 +- .../CollisionShapes/btTriangleShape.h | 2 +- .../CollisionShapes/btUniformScalingShape.cpp | 2 +- .../CollisionShapes/btUniformScalingShape.h | 2 +- test1.oec | 178 ++++++++++-------- 73 files changed, 267 insertions(+), 210 deletions(-) diff --git a/Demos/Gpu2dDemo/BasicDemo.cpp b/Demos/Gpu2dDemo/BasicDemo.cpp index 01acc198d..ba82cd3fd 100644 --- a/Demos/Gpu2dDemo/BasicDemo.cpp +++ b/Demos/Gpu2dDemo/BasicDemo.cpp @@ -190,7 +190,7 @@ void BasicDemo::clientMoveAndDisplay() if (m_dynamicsWorld) { #if USE_CUDA_DEMO_PAIR_CASHE - btCudaDemoPairCache* pc = (btCudaDemoPairCache*)m_dynamicsWorld->getPairCache(); + btGpuDemoPairCache* pc = (btGpuDemoPairCache*)m_dynamicsWorld->getPairCache(); pc->m_numSmallProxies = m_dynamicsWorld->getNumCollisionObjects(); // - 1; // exclude floor #endif m_dynamicsWorld->stepSimulation(gTimeStep,0);//ms / 1000000.f); @@ -237,7 +237,7 @@ void BasicDemo::displayCallback(void) { btVector3 gWorldMax( POS_OFFS_X, POS_OFFS_Y, POS_OFFS_Z); #endif -//btCudaDemoPairCache* gPairCache; +//btGpuDemoPairCache* gPairCache; btOverlappingPairCache* gPairCache; @@ -276,7 +276,7 @@ void BasicDemo::initPhysics() #if USE_CUDA_DEMO_PAIR_CASHE - gPairCache = new (btAlignedAlloc(sizeof(btCudaDemoPairCache),16)) btCudaDemoPairCache(MAX_PROXIES, 24, MAX_SMALL_PROXIES); + gPairCache = new (btAlignedAlloc(sizeof(btGpuDemoPairCache),16)) btGpuDemoPairCache(MAX_PROXIES, 24, MAX_SMALL_PROXIES); #else gPairCache = new (btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16))btHashedOverlappingPairCache(); #endif @@ -319,6 +319,7 @@ void BasicDemo::initPhysics() //btCollisionShape* colShape = new btBoxShape(btVector3(SCALING*1,SCALING*1,0.1));//SCALING*1)); // btCollisionShape* colShape = new btBox2dShape(btVector3(SCALING*.7,SCALING*.7,0.1));//SCALING*1)); +#if 0 #define SPRADIUS btScalar(SCALING*0.1f) #define SPRPOS btScalar(SCALING*0.05f) static btVector3 sSphPos[8]; @@ -343,12 +344,13 @@ void BasicDemo::initPhysics() //btCollisionShape* colShape = new btSphereShape(btScalar(1.)); m_collisionShapes.push_back(colShape[0]); m_collisionShapes.push_back(colShape[1]); +#endif /// Create Dynamic Objects btTransform startTransform; startTransform.setIdentity(); - btScalar mass(1.f); + btScalar mass(0.f); //rigidbody is dynamic if and only if mass is non zero, otherwise static bool isDynamic = (mass != 0.f); @@ -614,7 +616,7 @@ void BasicDemo::keyboardCallback(unsigned char key, int x, int y) if(key == ' ') { #if USE_CUDA_DEMO_PAIR_CASHE - ((btCudaDemoPairCache*)gPairCache)->reset(); + ((btGpuDemoPairCache*)gPairCache)->reset(); #endif } } diff --git a/Demos/Gpu2dDemo/oecakeLoader.cpp b/Demos/Gpu2dDemo/oecakeLoader.cpp index 7a955bf76..ffcec6ddd 100644 --- a/Demos/Gpu2dDemo/oecakeLoader.cpp +++ b/Demos/Gpu2dDemo/oecakeLoader.cpp @@ -119,10 +119,14 @@ void BasicOECakeReader::addNewCollisionShape(int numParticles, btVector3* partic if ((materialType & 0x20000) ||(materialType & 0x12)) { mass = 1.f; + } else + { + mass = 0.f; } btTransform startTransform; startTransform.setIdentity(); + int numCurSpheres = 0; { @@ -132,11 +136,19 @@ void BasicOECakeReader::addNewCollisionShape(int numParticles, btVector3* partic //static btCompoundShape* compound = new btCompoundShape(); + for (int i=0;iaddChildShape(localTrans,particle); + if (mass==0.f && (numCurSpheres>=7)) + { + createBodyForCompoundShape(compound,false,startTransform,mass); + compound = new btCompoundShape(); + numCurSpheres = 0; + } } if (mass) { @@ -152,7 +164,7 @@ void BasicOECakeReader::addNewCollisionShape(int numParticles, btVector3* partic btDefaultMotionState* myMotionState = 0; - if (colShape) + if (colShape && numCurSpheres) { createBodyForCompoundShape(colShape,addConstraint,startTransform,mass); } diff --git a/Extras/MayaPlugin/constraint/hingeConstraintNode.cpp b/Extras/MayaPlugin/constraint/hingeConstraintNode.cpp index d67ba23f6..932230e9c 100644 --- a/Extras/MayaPlugin/constraint/hingeConstraintNode.cpp +++ b/Extras/MayaPlugin/constraint/hingeConstraintNode.cpp @@ -108,6 +108,7 @@ MStatus hingeConstraintNode::initialize() MCHECKSTATUS(status, "adding relaxationFactor attribute") ia_hingeAxis = fnNumericAttr.createPoint("hingeAxis", "hgAx", &status); + status = fnNumericAttr.setDefault((double) 0.0, (double) 0.0, (double) 1.0); MCHECKSTATUS(status, "creating hingeAxis attribute") status = addAttribute(ia_hingeAxis); MCHECKSTATUS(status, "adding hingeAxis attribute") diff --git a/src/BulletCollision/CollisionShapes/btBoxShape.cpp b/src/BulletCollision/CollisionShapes/btBoxShape.cpp index 8bc2cfa6f..c6644efbe 100644 --- a/src/BulletCollision/CollisionShapes/btBoxShape.cpp +++ b/src/BulletCollision/CollisionShapes/btBoxShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,7 +12,6 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ - #include "btBoxShape.h" diff --git a/src/BulletCollision/CollisionShapes/btBoxShape.h b/src/BulletCollision/CollisionShapes/btBoxShape.h index 14502d485..c71318dd3 100644 --- a/src/BulletCollision/CollisionShapes/btBoxShape.h +++ b/src/BulletCollision/CollisionShapes/btBoxShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp index 68ff5e2d7..b8e76d6f8 100644 --- a/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h index cb2c32657..8458a7ebc 100644 --- a/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp b/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp index 60a96a542..b1b526669 100644 --- a/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btCapsuleShape.h b/src/BulletCollision/CollisionShapes/btCapsuleShape.h index 828c1b3a5..1e54bfe8b 100644 --- a/src/BulletCollision/CollisionShapes/btCapsuleShape.h +++ b/src/BulletCollision/CollisionShapes/btCapsuleShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btCollisionMargin.h b/src/BulletCollision/CollisionShapes/btCollisionMargin.h index 4730264d3..18fd02604 100644 --- a/src/BulletCollision/CollisionShapes/btCollisionMargin.h +++ b/src/BulletCollision/CollisionShapes/btCollisionMargin.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btCollisionShape.cpp b/src/BulletCollision/CollisionShapes/btCollisionShape.cpp index d242cba1b..b534998a1 100644 --- a/src/BulletCollision/CollisionShapes/btCollisionShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCollisionShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,7 +12,6 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ - #include "BulletCollision/CollisionShapes/btCollisionShape.h" @@ -45,6 +44,7 @@ void btCollisionShape::getBoundingSphere(btVector3& center,btScalar& radius) con center = (aabbMin+aabbMax)*btScalar(0.5); } + btScalar btCollisionShape::getContactBreakingThreshold() const { return getAngularMotionDisc() * gContactThresholdFactor; diff --git a/src/BulletCollision/CollisionShapes/btCollisionShape.h b/src/BulletCollision/CollisionShapes/btCollisionShape.h index 1f4b9bec6..37f74ae46 100644 --- a/src/BulletCollision/CollisionShapes/btCollisionShape.h +++ b/src/BulletCollision/CollisionShapes/btCollisionShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btCompoundShape.cpp b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp index 9c2b04d18..9069eff07 100644 --- a/src/BulletCollision/CollisionShapes/btCompoundShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCompoundShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -124,14 +124,7 @@ void btCompoundShape::removeChildShape(btCollisionShape* shape) { if(m_children[i].m_childShape == shape) { - m_children.swap(i,m_children.size()-1); - m_children.pop_back(); - //remove it from the m_dynamicAabbTree too - //@todo: this leads to problems due to caching in the btCompoundCollisionAlgorithm - //so effectively, removeChildShape is broken at the moment - //m_dynamicAabbTree->remove(m_aabbProxies[i]); - //m_aabbProxies.swap(i,m_children.size()-1); - //m_aabbProxies.pop_back(); + removeChildShapeByIndex(i); } } diff --git a/src/BulletCollision/CollisionShapes/btCompoundShape.h b/src/BulletCollision/CollisionShapes/btCompoundShape.h index 434860c86..577ef9513 100644 --- a/src/BulletCollision/CollisionShapes/btCompoundShape.h +++ b/src/BulletCollision/CollisionShapes/btCompoundShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConcaveShape.cpp b/src/BulletCollision/CollisionShapes/btConcaveShape.cpp index 5103500a0..58ff84a5b 100644 --- a/src/BulletCollision/CollisionShapes/btConcaveShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConcaveShape.cpp @@ -1,7 +1,6 @@ - /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConcaveShape.h b/src/BulletCollision/CollisionShapes/btConcaveShape.h index 30065d55a..2a370a47c 100644 --- a/src/BulletCollision/CollisionShapes/btConcaveShape.h +++ b/src/BulletCollision/CollisionShapes/btConcaveShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConeShape.cpp b/src/BulletCollision/CollisionShapes/btConeShape.cpp index d887be61a..dfa3f941e 100644 --- a/src/BulletCollision/CollisionShapes/btConeShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConeShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConeShape.h b/src/BulletCollision/CollisionShapes/btConeShape.h index 1869893f3..9766c7ef2 100644 --- a/src/BulletCollision/CollisionShapes/btConeShape.h +++ b/src/BulletCollision/CollisionShapes/btConeShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp index 7b45fad12..8a9c9cb53 100644 --- a/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,13 +12,13 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "btConvexHullShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" #include "LinearMath/btQuaternion.h" - btConvexHullShape ::btConvexHullShape (const btScalar* points,int numPoints,int stride) : btPolyhedralConvexShape () { m_shapeType = CONVEX_HULL_SHAPE_PROXYTYPE; diff --git a/src/BulletCollision/CollisionShapes/btConvexHullShape.h b/src/BulletCollision/CollisionShapes/btConvexHullShape.h index baf074be6..e42b5f321 100644 --- a/src/BulletCollision/CollisionShapes/btConvexHullShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexHullShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -20,6 +20,7 @@ subject to the following restrictions: #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types #include "LinearMath/btAlignedObjectArray.h" + ///The btConvexHullShape implements an implicit convex hull of an array of vertices. ///Bullet provides a general and fast collision detector for convex shapes based on GJK and EPA using localGetSupportingVertex. ATTRIBUTE_ALIGNED16(class) btConvexHullShape : public btPolyhedralConvexShape diff --git a/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp b/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp index bfb741310..11fad2d05 100644 --- a/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConvexInternalShape.h b/src/BulletCollision/CollisionShapes/btConvexInternalShape.h index bab720d7b..ab3f91c46 100644 --- a/src/BulletCollision/CollisionShapes/btConvexInternalShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexInternalShape.h @@ -1,3 +1,17 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ #ifndef BT_CONVEX_INTERNAL_SHAPE_H #define BT_CONVEX_INTERNAL_SHAPE_H diff --git a/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp b/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp index 4ab5d6929..886c8a61a 100644 --- a/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,6 +12,7 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "btConvexPointCloudShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h b/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h index 7e1c13b29..44f6c13d0 100644 --- a/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/src/BulletCollision/CollisionShapes/btConvexShape.cpp index 7e67696f4..8246e94a8 100644 --- a/src/BulletCollision/CollisionShapes/btConvexShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConvexShape.h b/src/BulletCollision/CollisionShapes/btConvexShape.h index 0cc7b3495..9c158259c 100644 --- a/src/BulletCollision/CollisionShapes/btConvexShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp index 4bd986bb7..b9bb0dfb6 100644 --- a/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,6 +12,7 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "btConvexTriangleMeshShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h index 9d7e39fce..ae32595ff 100644 --- a/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h @@ -1,3 +1,17 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ #ifndef CONVEX_TRIANGLEMESH_SHAPE_H #define CONVEX_TRIANGLEMESH_SHAPE_H diff --git a/src/BulletCollision/CollisionShapes/btCylinderShape.cpp b/src/BulletCollision/CollisionShapes/btCylinderShape.cpp index c9fa907ed..e7eb6d341 100644 --- a/src/BulletCollision/CollisionShapes/btCylinderShape.cpp +++ b/src/BulletCollision/CollisionShapes/btCylinderShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,6 +12,7 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "btCylinderShape.h" btCylinderShape::btCylinderShape (const btVector3& halfExtents) diff --git a/src/BulletCollision/CollisionShapes/btCylinderShape.h b/src/BulletCollision/CollisionShapes/btCylinderShape.h index bda74a861..62e6fcee5 100644 --- a/src/BulletCollision/CollisionShapes/btCylinderShape.h +++ b/src/BulletCollision/CollisionShapes/btCylinderShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btEmptyShape.cpp b/src/BulletCollision/CollisionShapes/btEmptyShape.cpp index 8387b9584..a9e6df5c5 100644 --- a/src/BulletCollision/CollisionShapes/btEmptyShape.cpp +++ b/src/BulletCollision/CollisionShapes/btEmptyShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btEmptyShape.h b/src/BulletCollision/CollisionShapes/btEmptyShape.h index 8720d53ae..9f6b4435c 100644 --- a/src/BulletCollision/CollisionShapes/btEmptyShape.h +++ b/src/BulletCollision/CollisionShapes/btEmptyShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp b/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp index 7d4875d80..3a1e6f4a2 100644 --- a/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp +++ b/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h b/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h index 36489a0eb..4f5d1e35b 100644 --- a/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h +++ b/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btMaterial.h b/src/BulletCollision/CollisionShapes/btMaterial.h index 7cb6d5ab6..3f2c892a4 100644 --- a/src/BulletCollision/CollisionShapes/btMaterial.h +++ b/src/BulletCollision/CollisionShapes/btMaterial.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp index b107b0bea..06707e24e 100644 --- a/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp +++ b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,6 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ + #include "btMinkowskiSumShape.h" diff --git a/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h index 6f637fbf4..d6fd04021 100644 --- a/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h +++ b/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp index 942350529..a1539298a 100644 --- a/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +++ b/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,6 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ + + #include "btMultiSphereShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" #include "LinearMath/btQuaternion.h" @@ -23,15 +25,15 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons m_shapeType = MULTI_SPHERE_SHAPE_PROXYTYPE; btScalar startMargin = btScalar(1e30); - m_numSpheres = numSpheres; - for (int i=0;i m_localPositionArray; + btAlignedObjectArray m_radiArray; btVector3 m_inertiaHalfExtents; - int m_numSpheres; - - public: @@ -49,17 +45,17 @@ public: int getSphereCount() const { - return m_numSpheres; + return m_localPositionArray.size(); } const btVector3& getSpherePosition(int index) const { - return m_localPositions[index]; + return m_localPositionArray[index]; } btScalar getSphereRadius(int index) const { - return m_radi[index]; + return m_radiArray[index]; } diff --git a/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp index fc47e8641..58799ac96 100644 --- a/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h index d025a5c44..231c58549 100644 --- a/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp b/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp index 3e7305939..7353af083 100644 --- a/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp +++ b/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,6 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ + #include "btOptimizedBvh.h" #include "btStridingMeshInterface.h" #include "LinearMath/btAabbUtil2.h" diff --git a/src/BulletCollision/CollisionShapes/btOptimizedBvh.h b/src/BulletCollision/CollisionShapes/btOptimizedBvh.h index d7536417d..8f3a29f7e 100644 --- a/src/BulletCollision/CollisionShapes/btOptimizedBvh.h +++ b/src/BulletCollision/CollisionShapes/btOptimizedBvh.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,6 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ +///Contains contributions from Disney Studio's + #ifndef OPTIMIZED_BVH_H #define OPTIMIZED_BVH_H diff --git a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp index 7a79ac257..d62500a15 100644 --- a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp +++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h index 7567a42d3..77d620d3b 100644 --- a/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h +++ b/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp index 1fac15387..d964e1e48 100644 --- a/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,6 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ + #include "btScaledBvhTriangleMeshShape.h" btScaledBvhTriangleMeshShape::btScaledBvhTriangleMeshShape(btBvhTriangleMeshShape* childShape,const btVector3& localScaling) diff --git a/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h index 5da6fe8bc..d720b1b4f 100644 --- a/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btShapeHull.cpp b/src/BulletCollision/CollisionShapes/btShapeHull.cpp index a87b87f1a..061054444 100644 --- a/src/BulletCollision/CollisionShapes/btShapeHull.cpp +++ b/src/BulletCollision/CollisionShapes/btShapeHull.cpp @@ -1,13 +1,11 @@ /* -btbtShapeHull implemented by John McCutchan. - Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://bulletphysics.com +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -15,6 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ +//btShapeHull was implemented by John McCutchan. + + #include "btShapeHull.h" #include "LinearMath/btConvexHull.h" diff --git a/src/BulletCollision/CollisionShapes/btShapeHull.h b/src/BulletCollision/CollisionShapes/btShapeHull.h index 583c6b99e..708655d21 100644 --- a/src/BulletCollision/CollisionShapes/btShapeHull.h +++ b/src/BulletCollision/CollisionShapes/btShapeHull.h @@ -1,13 +1,11 @@ /* -btShapeHull implemented by John McCutchan. - Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2008 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -15,6 +13,8 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ +///btShapeHull implemented by John McCutchan. + #ifndef _SHAPE_HULL_H #define _SHAPE_HULL_H diff --git a/src/BulletCollision/CollisionShapes/btSphereShape.cpp b/src/BulletCollision/CollisionShapes/btSphereShape.cpp index cab7b2772..b9a736c0f 100644 --- a/src/BulletCollision/CollisionShapes/btSphereShape.cpp +++ b/src/BulletCollision/CollisionShapes/btSphereShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btSphereShape.h b/src/BulletCollision/CollisionShapes/btSphereShape.h index bf163d3b5..f98372442 100644 --- a/src/BulletCollision/CollisionShapes/btSphereShape.h +++ b/src/BulletCollision/CollisionShapes/btSphereShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,7 +12,6 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ - #ifndef SPHERE_MINKOWSKI_H #define SPHERE_MINKOWSKI_H diff --git a/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp index 17b8776d4..4d2fc6953 100644 --- a/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp +++ b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h index a496013c0..2b5d4b338 100644 --- a/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h +++ b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp index b3243bf44..0a0ff2684 100644 --- a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp +++ b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h index e61b11499..09641cf53 100644 --- a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h +++ b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp b/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp index 7fd8fb469..22978dfeb 100644 --- a/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp +++ b/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp @@ -1,7 +1,6 @@ - /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,6 +12,7 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ + #include "btTetrahedronShape.h" #include "LinearMath/btMatrix3x3.h" diff --git a/src/BulletCollision/CollisionShapes/btTetrahedronShape.h b/src/BulletCollision/CollisionShapes/btTetrahedronShape.h index 114ae288b..b9dea9a06 100644 --- a/src/BulletCollision/CollisionShapes/btTetrahedronShape.h +++ b/src/BulletCollision/CollisionShapes/btTetrahedronShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp b/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp index 5194219f2..3027e65b2 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleBuffer.h b/src/BulletCollision/CollisionShapes/btTriangleBuffer.h index adca38041..b71fc8b37 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleBuffer.h +++ b/src/BulletCollision/CollisionShapes/btTriangleBuffer.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp b/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp index a020746db..f558bf6d2 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleCallback.h b/src/BulletCollision/CollisionShapes/btTriangleCallback.h index cb760be80..0499702b0 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleCallback.h +++ b/src/BulletCollision/CollisionShapes/btTriangleCallback.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp index b3527da89..a665024cb 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp @@ -1,11 +1,11 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. diff --git a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h index c61be4cff..7473c063c 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -25,7 +25,7 @@ subject to the following restrictions: ///Instead of the number of indices, we pass the number of triangles. ATTRIBUTE_ALIGNED16( struct) btIndexedMesh { - BT_DECLARE_ALIGNED_ALLOCATOR(); + BT_DECLARE_ALIGNED_ALLOCATOR(); int m_numTriangles; const unsigned char * m_triangleIndexBase; @@ -84,10 +84,10 @@ public: //just to be backwards compatible btTriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride); - void addIndexedMesh(const btIndexedMesh& mesh, PHY_ScalarType indexType = PHY_INTEGER) + void addIndexedMesh(const btIndexedMesh& mesh, PHY_ScalarType indexType = PHY_INTEGER) { - m_indexedMeshes.push_back(mesh); - m_indexedMeshes[m_indexedMeshes.size()-1].m_indexType = indexType; + m_indexedMeshes.push_back(mesh); + m_indexedMeshes[m_indexedMeshes.size()-1].m_indexType = indexType; } diff --git a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp index abefa7125..dc562941a 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp @@ -1,12 +1,11 @@ - /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. diff --git a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h index 69a2e6314..ba4f7b460 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h +++ b/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp b/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp index 5dcfa51c2..b29e0f71e 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,6 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ + #include "btTriangleMesh.h" diff --git a/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/src/BulletCollision/CollisionShapes/btTriangleMesh.h index f06fbb7c2..e82531c30 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMesh.h +++ b/src/BulletCollision/CollisionShapes/btTriangleMesh.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,7 +13,6 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ - #ifndef TRIANGLE_MESH_H #define TRIANGLE_MESH_H diff --git a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp index 1bd7e84a4..92bfc5ce8 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h index 53d657990..4bb14841f 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btTriangleShape.h b/src/BulletCollision/CollisionShapes/btTriangleShape.h index 4bfb0b9e8..09a769515 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleShape.h +++ b/src/BulletCollision/CollisionShapes/btTriangleShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp b/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp index 4c1c716d5..8e86f6bf2 100644 --- a/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp +++ b/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/src/BulletCollision/CollisionShapes/btUniformScalingShape.h b/src/BulletCollision/CollisionShapes/btUniformScalingShape.h index 945976ac0..cbf7e6fd3 100644 --- a/src/BulletCollision/CollisionShapes/btUniformScalingShape.h +++ b/src/BulletCollision/CollisionShapes/btUniformScalingShape.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/test1.oec b/test1.oec index 7b9928a93..c32c5669f 100644 --- a/test1.oec +++ b/test1.oec @@ -28,85 +28,101 @@ p 22000 5 ff 7fff66ff 57.125 74 0 0 57.125 74 0 0 0 p 22000 5 ff 7fff66ff 57.7958 73.6646 0 0 57.7958 73.6646 0 0 0 p 22000 5 ff 7fff66ff 58.1111 74.3451 0 0 58.1111 74.3451 0 0 0 p 22000 5 ff 7fff66ff 57.5445 74.8364 0 0 57.5445 74.8364 0 0 0 -p 822000 6 ff 99cc7fff 56.25 70 0 0 56.25 70 0 0 0 -p 822000 6 ff 99cc7fff 57 70 0 0 57 70 0 0 0 -p 822000 6 ff 99cc7fff 57.7398 69.8767 0 0 57.7398 69.8767 0 0 0 -p 822000 6 ff 99cc7fff 58.4898 69.875 0 0 58.4898 69.875 0 0 0 -p 822000 6 ff 99cc7fff 59.2398 69.875 0 0 59.2398 69.875 0 0 0 -p 822000 6 ff 99cc7fff 59.9898 69.875 0 0 59.9898 69.875 0 0 0 -p 822000 6 ff 99cc7fff 60.7398 69.875 0 0 60.7398 69.875 0 0 0 -p 822000 6 ff 99cc7fff 61.4898 69.875 0 0 61.4898 69.875 0 0 0 -p 822000 7 ff 99cc7fff 41.875 70 0 0 41.875 70 0 0 0 -p 822000 7 ff 99cc7fff 41.125 70 0 0 41.125 70 0 0 0 -p 822000 7 ff 99cc7fff 40.3852 70.1233 0 0 40.3852 70.1233 0 0 0 -p 822000 7 ff 99cc7fff 39.6352 70.125 0 0 39.6352 70.125 0 0 0 -p 822000 7 ff 99cc7fff 38.8926 70.2299 0 0 38.8926 70.2299 0 0 0 -p 822000 7 ff 99cc7fff 38.1428 70.2495 0 0 38.1428 70.2495 0 0 0 -p 822000 7 ff 99cc7fff 37.3928 70.25 0 0 37.3928 70.25 0 0 0 -p 22000 8 ff 7fff66ff 62.25 57.625 0 0 62.25 57.625 0 0 0 -p 22000 8 ff 7fff66ff 62.9615 57.3878 0 0 62.9615 57.3878 0 0 0 -p 22000 8 ff 7fff66ff 62.8866 58.1341 0 0 62.8866 58.1341 0 0 0 -p 22000 8 ff 7fff66ff 62.2927 58.5921 0 0 62.2927 58.5921 0 0 0 -p 22000 9 ff 7fff66ff 46.875 59 0 0 46.875 59 0 0 0 -p 22000 9 ff 7fff66ff 47.3435 58.4143 0 0 47.3435 58.4143 0 0 0 -p 22000 9 ff 7fff66ff 48.0775 58.26 0 0 48.0775 58.26 0 0 0 -p 22000 9 ff 7fff66ff 48.4494 58.9113 0 0 48.4494 58.9113 0 0 0 -p 22000 9 ff 7fff66ff 48.2759 59.641 0 0 48.2759 59.641 0 0 0 -p 22000 a ff 7fff66ff 32.625 58.625 0 0 32.625 58.625 0 0 0 -p 22000 a ff 7fff66ff 33.2958 58.2896 0 0 33.2958 58.2896 0 0 0 -p 22000 a ff 7fff66ff 34.045 58.2538 0 0 34.045 58.2538 0 0 0 -p 22000 a ff 7fff66ff 34.3483 58.9397 0 0 34.3483 58.9397 0 0 0 -p 22000 b ff 7fff66ff 23 50 0 0 23 50 0 0 0 -p 22000 b ff 7fff66ff 23.6512 49.6279 0 0 23.6512 49.6279 0 0 0 -p 22000 b ff 7fff66ff 24.3928 49.5162 0 0 24.3928 49.5162 0 0 0 -p 22000 b ff 7fff66ff 24.1695 50.2321 0 0 24.1695 50.2321 0 0 0 -p 22000 c ff 7fff66ff 18.375 59.25 0 0 18.375 59.25 0 0 0 -p 22000 c ff 7fff66ff 18.9053 58.7197 0 0 18.9053 58.7197 0 0 0 -p 22000 c ff 7fff66ff 19.4651 59.2189 0 0 19.4651 59.2189 0 0 0 -p 22000 c ff 7fff66ff 19.3792 59.9639 0 0 19.3792 59.9639 0 0 0 -p 22000 d ff 7fff66ff 44.125 51.75 0 0 44.125 51.75 0 0 0 -p 22000 d ff 7fff66ff 44.0017 51.0102 0 0 44.0017 51.0102 0 0 0 -p 22000 d ff 7fff66ff 44.743 51.1239 0 0 44.743 51.1239 0 0 0 -p 22000 d ff 7fff66ff 45.0428 51.8114 0 0 45.0428 51.8114 0 0 0 -p 22000 e ff 7fff66ff 59.125 49.375 0 0 59.125 49.375 0 0 0 -p 22000 e ff 7fff66ff 59.125 48.625 0 0 59.125 48.625 0 0 0 -p 22000 e ff 7fff66ff 59.7958 48.2896 0 0 59.7958 48.2896 0 0 0 -p 22000 e ff 7fff66ff 59.9739 49.0181 0 0 59.9739 49.0181 0 0 0 -p 22000 f ff 7fff66ff 42.5 41.625 0 0 42.5 41.625 0 0 0 -p 22000 f ff 7fff66ff 43.0303 41.0947 0 0 43.0303 41.0947 0 0 0 -p 22000 f ff 7fff66ff 43.7798 41.1216 0 0 43.7798 41.1216 0 0 0 -p 22000 f ff 7fff66ff 44.3525 41.6059 0 0 44.3525 41.6059 0 0 0 -p 22000 f ff 7fff66ff 43.9569 42.2431 0 0 43.9569 42.2431 0 0 0 -p 22000 10 ff 7fff66ff 70.375 63.125 0 0 70.375 63.125 0 0 0 -p 22000 10 ff 7fff66ff 70.375 62.375 0 0 70.375 62.375 0 0 0 -p 22000 10 ff 7fff66ff 71.1148 62.4983 0 0 71.1148 62.4983 0 0 0 -p 22000 10 ff 7fff66ff 71.2476 63.2365 0 0 71.2476 63.2365 0 0 0 -p 22000 11 ff 7fff66ff 15.5 40.375 0 0 15.5 40.375 0 0 0 -p 22000 11 ff 7fff66ff 16.124 39.959 0 0 16.124 39.959 0 0 0 -p 22000 11 ff 7fff66ff 16.8729 39.9999 0 0 16.8729 39.9999 0 0 0 -p 22000 11 ff 7fff66ff 17.2098 40.67 0 0 17.2098 40.67 0 0 0 -p 22000 12 ff 7fff66ff 29.375 37.875 0 0 29.375 37.875 0 0 0 -p 22000 12 ff 7fff66ff 29.791 37.251 0 0 29.791 37.251 0 0 0 -p 22000 12 ff 7fff66ff 30.5326 37.139 0 0 30.5326 37.139 0 0 0 -p 22000 12 ff 7fff66ff 30.6126 37.8847 0 0 30.6126 37.8847 0 0 0 -p 22000 13 ff 7fff66ff 69.75 49 0 0 69.75 49 0 0 0 -p 22000 13 ff 7fff66ff 69.8733 48.2602 0 0 69.8733 48.2602 0 0 0 -p 22000 13 ff 7fff66ff 69.875 47.5102 0 0 69.875 47.5102 0 0 0 -p 22000 13 ff 7fff66ff 69.875 46.7602 0 0 69.875 46.7602 0 0 0 -p 22000 13 ff 7fff66ff 69.875 46.0102 0 0 69.875 46.0102 0 0 0 -p 22000 14 ff 7fff66ff 61.625 38 0 0 61.625 38 0 0 0 -p 22000 14 ff 7fff66ff 61.625 37.25 0 0 61.625 37.25 0 0 0 -p 22000 14 ff 7fff66ff 61.625 36.5 0 0 61.625 36.5 0 0 0 -p 22000 14 ff 7fff66ff 61.625 35.75 0 0 61.625 35.75 0 0 0 -p 22000 14 ff 7fff66ff 61.625 35 0 0 61.625 35 0 0 0 -p 22000 15 ff 7fff66ff 43.875 34.25 0 0 43.875 34.25 0 0 0 -p 22000 15 ff 7fff66ff 44.625 34.25 0 0 44.625 34.25 0 0 0 -p 22000 15 ff 7fff66ff 45.375 34.25 0 0 45.375 34.25 0 0 0 -p 22000 15 ff 7fff66ff 46.125 34.25 0 0 46.125 34.25 0 0 0 -p 22000 16 ff 7fff66ff 7.25 54 0 0 7.25 54 0 0 0 -p 22000 16 ff 7fff66ff 7.25 53.25 0 0 7.25 53.25 0 0 0 -p 22000 16 ff 7fff66ff 7.25 52.5 0 0 7.25 52.5 0 0 0 -p 22000 16 ff 7fff66ff 7.25 51.75 0 0 7.25 51.75 0 0 0 +p 822000 12 ff 99cc7fff 41.875 70 0 0 41.875 70 0 0 0 +p 822000 12 ff 99cc7fff 41.125 70 0 0 41.125 70 0 0 0 +p 822000 12 ff 99cc7fff 40.3852 70.1233 0 0 40.3852 70.1233 0 0 0 +p 822000 12 ff 99cc7fff 39.6352 70.125 0 0 39.6352 70.125 0 0 0 +p 822000 12 ff 99cc7fff 38.8926 70.2299 0 0 38.8926 70.2299 0 0 0 +p 822000 12 ff 99cc7fff 38.1428 70.2495 0 0 38.1428 70.2495 0 0 0 +p 822000 12 ff 99cc7fff 37.3928 70.25 0 0 37.3928 70.25 0 0 0 +p 22000 15 ff 7fff66ff 62.25 57.625 0 0 62.25 57.625 0 0 0 +p 22000 15 ff 7fff66ff 62.9615 57.3878 0 0 62.9615 57.3878 0 0 0 +p 22000 15 ff 7fff66ff 62.8866 58.1341 0 0 62.8866 58.1341 0 0 0 +p 22000 15 ff 7fff66ff 62.2927 58.5921 0 0 62.2927 58.5921 0 0 0 +p 22000 14 ff 7fff66ff 46.875 59 0 0 46.875 59 0 0 0 +p 22000 14 ff 7fff66ff 47.3435 58.4143 0 0 47.3435 58.4143 0 0 0 +p 22000 14 ff 7fff66ff 48.0775 58.26 0 0 48.0775 58.26 0 0 0 +p 22000 14 ff 7fff66ff 48.4494 58.9113 0 0 48.4494 58.9113 0 0 0 +p 22000 14 ff 7fff66ff 48.2759 59.641 0 0 48.2759 59.641 0 0 0 +p 22000 17 ff 7fff66ff 32.625 58.625 0 0 32.625 58.625 0 0 0 +p 22000 17 ff 7fff66ff 33.2958 58.2896 0 0 33.2958 58.2896 0 0 0 +p 22000 17 ff 7fff66ff 34.045 58.2538 0 0 34.045 58.2538 0 0 0 +p 22000 17 ff 7fff66ff 34.3483 58.9397 0 0 34.3483 58.9397 0 0 0 +p 22000 16 ff 7fff66ff 23 50 0 0 23 50 0 0 0 +p 22000 16 ff 7fff66ff 23.6512 49.6279 0 0 23.6512 49.6279 0 0 0 +p 22000 16 ff 7fff66ff 24.3928 49.5162 0 0 24.3928 49.5162 0 0 0 +p 22000 16 ff 7fff66ff 24.1695 50.2321 0 0 24.1695 50.2321 0 0 0 +p 22000 18 ff 7fff66ff 18.375 59.25 0 0 18.375 59.25 0 0 0 +p 22000 18 ff 7fff66ff 18.9053 58.7197 0 0 18.9053 58.7197 0 0 0 +p 22000 18 ff 7fff66ff 19.4651 59.2189 0 0 19.4651 59.2189 0 0 0 +p 22000 18 ff 7fff66ff 19.3792 59.9639 0 0 19.3792 59.9639 0 0 0 +p 22000 7 ff 7fff66ff 44.125 51.75 0 0 44.125 51.75 0 0 0 +p 22000 7 ff 7fff66ff 44.0017 51.0102 0 0 44.0017 51.0102 0 0 0 +p 22000 7 ff 7fff66ff 44.743 51.1239 0 0 44.743 51.1239 0 0 0 +p 22000 7 ff 7fff66ff 45.0428 51.8114 0 0 45.0428 51.8114 0 0 0 +p 22000 8 ff 7fff66ff 59.125 49.375 0 0 59.125 49.375 0 0 0 +p 22000 8 ff 7fff66ff 59.125 48.625 0 0 59.125 48.625 0 0 0 +p 22000 8 ff 7fff66ff 59.7958 48.2896 0 0 59.7958 48.2896 0 0 0 +p 22000 8 ff 7fff66ff 59.9739 49.0181 0 0 59.9739 49.0181 0 0 0 +p 22000 9 ff 7fff66ff 42.5 41.625 0 0 42.5 41.625 0 0 0 +p 22000 9 ff 7fff66ff 43.0303 41.0947 0 0 43.0303 41.0947 0 0 0 +p 22000 9 ff 7fff66ff 43.7798 41.1216 0 0 43.7798 41.1216 0 0 0 +p 22000 9 ff 7fff66ff 44.3525 41.6059 0 0 44.3525 41.6059 0 0 0 +p 22000 9 ff 7fff66ff 43.9569 42.2431 0 0 43.9569 42.2431 0 0 0 +p 22000 a ff 7fff66ff 70.375 63.125 0 0 70.375 63.125 0 0 0 +p 22000 a ff 7fff66ff 70.375 62.375 0 0 70.375 62.375 0 0 0 +p 22000 a ff 7fff66ff 71.1148 62.4983 0 0 71.1148 62.4983 0 0 0 +p 22000 a ff 7fff66ff 71.2476 63.2365 0 0 71.2476 63.2365 0 0 0 +p 22000 b ff 7fff66ff 15.5 40.375 0 0 15.5 40.375 0 0 0 +p 22000 b ff 7fff66ff 16.124 39.959 0 0 16.124 39.959 0 0 0 +p 22000 b ff 7fff66ff 16.8729 39.9999 0 0 16.8729 39.9999 0 0 0 +p 22000 b ff 7fff66ff 17.2098 40.67 0 0 17.2098 40.67 0 0 0 +p 22000 c ff 7fff66ff 29.375 37.875 0 0 29.375 37.875 0 0 0 +p 22000 c ff 7fff66ff 29.791 37.251 0 0 29.791 37.251 0 0 0 +p 22000 c ff 7fff66ff 30.5326 37.139 0 0 30.5326 37.139 0 0 0 +p 22000 c ff 7fff66ff 30.6126 37.8847 0 0 30.6126 37.8847 0 0 0 +p 22000 d ff 7fff66ff 69.75 49 0 0 69.75 49 0 0 0 +p 22000 d ff 7fff66ff 69.8733 48.2602 0 0 69.8733 48.2602 0 0 0 +p 22000 d ff 7fff66ff 69.875 47.5102 0 0 69.875 47.5102 0 0 0 +p 22000 d ff 7fff66ff 69.875 46.7602 0 0 69.875 46.7602 0 0 0 +p 22000 d ff 7fff66ff 69.875 46.0102 0 0 69.875 46.0102 0 0 0 +p 22000 e ff 7fff66ff 61.625 38 0 0 61.625 38 0 0 0 +p 22000 e ff 7fff66ff 61.625 37.25 0 0 61.625 37.25 0 0 0 +p 22000 e ff 7fff66ff 61.625 36.5 0 0 61.625 36.5 0 0 0 +p 22000 e ff 7fff66ff 61.625 35.75 0 0 61.625 35.75 0 0 0 +p 22000 e ff 7fff66ff 61.625 35 0 0 61.625 35 0 0 0 +p 22000 11 ff 7fff66ff 7.25 54 0 0 7.25 54 0 0 0 +p 22000 11 ff 7fff66ff 7.25 53.25 0 0 7.25 53.25 0 0 0 +p 22000 11 ff 7fff66ff 7.25 52.5 0 0 7.25 52.5 0 0 0 +p 22000 11 ff 7fff66ff 7.25 51.75 0 0 7.25 51.75 0 0 0 +p 402000 0 ff b26666ff 55.75 70.75 0 0 55.75 70.75 0 0 0 +p 402000 0 ff b26666ff 55.75 70 0 0 55.75 70 0 0 0 +p 402000 0 ff b26666ff 56.5 70 0 0 56.5 70 0 0 0 +p 402000 0 ff b26666ff 56.5 70.75 0 0 56.5 70.75 0 0 0 +p 402000 0 ff b26666ff 57.25 70.75 0 0 57.25 70.75 0 0 0 +p 402000 0 ff b26666ff 57.25 70 0 0 57.25 70 0 0 0 +p 402000 0 ff b26666ff 58 70 0 0 58 70 0 0 0 +p 402000 0 ff b26666ff 58 70.75 0 0 58 70.75 0 0 0 +p 402000 0 ff b26666ff 58.75 70 0 0 58.75 70 0 0 0 +p 402000 0 ff b26666ff 58.75 70.75 0 0 58.75 70.75 0 0 0 +p 402000 0 ff b26666ff 59.5 70.75 0 0 59.5 70.75 0 0 0 +p 402000 0 ff b26666ff 59.5 70 0 0 59.5 70 0 0 0 +p 402000 0 ff b26666ff 60.25 70 0 0 60.25 70 0 0 0 +p 402000 0 ff b26666ff 60.25 70.75 0 0 60.25 70.75 0 0 0 +p 402000 0 ff b26666ff 61 70 0 0 61 70 0 0 0 +p 402000 0 ff b26666ff 61 70.75 0 0 61 70.75 0 0 0 +p 402000 0 ff b26666ff 43 35.5 0 0 43 35.5 0 0 0 +p 402000 0 ff b26666ff 43 34 0 0 43 34 0 0 0 +p 402000 0 ff b26666ff 43 34.75 0 0 43 34.75 0 0 0 +p 402000 0 ff b26666ff 43.75 35.5 0 0 43.75 35.5 0 0 0 +p 402000 0 ff b26666ff 43.75 34 0 0 43.75 34 0 0 0 +p 402000 0 ff b26666ff 43.75 34.75 0 0 43.75 34.75 0 0 0 +p 402000 0 ff b26666ff 44.5 34.75 0 0 44.5 34.75 0 0 0 +p 402000 0 ff b26666ff 44.5 34 0 0 44.5 34 0 0 0 +p 402000 0 ff b26666ff 45.25 34 0 0 45.25 34 0 0 0 +p 402000 0 ff b26666ff 45.25 34.75 0 0 45.25 34.75 0 0 0 +p 402000 0 ff b26666ff 46 34 0 0 46 34 0 0 0 +p 402000 0 ff b26666ff 46 34.75 0 0 46 34.75 0 0 0 @ time 7.52012 @ timeStep 1504 @ scale 8 @@ -121,9 +137,9 @@ p 22000 16 ff 7fff66ff 7.25 51.75 0 0 7.25 51.75 0 0 0 @ boundsFlag 1 @ boundsThickness 0.25 @ boundsLeft 0 -@ boundsRight 95.25 +@ boundsRight 94.75 @ boundsBottom 0 -@ boundsTop 89.75 +@ boundsTop 89.25 @ boundsRadius 1 @ standardDistance 0.75 @ standardDensity 1.0025