Changeset 19

Timestamp:

01/10/2007 09:29:46 PM (5 years ago)

Author:

art

Message:

 

Files:

• Plugins/luaScripting/Script.cpp (modified) (5 diffs)
• Plugins/luaScripting/ScriptConnector.cpp (modified) (2 diffs)
• Plugins/luaScripting/ScriptConnector.h (modified) (1 diff)
• nrEngine/include/Event.h (modified) (2 diffs)
• nrEngine/include/EventActor.h (modified) (2 diffs)
• nrEngine/include/EventChannel.h (modified) (1 diff)
• nrEngine/include/Result.h (modified) (1 diff)
• nrEngine/include/nrEngine.h (modified) (1 diff)
• nrEngine/nrEngine.h (modified) (1 diff)
• nrEngine/src/EventActor.cpp (modified) (2 diffs)
• nrEngine/src/EventChannel.cpp (modified) (2 diffs)

Plugins/luaScripting/Script.cpp

@@ -16 +16 @@
 lua_State*      LuaScript::State = NULL;
 
-#if 0
+#if 1
 // Dump all the contents of your lua_state (Lua Stack) 
  // Find out the location of ur table and try to print out the details by 
@@ -24 +24 @@
          int i;
          int top = lua_gettop(L);
+         printf("Stack has %d elements\n", top);
          for (i = 1; i <= top; i++) { /* repeat for each level */
                  int t = lua_type(L, i);
@@ -42 +43 @@
                         default: /* other values */
                                  printf("type: %s", lua_typename(L, t));
-                                 break;
- 
+                                 break; 
                  }
                  printf("\n"); /* put a separator */
@@ -131 +131 @@
         {
                 pushErrorMessage(std::string("luaScript: The stack must be empty when calling a function!"));
+                stackDump(State);
                 return SCRIPT_ERROR;
         }
@@ -166 +167 @@
         {
                 pushErrorMessage(std::string("luaScript: The stack must be empty when calling a function!"));
+                stackDump(State);
                 return SCRIPT_ERROR;
         }

Plugins/luaScripting/ScriptConnector.cpp

@@ -22 +22 @@
 {
         initialize();
+        initializeLuaEnvironment();
 }
 
+//----------------------------------------------------------------------------------
+void LuaScriptConnector::initializeLuaEnvironment()
+{
+        // add include function
+        lua_pushcfunction(LuaScript::State, includeFile);
+        lua_setglobal(LuaScript::State, "include");
+}
+
+        
 //----------------------------------------------------------------------------------
 void LuaScriptConnector::OnRegisterFunction(const std::string& name, const ScriptFunctor& func)
@@ -48 +58 @@
         mRegistered.erase(std::find(mRegistered.begin(), mRegistered.end(), name));
 }
+
+
+//----------------------------------------------------------------------------------
+int LuaScriptConnector::includeFile(lua_State *L)
+{  
+        int n=lua_gettop(L);
+        while (n)
+        {
+                // check if do not have  anil value 
+                if (!lua_isnil(L, -n))
+                {
+                        // do we got a string
+                        if (lua_isstring(L, -n))
+                        {
+                                // read string parameter
+                                std::string filename = lua_tostring(L, -n);
+                                
+                                // open filestream and load it
+                                FileStream* fStream = new FileStream();
+                                Result ret = fStream->open(filename);
+                                if (ret == OK)
+                                {
+                                        // get the whole file content
+                                        std::string str = fStream->getAsString();
+                        
+                                        // now let lua do the string
+                                        luaL_dostring(L, str.c_str());
+                                }else{
+                                        printf("ScriptConnector: Cannot load luafile %s, no file found\n", filename.c_str());
+                                }
+                                delete fStream;
+                        }else{
+                                printf("ScriptConnector: Cannot include luafile. Filename(string) must be given. You gave me %s:%p\n",luaL_typename(L,-n),lua_topointer(L,-n));
+                                return 0;
+                        }
+                }
+                --n;
+        }
+        
+        // clear the stack
+        lua_pop(L, lua_gettop(L));
+        
+        return 0;
+}
+
 
 //----------------------------------------------------------------------------------

Plugins/luaScripting/ScriptConnector.h

@@ -60 +60 @@
                 std::list<std::string>  mRegistered;
                 
