ruby-bullet 0.1.0-x86-linux → 0.1.1-x86-linux

data/deps/include/bullet/BulletCollision/CollisionShapes/btConvexPolyhedron.h

@@ -1,62 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2011 Advanced Micro Devices, Inc.  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.
-*/
-
-
-///This file was written by Erwin Coumans
-
-
-#ifndef _BT_POLYHEDRAL_FEATURES_H
-#define _BT_POLYHEDRAL_FEATURES_H
-
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btAlignedObjectArray.h"
-
-#define TEST_INTERNAL_OBJECTS 1
-
-
-struct btFace
-{
-	btAlignedObjectArray<int>	m_indices;
-//	btAlignedObjectArray<int>	m_connectedFaces;
-	btScalar	m_plane[4];
-};
-
-
-class btConvexPolyhedron
-{
-	public:
-	btConvexPolyhedron();
-	virtual	~btConvexPolyhedron();
-
-	btAlignedObjectArray<btVector3>	m_vertices;
-	btAlignedObjectArray<btFace>	m_faces;
-	btAlignedObjectArray<btVector3> m_uniqueEdges;
-
-	btVector3		m_localCenter;
-	btVector3		m_extents;
-	btScalar		m_radius;
-	btVector3		mC;
-	btVector3		mE;
-
-	void	initialize();
-	bool testContainment() const;
-
-	void project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const;
-};
-
-	
-#endif //_BT_POLYHEDRAL_FEATURES_H
-
-

data/deps/include/bullet/BulletCollision/CollisionShapes/btConvexShape.h

