Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed old Blender/extern/bullet, and upgraded game engine to use Bullet 2.x

Browse Source 
All platforms/build systems: either upgrade to use extern/bullet2, or disable the game engine until the build is fixed.
This commit is contained in:
Erwin Coumans
2006-11-21 00:53:40 +00:00
parent 4bbbabd049
commit 46234f90ce
227 changed files with 599 additions and 35377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

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