diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2006-07-06 11:58:07 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2006-07-06 11:58:07 +0400 |
commit | 6b90f20e87c8ba79da96176a96dd30eb00bbdbb0 (patch) | |
tree | ea918eca1da23fdedfa6d0940ef900d0db57eb9a /source/gameengine/GamePlayer | |
parent | 68fc1ce02c945c87b319398d104fa3b4fde81418 (diff) |
some minor webplugin changes, new loading .blend, upgraded version to 2.42, enabled PhysicsConstraints module within sandbox.
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r-- | source/gameengine/GamePlayer/common/load.blend | bin | 135908 -> 60988 bytes | |||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 15 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source/gameengine/GamePlayer/common/load.blend b/source/gameengine/GamePlayer/common/load.blend Binary files differindex 1490fba6108..ae520504971 100644 --- a/source/gameengine/GamePlayer/common/load.blend +++ b/source/gameengine/GamePlayer/common/load.blend diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 9143526f497..51f81eb2583 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -643,18 +643,23 @@ bool GPG_Application::startEngine(void) m_audiodevice, startscenename); + // some python things - PyObject* m_dictionaryobject = initGamePlayerPythonScripting("Ketsji", psl_Lowest); - m_ketsjiengine->SetPythonDictionary(m_dictionaryobject); + PyObject* dictionaryobject = initGamePythonScripting("Ketsji", psl_Lowest); + m_ketsjiengine->SetPythonDictionary(dictionaryobject); initRasterizer(m_rasterizer, m_canvas); - initGameLogic(startscene); + PyObject *gameLogic = initGameLogic(startscene); initGameKeys(); initPythonConstraintBinding(); - + + + + + m_sceneconverter->ConvertScene( startscenename, startscene, - m_dictionaryobject, + dictionaryobject, m_keyboard, m_rendertools, m_canvas); |