@@ -1,84 +0,0 @@
-/*
-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_SHAPE_INTERFACE1
-#define BT_CONVEX_SHAPE_INTERFACE1
-
-#include "btCollisionShape.h"
-
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btMatrix3x3.h"
-#include "btCollisionMargin.h"
-#include "LinearMath/btAlignedAllocator.h"
-
-#define MAX_PREFERRED_PENETRATION_DIRECTIONS 10
-
-/// The btConvexShape is an abstract shape interface, implemented by all convex shapes such as btBoxShape, btConvexHullShape etc.
-/// It describes general convex shapes using the localGetSupportingVertex interface, used by collision detectors such as btGjkPairDetector.
-ATTRIBUTE_ALIGNED16(class) btConvexShape : public btCollisionShape
-{
-
-
-public:
-
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	btConvexShape ();
-
-	virtual ~btConvexShape();
-
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const = 0;
-
-	////////
-	#ifndef __SPU__
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec) const=0;
-	#endif //#ifndef __SPU__
-
-	btVector3 localGetSupportVertexWithoutMarginNonVirtual (const btVector3& vec) const;
-	btVector3 localGetSupportVertexNonVirtual (const btVector3& vec) const;
-	btScalar getMarginNonVirtual () const;
-	void getAabbNonVirtual (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
-
-	virtual void project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const;
-
-	
-	//notice that the vectors should be unit length
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
-
-	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const =0;
-
-	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const =0;
-
-	virtual void	setLocalScaling(const btVector3& scaling) =0;
-	virtual const btVector3& getLocalScaling() const =0;
-
-	virtual void	setMargin(btScalar margin)=0;
-
-	virtual btScalar	getMargin() const=0;
-
-	virtual int		getNumPreferredPenetrationDirections() const=0;
-	
-	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const=0;
-
-
-	
-	
-};
-
-
-
-#endif //BT_CONVEX_SHAPE_INTERFACE1

data/deps/include/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h

@@ -1,75 +0,0 @@
-/*
-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_TRIANGLEMESH_SHAPE_H
-#define BT_CONVEX_TRIANGLEMESH_SHAPE_H
-
-
-#include "btPolyhedralConvexShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
-
-
-/// The btConvexTriangleMeshShape is a convex hull of a triangle mesh, but the performance is not as good as btConvexHullShape.
-/// A small benefit of this class is that it uses the btStridingMeshInterface, so you can avoid the duplication of the triangle mesh data. Nevertheless, most users should use the much better performing btConvexHullShape instead.
-class btConvexTriangleMeshShape : public btPolyhedralConvexAabbCachingShape
-{
-
-	class btStridingMeshInterface*	m_stridingMesh;
-
-public:
-	btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface, bool calcAabb = true);
-
-	class btStridingMeshInterface*	getMeshInterface()
-	{
-		return m_stridingMesh;
-	}
-	const class btStridingMeshInterface* getMeshInterface() const
-	{
-		return m_stridingMesh;
-	}
-	
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const;
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-	
-	//debugging
-	virtual const char*	getName()const {return "ConvexTrimesh";}
-	
-	virtual int	getNumVertices() const;
-	virtual int getNumEdges() const;
-	virtual void getEdge(int i,btVector3& pa,btVector3& pb) const;
-	virtual void getVertex(int i,btVector3& vtx) const;
-	virtual int	getNumPlanes() const;
-	virtual void getPlane(btVector3& planeNormal,btVector3& planeSupport,int i ) const;
-	virtual	bool isInside(const btVector3& pt,btScalar tolerance) const;
-
-	
-	virtual void	setLocalScaling(const btVector3& scaling);
-	virtual const btVector3& getLocalScaling() const;
-
-	///computes the exact moment of inertia and the transform from the coordinate system defined by the principal axes of the moment of inertia
-	///and the center of mass to the current coordinate system. A mass of 1 is assumed, for other masses just multiply the computed "inertia"
-	///by the mass. The resulting transform "principal" has to be applied inversely to the mesh in order for the local coordinate system of the
-	///shape to be centered at the center of mass and to coincide with the principal axes. This also necessitates a correction of the world transform
-	///of the collision object by the principal transform. This method also computes the volume of the convex mesh.
-	void calculatePrincipalAxisTransform(btTransform& principal, btVector3& inertia, btScalar& volume) const;
-
-};
-
-
-
-#endif //BT_CONVEX_TRIANGLEMESH_SHAPE_H
-
-
-

data/deps/include/bullet/BulletCollision/CollisionShapes/btCylinderShape.h

@@ -1,200 +0,0 @@
-/*
-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_CYLINDER_MINKOWSKI_H
-#define BT_CYLINDER_MINKOWSKI_H
-
-#include "btBoxShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
-#include "LinearMath/btVector3.h"
-
-/// The btCylinderShape class implements a cylinder shape primitive, centered around the origin. Its central axis aligned with the Y axis. btCylinderShapeX is aligned with the X axis and btCylinderShapeZ around the Z axis.
-class btCylinderShape : public btConvexInternalShape
-
-{
-
-protected:
-
-	int	m_upAxis;
-
-public:
-
-	btVector3 getHalfExtentsWithMargin() const
-	{
-		btVector3 halfExtents = getHalfExtentsWithoutMargin();
-		btVector3 margin(getMargin(),getMargin(),getMargin());
-		halfExtents += margin;
-		return halfExtents;
-	}
-	
-	const btVector3& getHalfExtentsWithoutMargin() const
-	{
-		return m_implicitShapeDimensions;//changed in Bullet 2.63: assume the scaling and margin are included
-	}
-
-	btCylinderShape (const btVector3& halfExtents);
-	
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
-
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
-
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-
-	virtual void setMargin(btScalar collisionMargin)
-	{
-		//correct the m_implicitShapeDimensions for the margin
-		btVector3 oldMargin(getMargin(),getMargin(),getMargin());
-		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions+oldMargin;
-		
-		btConvexInternalShape::setMargin(collisionMargin);
-		btVector3 newMargin(getMargin(),getMargin(),getMargin());
-		m_implicitShapeDimensions = implicitShapeDimensionsWithMargin - newMargin;
-
-	}
-
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec) const
-	{
-
-		btVector3 supVertex;
-		supVertex = localGetSupportingVertexWithoutMargin(vec);
-		
-		if ( getMargin()!=btScalar(0.) )
-		{
-			btVector3 vecnorm = vec;
-			if (vecnorm .length2() < (SIMD_EPSILON*SIMD_EPSILON))
-			{
-				vecnorm.setValue(btScalar(-1.),btScalar(-1.),btScalar(-1.));
-			} 
-			vecnorm.normalize();
-			supVertex+= getMargin() * vecnorm;
-		}
-		return supVertex;
-	}
-
-
-	//use box inertia
-	//	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
-
-
-	int	getUpAxis() const
-	{
-		return m_upAxis;
-	}
-
-	virtual btScalar getRadius() const
-	{
-		return getHalfExtentsWithMargin().getX();
-	}
-
-	virtual void	setLocalScaling(const btVector3& scaling)
-	{
-		btVector3 oldMargin(getMargin(),getMargin(),getMargin());
-		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions+oldMargin;
-		btVector3 unScaledImplicitShapeDimensionsWithMargin = implicitShapeDimensionsWithMargin / m_localScaling;
-
-		btConvexInternalShape::setLocalScaling(scaling);
-
-		m_implicitShapeDimensions = (unScaledImplicitShapeDimensionsWithMargin * m_localScaling) - oldMargin;
-
-	}
-
-	//debugging
-	virtual const char*	getName()const
-	{
-		return "CylinderY";
-	}
-
-	virtual	int	calculateSerializeBufferSize() const;
-
-	///fills the dataBuffer and returns the struct name (and 0 on failure)
-	virtual	const char*	serialize(void* dataBuffer, btSerializer* serializer) const;
-
-};
-
-class btCylinderShapeX : public btCylinderShape
-{
-public:
-	btCylinderShapeX (const btVector3& halfExtents);
-
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-	
-		//debugging
-	virtual const char*	getName()const
-	{
-		return "CylinderX";
-	}
-
-	virtual btScalar getRadius() const
-	{
-		return getHalfExtentsWithMargin().getY();
-	}
-
-};
-
-class btCylinderShapeZ : public btCylinderShape
-{
-public:
-	btCylinderShapeZ (const btVector3& halfExtents);
-
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-
-		//debugging
-	virtual const char*	getName()const
-	{
-		return "CylinderZ";
-	}
-
-	virtual btScalar getRadius() const
-	{
-		return getHalfExtentsWithMargin().getX();
-	}
-
-};
-
-///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
-struct	btCylinderShapeData
-{
-	btConvexInternalShapeData	m_convexInternalShapeData;
-
-	int	m_upAxis;
-
-	char	m_padding[4];
-};
-
-SIMD_FORCE_INLINE	int	btCylinderShape::calculateSerializeBufferSize() const
-{
-	return sizeof(btCylinderShapeData);
-}
-
-	///fills the dataBuffer and returns the struct name (and 0 on failure)
-SIMD_FORCE_INLINE	const char*	btCylinderShape::serialize(void* dataBuffer, btSerializer* serializer) const
-{
-	btCylinderShapeData* shapeData = (btCylinderShapeData*) dataBuffer;
-	
-	btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData,serializer);
-
-	shapeData->m_upAxis = m_upAxis;
-	
-	return "btCylinderShapeData";
-}
-
-
-
-#endif //BT_CYLINDER_MINKOWSKI_H
-

data/deps/include/bullet/BulletCollision/CollisionShapes/btEmptyShape.h

@@ -1,70 +0,0 @@
-/*
-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_EMPTY_SHAPE_H
-#define BT_EMPTY_SHAPE_H
-
-#include "btConcaveShape.h"
-
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btMatrix3x3.h"
-#include "btCollisionMargin.h"
-
-
-
-
-/// The btEmptyShape is a collision shape without actual collision detection shape, so most users should ignore this class.
-/// It can be replaced by another shape during runtime, but the inertia tensor should be recomputed.
-class btEmptyShape	: public btConcaveShape
-{
-public:
-	btEmptyShape();
-
-	virtual ~btEmptyShape();
-
-
-	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-
-
-	virtual void	setLocalScaling(const btVector3& scaling)
-	{
-		m_localScaling = scaling;
-	}
-	virtual const btVector3& getLocalScaling() const 
-	{
-		return m_localScaling;
-	}
-
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
-	
-	virtual const char*	getName()const
-	{
-		return "Empty";
-	}
-
-	virtual void processAllTriangles(btTriangleCallback* ,const btVector3& ,const btVector3& ) const
-	{
-	}
-
-protected:
-	btVector3	m_localScaling;
-
-};
-
-
-
-#endif //BT_EMPTY_SHAPE_H

data/deps/include/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h

@@ -1,161 +0,0 @@
-/*
-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_HEIGHTFIELD_TERRAIN_SHAPE_H
-#define BT_HEIGHTFIELD_TERRAIN_SHAPE_H
-
-#include "btConcaveShape.h"
-
-///btHeightfieldTerrainShape simulates a 2D heightfield terrain
-/**
-  The caller is responsible for maintaining the heightfield array; this
-  class does not make a copy.
-
-  The heightfield can be dynamic so long as the min/max height values
-  capture the extremes (heights must always be in that range).
-
-  The local origin of the heightfield is assumed to be the exact
-  center (as determined by width and length and height, with each
-  axis multiplied by the localScaling).
-
-  \b NOTE: be careful with coordinates.  If you have a heightfield with a local
-  min height of -100m, and a max height of +500m, you may be tempted to place it
-  at the origin (0,0) and expect the heights in world coordinates to be
-  -100 to +500 meters.
-  Actually, the heights will be -300 to +300m, because bullet will re-center
-  the heightfield based on its AABB (which is determined by the min/max
-  heights).  So keep in mind that once you create a btHeightfieldTerrainShape
-  object, the heights will be adjusted relative to the center of the AABB.  This
-  is different to the behavior of many rendering engines, but is useful for
-  physics engines.
-
-  Most (but not all) rendering and heightfield libraries assume upAxis = 1
-  (that is, the y-axis is "up").  This class allows any of the 3 coordinates
-  to be "up".  Make sure your choice of axis is consistent with your rendering
-  system.
-
-  The heightfield heights are determined from the data type used for the
-  heightfieldData array.  
-
-   - PHY_UCHAR: height at a point is the uchar value at the
-       grid point, multipled by heightScale.  uchar isn't recommended
-       because of its inability to deal with negative values, and
-       low resolution (8-bit).
-
-   - PHY_SHORT: height at a point is the short int value at that grid
-       point, multipled by heightScale.
-
-   - PHY_FLOAT: height at a point is the float value at that grid
-       point.  heightScale is ignored when using the float heightfield
-       data type.
-
-  Whatever the caller specifies as minHeight and maxHeight will be honored.
-  The class will not inspect the heightfield to discover the actual minimum
-  or maximum heights.  These values are used to determine the heightfield's
-  axis-aligned bounding box, multiplied by localScaling.
-
-  For usage and testing see the TerrainDemo.
- */
-class btHeightfieldTerrainShape : public btConcaveShape
-{
-protected:
-	btVector3	m_localAabbMin;
-	btVector3	m_localAabbMax;
-	btVector3	m_localOrigin;
-
-	///terrain data
-	int	m_heightStickWidth;
-	int m_heightStickLength;
-	btScalar	m_minHeight;
-	btScalar	m_maxHeight;
-	btScalar m_width;
-	btScalar m_length;
-	btScalar m_heightScale;
-	union
-	{
-		const unsigned char*	m_heightfieldDataUnsignedChar;
-		const short*		m_heightfieldDataShort;
-		const btScalar*			m_heightfieldDataFloat;
-		const void*	m_heightfieldDataUnknown;
-	};
-
-	PHY_ScalarType	m_heightDataType;	
-	bool	m_flipQuadEdges;
-  bool  m_useDiamondSubdivision;
-
-	int	m_upAxis;
-	
-	btVector3	m_localScaling;
-
-	virtual btScalar	getRawHeightFieldValue(int x,int y) const;
-	void		quantizeWithClamp(int* out, const btVector3& point,int isMax) const;
-	void		getVertex(int x,int y,btVector3& vertex) const;
-
-
-
-	/// protected initialization
-	/**
-	  Handles the work of constructors so that public constructors can be
-	  backwards-compatible without a lot of copy/paste.
-	 */
-	void initialize(int heightStickWidth, int heightStickLength,
-	                const void* heightfieldData, btScalar heightScale,
-	                btScalar minHeight, btScalar maxHeight, int upAxis,
-	                PHY_ScalarType heightDataType, bool flipQuadEdges);
-
-public:
-	/// preferred constructor
-	/**
-	  This constructor supports a range of heightfield
-	  data types, and allows for a non-zero minimum height value.
-	  heightScale is needed for any integer-based heightfield data types.
-	 */
-	btHeightfieldTerrainShape(int heightStickWidth,int heightStickLength,
-	                          const void* heightfieldData, btScalar heightScale,
-	                          btScalar minHeight, btScalar maxHeight,
-	                          int upAxis, PHY_ScalarType heightDataType,
-	                          bool flipQuadEdges);
-
-	/// legacy constructor
-	/**
-	  The legacy constructor assumes the heightfield has a minimum height
-	  of zero.  Only unsigned char or floats are supported.  For legacy
-	  compatibility reasons, heightScale is calculated as maxHeight / 65535 
-	  (and is only used when useFloatData = false).
- 	 */
-	btHeightfieldTerrainShape(int heightStickWidth,int heightStickLength,const void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
-
-	virtual ~btHeightfieldTerrainShape();
-
-
-	void setUseDiamondSubdivision(bool useDiamondSubdivision=true) { m_useDiamondSubdivision = useDiamondSubdivision;}
-
-
-	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-
-	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
-
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
-
-	virtual void	setLocalScaling(const btVector3& scaling);
-	
-	virtual const btVector3& getLocalScaling() const;
-	
-	//debugging
-	virtual const char*	getName()const {return "HEIGHTFIELD";}
-
-};
-
-#endif //BT_HEIGHTFIELD_TERRAIN_SHAPE_H

data/deps/include/bullet/BulletCollision/CollisionShapes/btMaterial.h

@@ -1,35 +0,0 @@
-/*
-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.
-*/
-
-/// This file was created by Alex Silverman
-
-#ifndef BT_MATERIAL_H
-#define BT_MATERIAL_H
-
-// Material class to be used by btMultimaterialTriangleMeshShape to store triangle properties
-class btMaterial
-{
-    // public members so that materials can change due to world events
-public:
-    btScalar m_friction;
-    btScalar m_restitution;
-    int pad[2];
-
-    btMaterial(){}
-    btMaterial(btScalar fric, btScalar rest) { m_friction = fric; m_restitution = rest; }
-};
-
-#endif // BT_MATERIAL_H
-