+                //! Include lua file (this function will be registered in lua)
+                static int includeFile(lua_State *L);
+                
+                //! Initialize default functions, which are registered in the lua environemnt
+                void initializeLuaEnvironment();
+                
 };
 

nrEngine/include/Event.h

@@ -93 +93 @@
         **/
         template<class T>
-        static T* event_cast(Event* base) throw (Exception)
+        static T* event_cast(Event* base)
         {
                 T* ptr = NULL;
-                try{
-                        ptr = dynamic_cast<T*>(base);
-                        if (ptr == NULL) throw(Result(EVENT_COULD_NOT_CAST));
-
-                }catch (Result i){
-                        NR_EXCEPT(i,
-                                                "Casting from Event* to given type is not possible",
-                                                "Event::event_shared_cast<T>()");
-                }
+                ptr = dynamic_cast<T*>(base);
                 return ptr;
         }
@@ -118 +110 @@
         {
                 SharedPtr<T> ptr;
-                try
-                {
-                        ptr = boost::dynamic_pointer_cast<T, Event>(base);
-                        if (ptr == NULL) throw(Result(EVENT_COULD_NOT_CAST));
-
-                }catch (Result i){
-                        NR_EXCEPT(i,
-                                                "Casting from Event* to given type is not possible",
-                                                "Event::event_shared_cast<T>()");
-                }
+                ptr = boost::dynamic_pointer_cast<T, Event>(base);
                 return ptr;
         }

nrEngine/include/EventActor.h

@@ -42 +42 @@
                 public:
 
+                        //! Create new actor without any name (@see setName() ) 
+                        EventActor();
+                        
                         //! Create a new actor within unique name
                         EventActor(const std::string& name);
@@ -55 +58 @@
                         const std::string& getName() const;
 
+                        /**
+                         * Set name for this actor. You have to setup a name before you can
+                         * connect the actor to any communication channel.
+                         **/
+                        void setName(const std::string& name);
+                        
                         /**
                          * This is a function which will be called from the channel

nrEngine/include/EventChannel.h

@@ -91 +91 @@
                          * Get the name of the channel
                          **/
-                        const std::string& getName () { return mName; }
+                        NR_FORCEINLINE const std::string& getName () const { return mName; }
 
                         /**

nrEngine/include/Result.h

@@ -326 +326 @@
                 EVENT_FACTORY_NOT_FOUND = EVENT_ERROR | (1 << 7),
 
+                //! Given actor is not valid
+                EVENT_NO_VALID_ACTOR = EVENT_ERROR | (1 << 8),
+                
                 //------------------------------------------------------------------------------
                 //! Generic group for properties errors

nrEngine/include/nrEngine.h

@@ -44 +44 @@
 #include "Event.h"
 #include "EventActor.h"
+#include "EventChannel.h"
 
 #endif

nrEngine/nrEngine.h

@@ -44 +44 @@
 #include "include/Event.h"
 #include "include/EventActor.h"
+#include "include/EventChannel.h"
 
 #endif

nrEngine/src/EventActor.cpp

@@ -20 +20 @@
 
 namespace nrEngine{
-                
+
+        //------------------------------------------------------------------------
+        EventActor::EventActor()
+        {
+        
+        }
+
         //------------------------------------------------------------------------
         EventActor::EventActor(const std::string& name) : mName(name){
@@ -36 +42 @@
         }
 
+        //------------------------------------------------------------------------
+        void EventActor::setName(const std::string& name)
+        {
+                mName = name;
+        }
+        
+        
         //------------------------------------------------------------------------
         const std::string& EventActor::getName() const

nrEngine/src/EventChannel.cpp

@@ -34 +34 @@
         Result EventChannel::add(EventActor* actor, bool notice)
         {
+                // check if actor has got a name 
+                if (actor == NULL) return OK;
+                if (actor->getName().length() == 0)
+                {
+                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, "EventChannel (%s): Want to connect nameless actor", getName().c_str());
+                        return EVENT_NO_VALID_ACTOR;
+                }
+                
                 // we first check whenever the actor is already connected
                 if (isConnected(actor->getName())) return EVENT_ALREADY_CONNECTED;
@@ -52 +60 @@
         Result EventChannel::del(EventActor* actor, bool notice)
         {
+                if (actor == NULL) return OK;
+                
                 // we first check whenever the actor is already connected
                 if (!isConnected(actor->getName())) return EVENT_NOT_CONNECTED;