Revision: 19550
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19550
Author: campbellbarton
Date: 2009-04-05 21:37:13 +0200 (Sun, 05 Apr 2009)
Log Message:
-----------
BGE PyAPI can now import text (within the blend-file)
Previously this only worked with the Blender API.
- bpy_internal_import small C file that Blender scripting and the game engine
use.
- Tested with blender, blenderplayer, loading files
- Needed to use a hack to override the Main struct since the game engine
doesn't set G.main
- when the sandbox is set, only internal scripts can be imported.
Modified Paths:
--------------
trunk/blender/source/blender/python/BPY_interface.c
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.h
trunk/blender/source/gameengine/Ketsji/SConscript
Added Paths:
-----------
trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
trunk/blender/source/blender/python/api2_2x/bpy_internal_import.h
Modified: trunk/blender/source/blender/python/BPY_interface.c
===================================================================
--- trunk/blender/source/blender/python/BPY_interface.c 2009-04-05 16:20:41 UTC
(rev 19549)
+++ trunk/blender/source/blender/python/BPY_interface.c 2009-04-05 19:37:13 UTC
(rev 19550)
@@ -71,6 +71,7 @@
#include "api2_2x/Registry.h"
#include "api2_2x/Pose.h"
#include "api2_2x/bpy.h" /* for the new "bpy" module */
+#include "api2_2x/bpy_internal_import.h"
/*these next two are for pyconstraints*/
#include "api2_2x/IDProp.h"
@@ -164,10 +165,8 @@
static PyObject *CreateGlobalDictionary( void );
static void ReleaseGlobalDictionary( PyObject * dict );
static void DoAllScriptsFromList( ListBase * list, short event );
-static PyObject *importText( char *name );
static void init_ourImport( void );
static void init_ourReload( void );
-static PyObject *blender_import( PyObject * self, PyObject * args, PyObject *
kw);
static void BPY_Err_Handle( char *script_name );
@@ -2821,91 +2820,11 @@
return;
}
-static PyObject *importText( char *name )
-{
- Text *text;
- char txtname[22]; /* 21+NULL */
- char *buf = NULL;
- int namelen = strlen( name );
-
- if (namelen>21-3) return NULL; /* we know this cant be importable, the
name is too long for blender! */
-
- memcpy( txtname, name, namelen );
- memcpy( &txtname[namelen], ".py", 4 );
- for(text = G.main->text.first; text; text = text->id.next) {
- if( !strcmp( txtname, text->id.name+2 ) )
- break;
- }
-
- if( !text )
- return NULL;
-
- if( !text->compiled ) {
- buf = txt_to_buf( text );
- text->compiled = Py_CompileString( buf, text->id.name+2,
Py_file_input );
- MEM_freeN( buf );
-
- if( PyErr_Occurred( ) ) {
- PyErr_Print( );
- BPY_free_compiled_text( text );
- return NULL;
- }
- }
-
- return PyImport_ExecCodeModule( name, text->compiled );
-}
-
-static PyMethodDef bimport[] = {
- {"blimport", blender_import, METH_KEYWORDS, "our own import"}
-};
-
-static PyObject *blender_import( PyObject * self, PyObject * args, PyObject *
kw)
-{
- PyObject *exception, *err, *tb;
- char *name;
- PyObject *globals = NULL, *locals = NULL, *fromlist = NULL;
- PyObject *m;
-
- //PyObject_Print(args, stderr, 0);
-#if (PY_VERSION_HEX >= 0x02060000)
- int dummy_val; /* what does this do?*/
- static char *kwlist[] = {"name", "globals", "locals", "fromlist",
"level", 0};
-
- if( !PyArg_ParseTupleAndKeywords( args, kw, "s|OOOi:bimport", kwlist,
- &name, &globals, &locals, &fromlist, &dummy_val)
)
- return NULL;
-#else
- static char *kwlist[] = {"name", "globals", "locals", "fromlist", 0};
-
- if( !PyArg_ParseTupleAndKeywords( args, kw, "s|OOO:bimport", kwlist,
- &name, &globals, &locals, &fromlist ) )
- return NULL;
-#endif
- m = PyImport_ImportModuleEx( name, globals, locals, fromlist );
-
- if( m )
- return m;
- else
- PyErr_Fetch( &exception, &err, &tb ); /*restore for probable
later use */
-
- m = importText( name );
- if( m ) { /* found module, ignore above exception */
- PyErr_Clear( );
- Py_XDECREF( exception );
- Py_XDECREF( err );
- Py_XDECREF( tb );
- printf( "imported from text buffer...\n" );
- } else {
- PyErr_Restore( exception, err, tb );
- }
- return m;
-}
-
static void init_ourImport( void )
{
PyObject *m, *d;
- PyObject *import = PyCFunction_New( bimport, NULL );
+ PyObject *import = PyCFunction_New( bpy_import, NULL );
m = PyImport_AddModule( "__builtin__" );
d = PyModule_GetDict( m );
@@ -2913,100 +2832,10 @@
EXPP_dict_set_item_str( d, "__import__", import );
}
-/*
- * find in-memory module and recompile
- */
-
-static PyObject *reimportText( PyObject *module )
-{
- Text *text;
- char *txtname;
- char *name;
- char *buf = NULL;
-
- /* get name, filename from the module itself */
-
- txtname = PyModule_GetFilename( module );
- name = PyModule_GetName( module );
- if( !txtname || !name)
- return NULL;
-
- /* look up the text object */
- text = ( Text * ) & ( G.main->text.first );
- while( text ) {
- if( !strcmp( txtname, text->id.name+2 ) )
- break;
- text = text->id.next;
- }
-
- /* uh-oh.... didn't find it */
- if( !text )
- return NULL;
-
- /* if previously compiled, free the object */
- /* (can't see how could be NULL, but check just in case) */
- if( text->compiled ){
- Py_DECREF( (PyObject *)text->compiled );
- }
-
- /* compile the buffer */
- buf = txt_to_buf( text );
- text->compiled = Py_CompileString( buf, text->id.name+2, Py_file_input
);
- MEM_freeN( buf );
-
- /* if compile failed.... return this error */
- if( PyErr_Occurred( ) ) {
- PyErr_Print( );
- BPY_free_compiled_text( text );
- return NULL;
- }
-
- /* make into a module */
- return PyImport_ExecCodeModule( name, text->compiled );
-}
-
-/*
- * our reload() module, to handle reloading in-memory scripts
- */
-
-static PyObject *blender_reload( PyObject * self, PyObject * args )
-{
- PyObject *exception, *err, *tb;
- PyObject *module = NULL;
- PyObject *newmodule = NULL;
-
- /* check for a module arg */
- if( !PyArg_ParseTuple( args, "O:breload", &module ) )
- return NULL;
-
- /* try reimporting from file */
- newmodule = PyImport_ReloadModule( module );
- if( newmodule )
- return newmodule;
-
- /* no file, try importing from memory */
- PyErr_Fetch( &exception, &err, &tb ); /*restore for probable later
use */
-
- newmodule = reimportText( module );
- if( newmodule ) { /* found module, ignore above exception
*/
- PyErr_Clear( );
- Py_XDECREF( exception );
- Py_XDECREF( err );
- Py_XDECREF( tb );
- } else
- PyErr_Restore( exception, err, tb );
-
- return newmodule;
-}
-
-static PyMethodDef breload[] = {
- {"blreload", blender_reload, METH_VARARGS, "our own reload"}
-};
-
static void init_ourReload( void )
{
PyObject *m, *d;
- PyObject *reload = PyCFunction_New( breload, NULL );
+ PyObject *reload = PyCFunction_New( bpy_reload, NULL );
m = PyImport_AddModule( "__builtin__" );
d = PyModule_GetDict( m );
Added: trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
(rev 0)
+++ trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
2009-04-05 19:37:13 UTC (rev 19550)
@@ -0,0 +1,230 @@
+/*
+ * $Id: bpy_types.h 14444 2008-04-16 22:40:48Z hos $
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * This is a new part of Blender.
+ *
+ * Contributor(s): Willian P. Germano
+ *
+ * ***** END GPL LICENSE BLOCK *****
+*/
+
+#include "bpy_internal_import.h"
+#include "DNA_text_types.h"
+#include "DNA_ID.h"
+
+#include "BKE_global.h"
+#include "MEM_guardedalloc.h"
+#include "BKE_text.h" /* txt_to_buf */
+#include "BKE_main.h"
+
+static Main *bpy_import_main= NULL;
+
+static void free_compiled_text(Text *text)
+{
+ if(text->compiled) {
+ Py_DECREF(text->compiled);
+ }
+ text->compiled= NULL;
+}
+
+struct Main *bpy_import_main_get(void)
+{
+ return bpy_import_main;
+}
+
+void bpy_import_main_set(struct Main *maggie)
+{
+ bpy_import_main= maggie;
+}
+
+
+PyObject *importText( char *name )
+{
+ Text *text;
+ char txtname[22]; /* 21+NULL */
+ char *buf = NULL;
+ int namelen = strlen( name );
+ Main *maggie= bpy_import_main ? bpy_import_main:G.main;
+
+ if (namelen>21-3) return NULL; /* we know this cant be importable, the
name is too long for blender! */
+
+ memcpy( txtname, name, namelen );
+ memcpy( &txtname[namelen], ".py", 4 );
+
+ for(text = maggie->text.first; text; text = text->id.next) {
+ fprintf(stderr, "%s | %s\n", txtname, text->id.name+2);
+ if( !strcmp( txtname, text->id.name+2 ) )
+ break;
+ }
+
+ if( !text )
+ return NULL;
+
+ if( !text->compiled ) {
+ buf = txt_to_buf( text );
+ text->compiled = Py_CompileString( buf, text->id.name+2,
Py_file_input );
+ MEM_freeN( buf );
+
+ if( PyErr_Occurred( ) ) {
+ PyErr_Print( );
+ free_compiled_text( text );
+ return NULL;
+ }
+ }
+
+ return PyImport_ExecCodeModule( name, text->compiled );
+}
+
+
+/*
+ * find in-memory module and recompile
+ */
+
+PyObject *reimportText( PyObject *module )
+{
+ Text *text;
+ char *txtname;
+ char *name;
+ char *buf = NULL;
+ Main *maggie= bpy_import_main ? bpy_import_main:G.main;
+
+ /* get name, filename from the module itself */
+
+ txtname = PyModule_GetFilename( module );
+ name = PyModule_GetName( module );
+ if( !txtname || !name)
+ return NULL;
+
+ /* look up the text object */
+ text = ( Text * ) & ( maggie->text.first );
+ while( text ) {
+ if( !strcmp( txtname, text->id.name+2 ) )
+ break;
+ text = text->id.next;
+ }
+
+ /* uh-oh.... didn't find it */
+ if( !text )
+ return NULL;
+
+ /* if previously compiled, free the object */
+ /* (can't see how could be NULL, but check just in case) */
+ if( text->compiled ){
+ Py_DECREF( (PyObject *)text->compiled );
+ }
+
+ /* compile the buffer */
+ buf = txt_to_buf( text );
+ text->compiled = Py_CompileString( buf, text->id.name+2, Py_file_input
);
+ MEM_freeN( buf );
+
+ /* if compile failed.... return this error */
+ if( PyErr_Occurred( ) ) {
+ PyErr_Print( );
+ free_compiled_text( text );
+ return NULL;
+ }
+
+ /* make into a module */
+ return PyImport_ExecCodeModule( name, text->compiled );
+}
+
+
+static PyObject *blender_import( PyObject * self, PyObject * args, PyObject *
kw)
+{
+ PyObject *exception, *err, *tb;
+ char *name;
+ PyObject *globals = NULL, *locals = NULL, *fromlist = NULL;
+ PyObject *m;
+
+ //PyObject_Print(args, stderr, 0);
+#if (PY_VERSION_HEX >= 0x02060000)
+ int dummy_val; /* what does this do?*/
+ static char *kwlist[] = {"name", "globals", "locals", "fromlist",
"level", 0};
+
+ if( !PyArg_ParseTupleAndKeywords( args, kw, "s|OOOi:bpy_import", kwlist,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
