Merged 2.8

Author: Marcus Tomlinson

CMakeLists.txt

@@ -1,10 +1,8 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(EcsPython)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread -Wall -Wextra")
 
-add_definitions(
-    -fpermissive
-)
+project(EcsPython)
 
 add_subdirectory(example)
 
@@ -13,7 +11,6 @@ if(UNIX)
 endif(UNIX)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")    
-    add_definitions(-DECS_EXPORT)
     set(PYTHON_LIBRARIES "C:/Python27/libs/python27.lib")
     set(PYTHON_INCLUDE_DIRS "C:/Python27/include")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")

example/main.cpp

@@ -1,6 +1,6 @@
 /************************************************************************
-ECS:Python - Light-Weight C++ Wrapper For Embedding Python Into C++
-Copyright (c) 2012-2013 Marcus Tomlinson
+ECS:Python - Light-Weight C++ Library For Embedding Python Into C++
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of EcsPython.
 
@@ -50,11 +50,17 @@ class Simple
     return true;
   }
 
-  void ShowLots( unsigned long count, std::string message )
+  float ShowDouble( double message )
+  {
+    std::cout << message;
+    return (float)message;
+  }
+
+  void ShowLots( unsigned long count, char* message )
   {
     for( unsigned int i = 0; i < count; i++ )
     {
-      std::cout << message.c_str();
+      std::cout << message;
     }
     lastMessage = message;
   }
@@ -64,16 +70,43 @@ class Simple
     return lastMessage;
   }
 
+  void ShowPtr( void* thiz )
+  {
+      ((Simple*)thiz)->Show("Hey! This is coming from a pointer :)");
+  }
+
 private:
   std::string lastMessage;
 };
 
+// Simple Class Factory
+// ====================
+class SimpleFactory
+{
+public:
+    void* NewSimple( std::string firstMessage )
+    {
+        return new Simple( firstMessage );
+    }
+
+    void DeleteSimple( void* simple )
+    {
+        delete ( ( Simple* )simple );
+    }
+};
+
 // Register Classes + Methods
 // ==========================
-ECS_REGISTER_CLASS( Simple );
-ECS_REGISTER_METHOD_RETURN( Simple, Show, bool, std::string );
-ECS_REGISTER_METHOD_VOID( Simple, ShowLots, unsigned long, std::string );
-ECS_REGISTER_METHOD_RETURN( Simple, GetLastMessage, std::string );
+ECS_REGISTER_CLASS( Simple )
+ECS_REGISTER_METHOD_RETURN( Simple, Show, bool, std::string )
+ECS_REGISTER_METHOD_RETURN( Simple, ShowDouble, float, double )
+ECS_REGISTER_METHOD_VOID( Simple, ShowLots, unsigned long, char* )
+ECS_REGISTER_METHOD_RETURN( Simple, GetLastMessage, std::string )
+ECS_REGISTER_METHOD_VOID( Simple, ShowPtr, void* )
+
+ECS_REGISTER_CLASS( SimpleFactory )
+ECS_REGISTER_METHOD_RETURN( SimpleFactory, NewSimple, void*, std::string )
+ECS_REGISTER_METHOD_VOID( SimpleFactory, DeleteSimple, void* )
 
 //=================================================================================================
 
@@ -85,42 +118,66 @@ int main()
   // ======================
   Ecs_Init_Simple();
   Ecs_Init_Simple_Show();
+  Ecs_Init_Simple_ShowDouble();
   Ecs_Init_Simple_ShowLots();
   Ecs_Init_Simple_GetLastMessage();
+  Ecs_Init_Simple_ShowPtr();
+
+  Ecs_Init_SimpleFactory();
+  Ecs_Init_SimpleFactory_NewSimple();
+  Ecs_Init_SimpleFactory_DeleteSimple();
 
   // Initialize EcsPython
   // ====================
   Ecs_Initialize();
 
-  // Create New Class Instance
-  // =========================
-  Simple* newSimple = new Simple( "(first message)" );
 
-  // Expose Class Instance To Python
-  // ===============================
-  Ecs_Expose_Object( newSimple, "newSimple" );
+  // Create And Expose Class Instance To Python
+  // ==========================================
+  Simple newSimple( "(first message)" );
+  Ecs_Expose_Object( &newSimple, "newSimple" );
 
   // Use Exposed Class Instance From Python
   // ======================================
   Ecs_Python_Cmd( "print( newSimple.GetLastMessage() )" );
 
+  Ecs_Python_Cmd( "newSimple.Show( 'my favorite number is ' )" );
+  Ecs_Python_Cmd( "newSimple.ShowDouble( 5.9982 )" );
+  Ecs_Python_Cmd( "print('')" );
+
+  Ecs_Python_Cmd( "newSimple.ShowPtr( newSimple() )" );
+  Ecs_Python_Cmd( "print('')" );
+
   Ecs_Python_Cmd( "state = newSimple.Show( 'hello' )" );
-  Ecs_Python_Cmd( "if state == True: \n\t print( ' there,' )" );
+  Ecs_Python_Cmd( "if state == True:\n\tprint( ' there,' )" );
 
   Ecs_Python_Cmd( "newSimple.ShowLots( 5, 'again and ' )" );
 
   Ecs_Python_Cmd( "newSimple.Show( 'once more.' )" );
   Ecs_Python_Cmd( "print('')" );
 
-  // Use Class Instance From C++
-  // ===========================
-  std::cout << newSimple->GetLastMessage().c_str();
-  getchar();
+  // Use The Class Instance From C++
+  // ===============================
+  std::cout << "Ok, " << newSimple.GetLastMessage().c_str() << std::endl;
+
+
+  // Create And Expose Factory To Python
+  // ===================================
+  SimpleFactory simpleFactory;
+  Ecs_Expose_Object( &simpleFactory, "simpleFactory" );
+
+  // Create A New Class Instance From Python
+  // =======================================
+  Ecs_Python_Cmd( "anotherSimple = Simple( simpleFactory.NewSimple( '\\'Allo ' ) )" );
+  Ecs_Python_Cmd( "print( anotherSimple.GetLastMessage() + '\\'Allo!')" );
+  Ecs_Python_Cmd( "simpleFactory.DeleteSimple( anotherSimple() )" );
+
 
   // Finalize EcsPython
   // ==================
   Ecs_Finalize();
 
+  getchar();
   return 0;
 }
 

include/EcsPython.h

@@ -1,6 +1,6 @@
 /************************************************************************
-ECS:Python - Light-Weight C++ Wrapper For Embedding Python Into C++
-Copyright (c) 2012-2013 Marcus Tomlinson
+ECS:Python - Light-Weight C++ Library For Embedding Python Into C++
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of EcsPython.
 
@@ -32,30 +32,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ECSPYTHON_H
 #define ECSPYTHON_H
 
-#ifdef _WIN32
-
-#ifdef ECS_EXPORT
-  #define DLLPORT __declspec(dllexport)
-#else
-  #define DLLPORT __declspec(dllimport)
-#endif
-
-#else
-
-#define DLLPORT
-
-#endif
-
-#include <ecspython/EcsMacros.h>
 #include <dspatch/DspThread.h>
+#include <ecspython/EcsMacros.h>
 
 struct PyMethodDef;
 
 //=================================================================================================
 // EcsPython Globals
 // =================
 
-struct DLLEXPORT EcsClass
+struct EcsClass
 {
   EcsClass( std::string newPyClassName, const std::type_info& newPyClassType )
     : pyClassName( newPyClassName ),
@@ -65,7 +51,7 @@ struct DLLEXPORT EcsClass
   const std::type_info& pyClassType;
 };
 
-struct DLLEXPORT EcsObject
+struct EcsObject
 {
   EcsObject( char* newPyObject, std::string newPyClassName, std::string newPyObjectName )
     : pyObject( newPyObject ),
@@ -77,54 +63,54 @@ struct DLLEXPORT EcsObject
   std::string pyObjectName;
 };
 
-DLLPORT extern DspMutex EcsPythonCmdMutex;											// Mutex for thread-safe python calls
-DLLPORT extern std::vector< EcsClass* > EcsPythonClassesDict;		// C++ class dictionary
-DLLPORT extern std::string EcsPythonClassesDef;									// Python definition string for C++ classes 
-DLLPORT extern std::vector< PyMethodDef > EcsPythonMethods;			// Methods for EcsPython python module
-DLLPORT extern std::vector< EcsObject* > EcsExposedObjects;			// C++ objects exposed to Python
+extern DspMutex EcsPythonCmdMutex;                    // Mutex for thread-safe python calls
+extern std::vector< EcsClass* > EcsPythonClassesDict; // C++ class dictionary
+extern std::string EcsPythonClassesDef;               // Python definition string for C++ classes
+extern std::vector< PyMethodDef > EcsPythonMethods;   // Methods for EcsPython python module
+extern std::vector< EcsObject* > EcsExposedObjects;   // C++ objects exposed to Python
 
 #if PY_MAJOR_VERSION >= 3
-DLLPORT extern struct PyModuleDef EcsPythonModule;							// EcsPython python module
+extern struct PyModuleDef EcsPythonModule; // EcsPython python module
 #endif
 
 //=================================================================================================
 // Initialize EcsPython
 // ====================
 
-DLLEXPORT void Ecs_Initialize();
+void Ecs_Initialize();
 
 //-------------------------------------------------------------------------------------------------
 // Finalize EcsPython
 // ==================
 
-DLLEXPORT void Ecs_Finalize();
+void Ecs_Finalize();
 
 //-------------------------------------------------------------------------------------------------
 // Execute Python Command
 // ======================
 
-DLLEXPORT void Ecs_Python_Cmd( std::string pythonCmdString );
+void Ecs_Python_Cmd( std::string pythonCmdString );
 
 //-------------------------------------------------------------------------------------------------
 // Execute Python File
 // ===================
 
-DLLEXPORT void Ecs_Python_File( std::string pythonScriptPath );
+void Ecs_Python_File( std::string pythonScriptPath );
 
 //-------------------------------------------------------------------------------------------------
 // Get Object Value From Python
 // ============================
 
-DLLEXPORT std::string Ecs_Get_Value( std::string pyObjectName );
+std::string Ecs_Get_Value( std::string pyObjectName );
 
 //-------------------------------------------------------------------------------------------------
 // Expose Class Instance To Python
 // ===============================
 
-DLLEXPORT void _Ecs_Expose_Object( char* pyObject, std::string pyClassName, std::string pyObjectName );
+void _Ecs_Expose_Object( char* pyObject, std::string pyClassName, std::string pyObjectName );
 
 template< class ObjectType >
-DLLEXPORT void Ecs_Expose_Object( ObjectType* object, std::string pyObjectName )
+void Ecs_Expose_Object( ObjectType* object, std::string pyObjectName )
 {
   for( unsigned long i = 0; i < EcsPythonClassesDict.size(); i++ )
   {

include/dspatch/DspThread.h

@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

include/dspatch/DspThreadNull.h

@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -55,7 +55,7 @@ class DspThread
     HighPriority,
     HighestPriority,
 
-    TimeCriticalPriority,
+    TimeCriticalPriority
   };
 
   virtual void Start( Priority priority ) {}