From 46234f90cee9b3967cb6361661ce47b455cbaa57 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 21 Nov 2006 00:53:40 +0000 Subject: Removed old Blender/extern/bullet, and upgraded game engine to use Bullet 2.x All platforms/build systems: either upgrade to use extern/bullet2, or disable the game engine until the build is fixed. --- source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/gameengine/Converter') diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 20498167021..83b2a11e606 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -202,10 +202,10 @@ static struct Scene *GetSceneForName2(struct Main *maggie, const STR_String& sce #ifdef USE_BULLET -#include "IDebugDraw.h" +#include "LinearMath/btIDebugDraw.h" -struct BlenderDebugDraw : public IDebugDraw +struct BlenderDebugDraw : public btIDebugDraw { BlenderDebugDraw () : m_debugMode(0) @@ -214,7 +214,7 @@ struct BlenderDebugDraw : public IDebugDraw int m_debugMode; - virtual void DrawLine(const SimdVector3& from,const SimdVector3& to,const SimdVector3& color) + virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& color) { if (m_debugMode >0) { @@ -226,16 +226,16 @@ struct BlenderDebugDraw : public IDebugDraw } } - virtual void DrawContactPoint(const SimdVector3& PointOnB,const SimdVector3& normalOnB,float distance,int lifeTime,const SimdVector3& color) + virtual void drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,float distance,int lifeTime,const btVector3& color) { //not yet } - virtual void SetDebugMode(int debugMode) + virtual void setDebugMode(int debugMode) { m_debugMode = debugMode; } - virtual int GetDebugMode() const + virtual int getDebugMode() const { return m_debugMode; } -- cgit v1.2.3