forked from bartvdbraak/blender
Finalised support for compiling BULLET on linux.
Bullet is now off by default on all platforms until we get an OK from Erwin. To enable it, change USE_PHYSICS to 'bullet' in your config.opts.
This commit is contained in:
parent
280e976044
commit
671235b69b
@ -346,9 +346,9 @@ elif sys.platform == 'win32':
|
|||||||
use_openal = 'true'
|
use_openal = 'true'
|
||||||
use_fmod = 'false'
|
use_fmod = 'false'
|
||||||
use_quicktime = 'true'
|
use_quicktime = 'true'
|
||||||
use_sumo = 'false'
|
use_sumo = 'true'
|
||||||
use_ode = 'false'
|
use_ode = 'false'
|
||||||
use_bullet = 'true'
|
use_bullet = 'false'
|
||||||
use_buildinfo = 'true'
|
use_buildinfo = 'true'
|
||||||
build_blender_dynamic = 'true'
|
build_blender_dynamic = 'true'
|
||||||
build_blender_static = 'false'
|
build_blender_static = 'false'
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "ConstraintSolver/ConstraintSolver.h"
|
#include "ConstraintSolver/ConstraintSolver.h"
|
||||||
#include "ConstraintSolver/ContactSolverInfo.h"
|
#include "ConstraintSolver/ContactSolverInfo.h"
|
||||||
#include "CollisionDispatch/ManifoldResult.h"
|
#include "CollisionDispatch/ManifoldResult.h"
|
||||||
#include "NarrowphaseCollision/RaycastCallback.h"
|
#include "NarrowPhaseCollision/RaycastCallback.h"
|
||||||
#include "CollisionShapes/TriangleMeshShape.h"
|
#include "CollisionShapes/TriangleMeshShape.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h"
|
#include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h"
|
||||||
#include "NarrowPhaseCollision/ContinuousConvexCollision.h"
|
#include "NarrowPhaseCollision/ContinuousConvexCollision.h"
|
||||||
#include "NarrowPhaseCollision/SubsimplexConvexCast.h"
|
#include "NarrowPhaseCollision/SubSimplexConvexCast.h"
|
||||||
#include "NarrowPhaseCollision/GjkConvexCast.h"
|
#include "NarrowPhaseCollision/GjkConvexCast.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include "SimdVector3.h"
|
#include "SimdVector3.h"
|
||||||
#include "JacobianEntry.h"
|
#include "JacobianEntry.h"
|
||||||
#include "ContactSolverInfo.h"
|
#include "ContactSolverInfo.h"
|
||||||
#include "GEN_minmax.h"
|
#include "GEN_MinMax.h"
|
||||||
|
|
||||||
#define ASSERT2 assert
|
#define ASSERT2 assert
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "RigidBody.h"
|
#include "RigidBody.h"
|
||||||
#include "MassProps.h"
|
#include "MassProps.h"
|
||||||
#include "CollisionShapes/ConvexShape.h"
|
#include "CollisionShapes/ConvexShape.h"
|
||||||
#include "GEN_minmax.h"
|
#include "GEN_MinMax.h"
|
||||||
#include <SimdTransformUtil.h>
|
#include <SimdTransformUtil.h>
|
||||||
|
|
||||||
float gRigidBodyDamping = 0.5f;
|
float gRigidBodyDamping = 0.5f;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "SimdTransform.h"
|
#include "SimdTransform.h"
|
||||||
#include "Dynamics/RigidBody.h"
|
#include "Dynamics/RigidBody.h"
|
||||||
#include "BroadphaseCollision/BroadPhaseInterface.h"
|
#include "BroadphaseCollision/BroadphaseInterface.h"
|
||||||
#include "BroadphaseCollision/SimpleBroadphase.h"
|
#include "BroadphaseCollision/SimpleBroadphase.h"
|
||||||
|
|
||||||
#include "CollisionShapes/ConvexShape.h"
|
#include "CollisionShapes/ConvexShape.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user