Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated test1.oec with a few static objects

Browse Source 
fix Maya plugin hinge constraint support
update copyright year in BulletCollision/CollisionShapes.
This commit is contained in:
erwin.coumans
2009-05-12 22:28:45 +00:00
parent 6ac6b3a257
commit 22fe8935c3
73 changed files with 267 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Demos/Gpu2dDemo/BasicDemo.cpp
View File

@@ -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
}
}

14
Demos/Gpu2dDemo/oecakeLoader.cpp
View File

@@ -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;i<numParticles;i++)
{
numCurSpheres++;
localTrans.setOrigin(particlePositions[i]);
btSphereShape* particle = new btSphereShape(radii[i]);
compound->addChildShape(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);
}

1
Extras/MayaPlugin/constraint/hingeConstraintNode.cpp
View File

@@ -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")

3
src/BulletCollision/CollisionShapes/btBoxShape.cpp
View File

@@ -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"

2
src/BulletCollision/CollisionShapes/btBoxShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btCapsuleShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btCollisionMargin.h
View File

@@ -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.

4
src/BulletCollision/CollisionShapes/btCollisionShape.cpp
View File

@@ -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;

2
src/BulletCollision/CollisionShapes/btCollisionShape.h
View File

@@ -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.

11
src/BulletCollision/CollisionShapes/btCompoundShape.cpp
View File

@@ -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);
}
}

2
src/BulletCollision/CollisionShapes/btCompoundShape.h
View File

@@ -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.

3
src/BulletCollision/CollisionShapes/btConcaveShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btConcaveShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btConeShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btConeShape.h
View File

@@ -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.

4
src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
View File

@@ -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;

3
src/BulletCollision/CollisionShapes/btConvexHullShape.h
View File

@@ -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

2
src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
View File

@@ -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.

14
src/BulletCollision/CollisionShapes/btConvexInternalShape.h
View File

@@ -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

3
src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
View File

@@ -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"

2
src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btConvexShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btConvexShape.h
View File

@@ -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.

3
src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
View File

@@ -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"

14
src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
View File

@@ -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

3
src/BulletCollision/CollisionShapes/btCylinderShape.cpp
View File

@@ -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)

2
src/BulletCollision/CollisionShapes/btCylinderShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btEmptyShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btEmptyShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btMaterial.h
View File

@@ -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.

3
src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
View File

@@ -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"

2
src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
View File

@@ -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.

33
src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
View File

@@ -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_numSpheres;i++)
m_localPositionArray.resize(numSpheres);
m_radiArray.resize(numSpheres);
for (int i=0;i<numSpheres;i++)
{
m_localPositions[i] = positions[i];
m_radi[i] = radi[i];
if (radi[i] < startMargin)
startMargin = radi[i];
m_localPositionArray[i] = positions[i];
m_radiArray[i] = radi[i];
}
setMargin(startMargin);
}
@@ -60,10 +62,11 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons
btVector3 vtx;
btScalar newDot;
const btVector3* pos = &m_localPositions[0];
const btScalar* rad = &m_radi[0];
const btVector3* pos = &m_localPositionArray[0];
const btScalar* rad = &m_radiArray[0];
int numSpheres = m_localPositionArray.size();
for (i=0;i<m_numSpheres;i++)
for (i=0;i<numSpheres;i++)
{
vtx = (*pos) +vec*m_localScaling*(*rad) - vec * getMargin();
pos++;
@@ -92,10 +95,10 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons
btVector3 vtx;
btScalar newDot;
const btVector3* pos = &m_localPositions[0];
const btScalar* rad = &m_radi[0];
for (int i=0;i<m_numSpheres;i++)
const btVector3* pos = &m_localPositionArray[0];
const btScalar* rad = &m_radiArray[0];
int numSpheres = m_localPositionArray.size();
for (int i=0;i<numSpheres;i++)
{
vtx = (*pos) +vec*m_localScaling*(*rad) - vec * getMargin();
pos++;

18
src/BulletCollision/CollisionShapes/btMultiSphereShape.h
View File

@@ -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.
@@ -18,8 +18,7 @@ subject to the following restrictions:
#include "btConvexInternalShape.h"
#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
#define MAX_NUM_SPHERES 5
#include "LinearMath/btAlignedObjectArray.h"
///The btMultiSphereShape represents the convex hull of a collection of spheres. You can create special capsules or other smooth volumes.
///It is possible to animate the spheres for deformation.
@@ -27,13 +26,10 @@ class btMultiSphereShape : public btConvexInternalShape
{
btVector3 m_localPositions[MAX_NUM_SPHERES];
btScalar m_radi[MAX_NUM_SPHERES];
btAlignedObjectArray<btVector3> m_localPositionArray;
btAlignedObjectArray<btScalar> 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];
}

2
src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
View File

@@ -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.

3
src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
View File

@@ -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"

4
src/BulletCollision/CollisionShapes/btOptimizedBvh.h
View File

@@ -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

2
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
View File

@@ -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.

3
src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
View File

@@ -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)

2
src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
View File

@@ -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.

7
src/BulletCollision/CollisionShapes/btShapeHull.cpp
View File

@@ -1,8 +1,6 @@
/*
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.
@@ -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"

6
src/BulletCollision/CollisionShapes/btShapeHull.h
View File

@@ -1,8 +1,6 @@
/*
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.
@@ -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

2
src/BulletCollision/CollisionShapes/btSphereShape.cpp
View File

@@ -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.

3
src/BulletCollision/CollisionShapes/btSphereShape.h
View File

@@ -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

2
src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
View File

@@ -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.

4
src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
View File

@@ -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"

2
src/BulletCollision/CollisionShapes/btTetrahedronShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleBuffer.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleCallback.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
View File

@@ -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.

10
src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
View File

@@ -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;
}

3
src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
View File

@@ -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.

3
src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
View File

@@ -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"

3
src/BulletCollision/CollisionShapes/btTriangleMesh.h
View File

@@ -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

2
src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btTriangleShape.h
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
View File

@@ -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.

2
src/BulletCollision/CollisionShapes/btUniformScalingShape.h
View File

@@ -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.

178
test1.oec
View File

@@ -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