Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2006-04-08 17:05:22 +0400
committerErwin Coumans <blender@erwincoumans.com>2006-04-08 17:05:22 +0400
commit67be33556695a08715a7298413e498643f4cbef1 (patch)
tree24f6478f1517b4c69360446a5a51cac4f7c7b1c5 /extern
parent7fdeb4830ab465136866806e738205537ec5e850 (diff)
fixed a lot of GCC 4.0 warnings.
Diffstat (limited to 'extern')
-rw-r--r--extern/bullet/Bullet/BroadphaseCollision/AxisSweep3.h2
-rw-r--r--extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h2
-rw-r--r--extern/bullet/Bullet/Bullet3_vc8.vcproj40
-rw-r--r--extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.h5
-rw-r--r--extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp26
-rw-r--r--extern/bullet/Bullet/CollisionDispatch/ManifoldResult.h1
-rw-r--r--extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h3
-rw-r--r--extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp2
-rw-r--r--extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h3
-rw-r--r--extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h3
-rw-r--r--extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h4
-rw-r--r--extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp2
-rwxr-xr-xextern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h2
-rw-r--r--extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp2
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp25
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.h25
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp25
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.h25
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.h26
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.cpp16
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.h16
-rw-r--r--extern/bullet/Extras/PhysicsInterface/Common/PHY_Pro.h24
-rw-r--r--extern/bullet/LinearMath/IDebugDraw.h2
-rw-r--r--extern/bullet/LinearMath/SimdVector3.h17
-rw-r--r--extern/bullet/continuous_vc8.sln13
25 files changed, 222 insertions, 89 deletions
diff --git a/extern/bullet/Bullet/BroadphaseCollision/AxisSweep3.h b/extern/bullet/Bullet/BroadphaseCollision/AxisSweep3.h
index b9227fe87d5..023f61e28c6 100644
--- a/extern/bullet/Bullet/BroadphaseCollision/AxisSweep3.h
+++ b/extern/bullet/Bullet/BroadphaseCollision/AxisSweep3.h
@@ -88,7 +88,7 @@ private:
public:
AxisSweep3(const SimdPoint3& worldAabbMin,const SimdPoint3& worldAabbMax, int maxHandles = 1024, int maxOverlaps = 8192);
- ~AxisSweep3();
+ virtual ~AxisSweep3();
virtual void RefreshOverlappingPairs()
{
diff --git a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h
index b81815b9764..5b9efc6b92a 100644
--- a/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h
+++ b/extern/bullet/Bullet/BroadphaseCollision/BroadphaseInterface.h
@@ -27,6 +27,8 @@ struct BroadphaseProxy;
class BroadphaseInterface
{
public:
+ virtual ~BroadphaseInterface() {}
+
virtual BroadphaseProxy* CreateProxy( const SimdVector3& min, const SimdVector3& max,int shapeType,void* userPtr ) =0;
virtual void DestroyProxy(BroadphaseProxy* proxy)=0;
virtual void SetAabb(BroadphaseProxy* proxy,const SimdVector3& aabbMin,const SimdVector3& aabbMax)=0;
diff --git a/extern/bullet/Bullet/Bullet3_vc8.vcproj b/extern/bullet/Bullet/Bullet3_vc8.vcproj
index 256cfd63d06..ff40fb01419 100644
--- a/extern/bullet/Bullet/Bullet3_vc8.vcproj
+++ b/extern/bullet/Bullet/Bullet3_vc8.vcproj
@@ -258,6 +258,46 @@
>
</File>
<File
+ RelativePath=".\NarrowPhaseCollision\Epa.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\Epa.h"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaFace.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaFace.h"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaHalfEdge.h"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaPenetrationDepthSolver.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaPenetrationDepthSolver.h"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaPolyhedron.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaPolyhedron.h"
+ >
+ </File>
+ <File
+ RelativePath=".\NarrowPhaseCollision\EpaVertex.h"
+ >
+ </File>
+ <File
RelativePath=".\NarrowPhaseCollision\GjkConvexCast.cpp"
>
</File>
diff --git a/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.h b/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.h
index 5ba41e1c15b..ced71a63287 100644
--- a/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.h
+++ b/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.h
@@ -37,6 +37,8 @@ struct CollisionAlgorithmCreateFunc
:m_swapped(false)
{
}
+ virtual ~CollisionAlgorithmCreateFunc(){};
+
virtual CollisionAlgorithm* CreateCollisionAlgorithm(BroadphaseProxy& proxy0,BroadphaseProxy& proxy1)
{
return 0;
@@ -65,6 +67,8 @@ public:
struct IslandCallback
{
+ virtual ~IslandCallback() {};
+
virtual void ProcessIsland(PersistentManifold** manifolds,int numManifolds) = 0;
};
@@ -95,6 +99,7 @@ public:
int m_count;
CollisionDispatcher ();
+ virtual ~CollisionDispatcher() {};
virtual PersistentManifold* GetNewManifold(void* b0,void* b1);
diff --git a/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp b/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
index 8ec124e3dc6..49037eb8675 100644
--- a/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
+++ b/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
@@ -38,16 +38,12 @@ subject to the following restrictions:
#include "CollisionShapes/SphereShape.h"
#include "NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.h"
-
-///Solid3EpaPenetrationDepth is not shipped by default, the license doesn't allow commercial, closed source. contact if you want the file
-///It improves the penetration depth handling dramatically
-//#define USE_EPA
#ifdef USE_EPA
-#include "../Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h"
-bool gUseEpa = true;
-#else
+#include "NarrowPhaseCollision/EpaPenetrationDepthSolver.h"
+#endif
+
bool gUseEpa = false;
-#endif// USE_EPA
+
#ifdef WIN32
void DrawRasterizerLine(const float* from,const float* to,int color);
@@ -138,8 +134,11 @@ public:
static MinkowskiPenetrationDepthSolver gPenetrationDepthSolver;
+
#ifdef USE_EPA
Solid3EpaPenetrationDepth gSolidEpaPenetrationSolver;
+static EpaPenetrationDepthSolver gEpaPenetrationDepthSolver;
+
#endif //USE_EPA
void ConvexConvexAlgorithm::CheckPenetrationDepthSolver()
@@ -149,13 +148,10 @@ void ConvexConvexAlgorithm::CheckPenetrationDepthSolver()
m_useEpa = gUseEpa;
if (m_useEpa)
{
- //not distributed, see top of this file
- #ifdef USE_EPA
- m_gjkPairDetector.SetPenetrationDepthSolver(&gSolidEpaPenetrationSolver);
- #else
- m_gjkPairDetector.SetPenetrationDepthSolver(&gPenetrationDepthSolver);
- #endif
-
+#ifdef USE_EPA
+ m_gjkPairDetector.SetPenetrationDepthSolver(&gEpaPenetrationDepthSolver);
+
+#endif
} else
{
m_gjkPairDetector.SetPenetrationDepthSolver(&gPenetrationDepthSolver);
diff --git a/extern/bullet/Bullet/CollisionDispatch/ManifoldResult.h b/extern/bullet/Bullet/CollisionDispatch/ManifoldResult.h
index f4e00f83194..6126a759744 100644
--- a/extern/bullet/Bullet/CollisionDispatch/ManifoldResult.h
+++ b/extern/bullet/Bullet/CollisionDispatch/ManifoldResult.h
@@ -32,6 +32,7 @@ public:
ManifoldResult(CollisionObject* body0,CollisionObject* body1,PersistentManifold* manifoldPtr);
+ virtual ~ManifoldResult() {};
virtual void AddContactPoint(const SimdVector3& normalOnBInWorld,const SimdVector3& pointInWorld,float depth);
diff --git a/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h b/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h
index 484d0818d5c..ec550e46746 100644
--- a/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h
+++ b/extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h
@@ -47,6 +47,8 @@ struct OptimizedBvhNode
class NodeOverlapCallback
{
public:
+ virtual ~NodeOverlapCallback() {};
+
virtual void ProcessNode(const OptimizedBvhNode* node) = 0;
};
@@ -67,6 +69,7 @@ class OptimizedBvh
public:
OptimizedBvh() :m_rootNode1(0), m_numNodes(0) { }
+ virtual ~OptimizedBvh() {};
void Build(StridingMeshInterface* triangles);
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp
index ae43843c656..75103c0f767 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp
@@ -291,7 +291,7 @@ bool BU_EdgeEdge::GetTimeOfImpactGeneralCase(
{
bool hit = false;
- SimdScalar coefs[4];
+ SimdScalar coefs[4]={0.f,0.f,0.f,0.f};
BU_Polynomial polynomialSolver;
int numroots = 0;
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h
index d5bf711c6ab..22c0966df23 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexCast.h
@@ -46,6 +46,9 @@ public:
{
}
+
+ virtual ~CastResult() {};
+
SimdVector3 m_normal;
SimdScalar m_fraction;
SimdTransform m_hitTransformA;
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h
index 7b1d8426bc0..8f8c0a97e04 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/ConvexPenetrationDepthSolver.h
@@ -27,7 +27,8 @@ class SimdTransform;
class ConvexPenetrationDepthSolver
{
public:
-
+
+ virtual ~ConvexPenetrationDepthSolver() {};
virtual bool CalcPenDepth( SimplexSolverInterface& simplexSolver,
ConvexShape* convexA,ConvexShape* convexB,
const SimdTransform& transA,const SimdTransform& transB,
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h b/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h
index 400ac805bc3..3d6fdb2be7c 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/DiscreteCollisionDetectorInterface.h
@@ -32,7 +32,8 @@ struct DiscreteCollisionDetectorInterface
struct Result
{
void operator delete(void* ptr) {};
-
+
+ virtual ~Result(){}
virtual void AddContactPoint(const SimdVector3& normalOnBInWorld,const SimdVector3& pointInWorld,float depth)=0;
};
@@ -69,6 +70,7 @@ struct StorageResult : public DiscreteCollisionDetectorInterface::Result
{
}
+ virtual ~StorageResult() {};
virtual void AddContactPoint(const SimdVector3& normalOnBInWorld,const SimdVector3& pointInWorld,float depth)
{
diff --git a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
index 8ccffc0d86d..1390667a58a 100644
--- a/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
+++ b/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
@@ -35,7 +35,7 @@ m_minkowskiB(objectB)
void GjkPairDetector::GetClosestPoints(const ClosestPointInput& input,Result& output,class IDebugDraw* debugDraw)
{
- SimdScalar distance;
+ SimdScalar distance=0.f;
SimdVector3 normalInB(0.f,0.f,0.f);
SimdVector3 pointOnA,pointOnB;
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h b/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h
index b64f0bdc918..50a5ab20f9a 100755
--- a/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h
+++ b/extern/bullet/BulletDynamics/ConstraintSolver/TypedConstraint.h
@@ -32,7 +32,7 @@ protected:
public:
TypedConstraint();
-
+ virtual ~TypedConstraint() {};
TypedConstraint(RigidBody& rbA);
TypedConstraint(RigidBody& rbA,RigidBody& rbB);
diff --git a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
index e4d0e49d5e8..94558bdb932 100644
--- a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
@@ -456,7 +456,9 @@ bool CcdPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep)
if (!SimdFuzzyZero(timeStep))
{
+// define this in blender, the stepsize is 30 hertz, 60 hertz works much better
#define SPLIT_TIMESTEP 1
+
#ifdef SPLIT_TIMESTEP
proceedDeltaTimeOneStep(0.5f*timeStep);
proceedDeltaTimeOneStep(0.5f*timeStep);
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp
index 1bf92b4effc..c3fd6353018 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.cpp
@@ -1,15 +1,18 @@
/*
- * Copyright (c) 2001-2005 Erwin Coumans <phy@erwincoumans.com>
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation. Erwin Coumans makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- */
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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.
+*/
+
#include "PHY_IMotionState.h"
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.h b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.h
index a951ab60d60..23dfdebaee0 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.h
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IMotionState.h
@@ -1,15 +1,18 @@
/*
- * Copyright (c) 2001-2005 Erwin Coumans <phy@erwincoumans.com>
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation. Erwin Coumans makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- */
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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 PHY__MOTIONSTATE_H
#define PHY__MOTIONSTATE_H
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp
index 655763d0bf6..1ef7118ec46 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.cpp
@@ -1,15 +1,18 @@
/*
- * Copyright (c) 2001-2005 Erwin Coumans <phy@erwincoumans.com>
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation. Erwin Coumans makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- */
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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.
+*/
+
#include "PHY_IPhysicsController.h"
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.h b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.h
index 4102754be21..822cf4e7ff1 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.h
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsController.h
@@ -1,15 +1,18 @@
/*
- * Copyright (c) 2001-2005 Erwin Coumans <phy@erwincoumans.com>
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation. Erwin Coumans makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- */
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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 PHY_IPHYSICSCONTROLLER_H
#define PHY_IPHYSICSCONTROLLER_H
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.h b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.h
index baa645b40a6..3b00dad39b6 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.h
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IPhysicsEnvironment.h
@@ -1,15 +1,19 @@
/*
- * Copyright (c) 2001-2005 Erwin Coumans <phy@erwincoumans.com>
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation. Erwin Coumans makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- */
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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 _IPHYSICSENVIRONMENT
#define _IPHYSICSENVIRONMENT
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.cpp b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.cpp
index 3879e83396f..e22b7fd1a8e 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.cpp
@@ -1,3 +1,19 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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.
+*/
+
+
#include "PHY_IVehicle.h"
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.h b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.h
index 0e6fe3379a2..6d2cb66843e 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.h
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_IVehicle.h
@@ -1,3 +1,19 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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 PHY_IVEHICLE_H
#define PHY_IVEHICLE_H
diff --git a/extern/bullet/Extras/PhysicsInterface/Common/PHY_Pro.h b/extern/bullet/Extras/PhysicsInterface/Common/PHY_Pro.h
index 871cc64d375..aa455164dcb 100644
--- a/extern/bullet/Extras/PhysicsInterface/Common/PHY_Pro.h
+++ b/extern/bullet/Extras/PhysicsInterface/Common/PHY_Pro.h
@@ -1,15 +1,17 @@
/*
- * Copyright (c) 2001-2005 Erwin Coumans <phy@erwincoumans.com>
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation. Erwin Coumans makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- */
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+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 PHY_PROPSH
#define PHY_PROPSH
diff --git a/extern/bullet/LinearMath/IDebugDraw.h b/extern/bullet/LinearMath/IDebugDraw.h
index 04da6e966fa..9b3e352b49d 100644
--- a/extern/bullet/LinearMath/IDebugDraw.h
+++ b/extern/bullet/LinearMath/IDebugDraw.h
@@ -48,6 +48,8 @@ class IDebugDraw
DBG_MAX_DEBUG_DRAW_MODE
};
+ virtual ~IDebugDraw() {};
+
virtual void DrawLine(const SimdVector3& from,const SimdVector3& to,const SimdVector3& color)=0;
virtual void DrawContactPoint(const SimdVector3& PointOnB,const SimdVector3& normalOnB,float distance,int lifeTime,const SimdVector3& color)=0;
diff --git a/extern/bullet/LinearMath/SimdVector3.h b/extern/bullet/LinearMath/SimdVector3.h
index b6ae05212bc..d6a195a36db 100644
--- a/extern/bullet/LinearMath/SimdVector3.h
+++ b/extern/bullet/LinearMath/SimdVector3.h
@@ -94,6 +94,8 @@ public:
SIMD_FORCE_INLINE SimdVector3 normalized() const;
+ SIMD_FORCE_INLINE SimdVector3 rotate( const SimdVector3& wAxis, const SimdScalar angle );
+
SIMD_FORCE_INLINE SimdScalar angle(const SimdVector3& v) const
{
SimdScalar s = SimdSqrt(length2() * v.length2());
@@ -287,6 +289,19 @@ SIMD_FORCE_INLINE SimdVector3 SimdVector3::normalized() const
return *this / length();
}
+SIMD_FORCE_INLINE SimdVector3 SimdVector3::rotate( const SimdVector3& wAxis, const SimdScalar angle )
+{
+ // wAxis must be a unit lenght vector
+
+ SimdVector3 o = wAxis * wAxis.dot( *this );
+ SimdVector3 x = *this - o;
+ SimdVector3 y;
+
+ y = wAxis.cross( *this );
+
+ return ( o + x * cos( angle ) + y * sin( angle ) );
+}
+
class SimdVector4 : public SimdVector3
{
public:
@@ -383,8 +398,6 @@ public:
return absolute4().maxAxis4();
}
-
-
};
#endif //SIMD__VECTOR3_H
diff --git a/extern/bullet/continuous_vc8.sln b/extern/bullet/continuous_vc8.sln
index 530552fd679..108d29aa1ba 100644
--- a/extern/bullet/continuous_vc8.sln
+++ b/extern/bullet/continuous_vc8.sln
@@ -66,6 +66,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConcaveDemo", "Demos\Concav
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConstraintDemo", "Demos\ConstraintDemo\ConstraintDemo_vc8.vcproj", "{26C8AAF7-D504-4341-A882-7D082E9DED5F}"
ProjectSection(ProjectDependencies) = postProject
+ {3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4} = {3427A9EF-FF84-4B3E-9AE5-C37CF44D7DA4}
+ {FFD3C64A-30E2-4BC7-BC8F-51818C320400} = {FFD3C64A-30E2-4BC7-BC8F-51818C320400}
+ {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE} = {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}
+ {47328C1E-54A4-4065-B3DA-F88EE281D1E5} = {47328C1E-54A4-4065-B3DA-F88EE281D1E5}
+ {87D8C006-6DCC-4156-A03E-8CEA1B4C0580} = {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EPAPenDepthDemo", "Demos\EPAPenDepthDemo\EPAPenDepthDemo_vc8.vcproj", "{965380C7-E747-41C1-91AC-E5D36ED50C09}"
+ ProjectSection(ProjectDependencies) = postProject
{87D8C006-6DCC-4156-A03E-8CEA1B4C0580} = {87D8C006-6DCC-4156-A03E-8CEA1B4C0580}
{47328C1E-54A4-4065-B3DA-F88EE281D1E5} = {47328C1E-54A4-4065-B3DA-F88EE281D1E5}
{E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE} = {E3D57F36-36AC-4E9A-B0E0-2AE4510FCBFE}
@@ -135,6 +144,10 @@ Global
{26C8AAF7-D504-4341-A882-7D082E9DED5F}.Debug|Win32.Build.0 = Debug|Win32
{26C8AAF7-D504-4341-A882-7D082E9DED5F}.Release|Win32.ActiveCfg = Release|Win32
{26C8AAF7-D504-4341-A882-7D082E9DED5F}.Release|Win32.Build.0 = Release|Win32
+ {965380C7-E747-41C1-91AC-E5D36ED50C09}.Debug|Win32.ActiveCfg = Debug|Win32
+ {965380C7-E747-41C1-91AC-E5D36ED50C09}.Debug|Win32.Build.0 = Debug|Win32
+ {965380C7-E747-41C1-91AC-E5D36ED50C09}.Release|Win32.ActiveCfg = Release|Win32
+ {965380C7-E747-41C1-91AC-E5D36ED50C09}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE