some minor webplugin changes, new loading .blend, upgraded version to 2.42, enabled...
authorErwin Coumans <blender@erwincoumans.com>
Thu, 6 Jul 2006 07:58:07 +0000 (07:58 +0000)
committerErwin Coumans <blender@erwincoumans.com>
Thu, 6 Jul 2006 07:58:07 +0000 (07:58 +0000)
source/gameengine/GamePlayer/common/load.blend
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp

index 1490fba6108e926416519cd9bf36c8fe4269db56..ae520504971f0bdd61fdd6461d8cd74a54a64c77 100644 (file)
Binary files a/source/gameengine/GamePlayer/common/load.blend and b/source/gameengine/GamePlayer/common/load.blend differ
index 9143526f497a163776df14181caeef5ffddd42f1..51f81eb2583a06c050324f698dcc48d6dc45d361 100644 (file)
@@ -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);
index 65751a995d979a77356b07a7ea2a4faa81dd57b1..7a937d5e3492088f97f5c449e7bb497a79681887 100644 (file)
@@ -830,7 +830,7 @@ PyObject *KXpy_import(PyObject *self, PyObject *args)
 
        /* quick hack for GamePython modules 
                TODO: register builtin modules properly by ExtendInittab */
-       if (!strcmp(name, "GameLogic") || !strcmp(name, "GameKeys") ||
+       if (!strcmp(name, "GameLogic") || !strcmp(name, "GameKeys") || !strcmp(name, "PhysicsConstraints") ||
                !strcmp(name, "Rasterizer")) {
                return PyImport_ImportModuleEx(name, globals, locals, fromlist);
        }