sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

-fixes in player: draw physics debugging, only render frames when actually updated, fix with hierarchies not properly build (causing crashes)

Browse Source
This commit is contained in:
Erwin Coumans 2006-12-26 22:02:31 +00:00
parent 7b14c36a18
commit 14d60ca000
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
View File

@ -435,10 +435,12 @@ bool GPG_Application::processEvent(GHOST_IEvent* event)
m_exitRequested = m_ketsjiengine->GetExitCode();
// kick the engine
m_ketsjiengine->NextFrame();
// render the frame
m_ketsjiengine->Render();
bool renderFrame = m_ketsjiengine->NextFrame();
if (renderFrame)
{
// render the frame
m_ketsjiengine->Render();
}
}
m_exitString = m_ketsjiengine->GetExitString();
}
@ -496,6 +498,9 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
bool profile = (SYS_GetCommandLineInt(syshandle, "show_profile", 0) != 0);
bool fixedFr = (G.fileflags & G_FILE_ENABLE_ALL_FRAMES);
bool showPhysics = (G.fileflags & G_FILE_SHOW_PHYSICS);
SYS_WriteCommandLineInt(syshandle, "show_physics", showPhysics);
bool fixed_framerate= (SYS_GetCommandLineInt(syshandle, "fixed_framerate", fixedFr) != 0);
bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
bool useVertexArrays = SYS_GetCommandLineInt(syshandle,"vertexarrays",1) != 0;

2
source/gameengine/Ketsji/KX_ISceneConverter.h
View File

@ -39,7 +39,7 @@ class KX_ISceneConverter
{
public:
KX_ISceneConverter() {}
KX_ISceneConverter() :addInitFromFrame(false) {}//this addInitFromFrame is a back hack, todo remove
virtual ~KX_ISceneConverter () {};
/*

10
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
View File

@ -368,8 +368,14 @@ void CcdPhysicsController::setScaling(float scaleX,float scaleY,float scaleZ)
if (m_body && m_body->getCollisionShape())
{
m_body->getCollisionShape()->setLocalScaling(m_cci.m_scaling);
m_body->getCollisionShape()->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
m_body->setMassProps(m_cci.m_mass, m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
//printf("no inertia recalc for fixed objects with mass=0\n");
if (m_cci.m_mass)
{
m_body->getCollisionShape()->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
m_body->setMassProps(m_cci.m_mass, m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
}
}
}
}