Changeset 3012

Timestamp:

2007-10-02 23:54:01 (3 years ago)

Author:

caedesv

Message:

adapted cel for bindingsplit merge into cs trunk.

Location:

cel/trunk

Files:

• docs/history.txt (modified) (1 diff)
• include/bindings/blcel.i (modified) (3 diffs)
• plugins/behaviourlayer/python/blpython.cpp (modified) (3 diffs)
• plugins/behaviourlayer/python/Jamfile (modified) (2 diffs)
• plugins/behaviourlayer/python/pytocel.cpp (modified) (1 diff)
• plugins/behaviourlayer/python/swigpyruntime.h (added)

cel/trunk/docs/history.txt

@@ -6 +6 @@
 02-Oct-2007
         - cfraz89 added anti-sway ability to pcwheeled.
+        - caedes adapted blpython and cel bindings to account for bindingsplit
+          branch merge into trunk. Side effect is now pure python cel
+          applications are possible.
 29-Sep-2007
         - Sueastside added SetAnimationMapping() which allows you to

cel/trunk/include/bindings/blcel.i

@@ -4 +4 @@
 %include "celproperties.i" // all property accessors
 CS_PROPERTY_HELPERS
+
 %{
 #include <crystalspace.h>
@@ -57 +58 @@
 %}
 
+/* Funtions to set the modules global SCF pointer, this is needed
+   when working on a pure scripting environment, as then this code
+   lives in a non-cs dll, thus the pointer isnt initialized
+   by cs itself, and scf stuff wont work unless the pointer is
+   initialized manually. Use it after CreateEnvironment call. */
+INLINE_FUNCTIONS
+
 //=============================================================================
 // Interfaces that need csRef,csPtr,csRefArray
@@ -619 +627 @@
 }
 
-/* Funtions to set the modules global SCF pointer, this is needed
-   when working on a pure scripting environment, as then this code
-   lives in a non-cs dll, thus the pointer isnt initialized
-   by cs itself, and scf stuff wont work unless the pointer is
-   initialized manually. Use it after CreateEnvironment call. */
-void SetSCFPointer(iSCF* pscf)
-{
-  iSCF::SCF = pscf;
-}
-
-iSCF* GetSCFPointer()
-{
-  return iSCF::SCF;
-}
-
 %}
 

cel/trunk/plugins/behaviourlayer/python/blpython.cpp

@@ -36 +36 @@
 #include "physicallayer/pl.h"
 
+extern "C"
+{
+  #include "swigpyruntime.h"
+}
+
+
 extern unsigned char pycel_py_wrapper[]; // pycel.py file compiled and marshalled
 extern size_t pycel_py_wrapper_size;
@@ -107 +113 @@
   if (!LoadModule ("blcelc")) return false;
 
+  Store("cspace.__corecvar_iSCF_SCF", iSCF::SCF, (void*)"iSCF *");
+  RunText("cspace.SetSCFPointer(cspace.__corecvar_iSCF_SCF)");
   // Store the object registry pointer in 'blcel.object_reg'.
   Store ("blcelc.object_reg_ptr", object_reg, (void *) "iObjectRegistry *");
@@ -152 +160 @@
 
   return true;
+}
+
+PyObject* csWrapTypedObject(void* objectptr, const char *typetag,
+                  int own)
+{
+    swig_type_info *ti = SWIG_TypeQuery (typetag);
+    PyObject *obj = SWIG_NewPointerObj (objectptr, ti, own);
+    return obj;
 }
 

cel/trunk/plugins/behaviourlayer/python/Jamfile

@@ -36 +36 @@
     {
       SEARCH on $(blcelcpp) = $(SEARCH_SOURCE) ;
-      local frozenpy = $(blcelpy:G=frozenblcelpy) ;
-      SEARCH on $(frozenpy) = [ ConcatDirs $(TOP) scripts ] ;
-      Copy $(blcelpy) : $(frozenpy) ;
-      Depends $(blcelpy) : $(frozenpy) ;
     }
   }
@@ -74 +70 @@
   # blpython plugin.
   #--------
+  local swigruntime = swigpyruntime.h ;
+  if $(CMD.SWIG)
+  {
+    SwigExternalRuntime $(swigruntime) :
+      python :
+      -c++ -shadow :
+      $(SEARCH_SOURCE) [ ConcatDirs $(TOP) scripts python ] :
+      blpython ;
+    Depends blpythonclean : blpythonswigclean ;
+  }
+  else
+  {
+    SEARCH on $(swigruntime) = $(SEARCH_SOURCE) ;
+  }
+
+  save_HDRS = $(HDRS) ;
+  HDRS = [ on $(swigruntime) GetVar LOCATE ] $(HDRS) ;
   Plugin blpython : blpython.cpp blpython.h pytocel.cpp PYCEL_py.cpp ;
   LinkWith blpython : cel_python ;
   ExternalLibs blpython : PYTHON CRYSTAL ; 
   CFlags blpython : $(CELPYTHON.CFLAGS) ;
-  
+  HDRS = $(save_HDRS) ;
+
   #--------
   # blcelmod -- Pure Python module

cel/trunk/plugins/behaviourlayer/python/pytocel.cpp

@@ -57 +57 @@
 };
 
-extern "C" void SWIG_init_cspace();
-extern "C" void SWIG_init_blcelc();
-//TODO temporary
-
 void InitPytocel ()
 {
   Py_InitModule ("pytocel", PytocelMethods);
-  SWIG_init_cspace();
-  SWIG_init_blcelc();
-//TODO temporary
 }