Changeset 8131 in orxonox.OLD for branches

Timestamp:

Jun 3, 2006, 6:56:18 PM (19 years ago)

Author:

snellen

Message:

Continued working on script manager

Location:

branches/script_engine/src/lib/script_engine

Files:

• script.cc (modified) (2 diffs)
• script.h (modified) (1 diff)
• script_manager.cc (modified) (3 diffs)
• script_manager.h (modified) (2 diffs)

branches/script_engine/src/lib/script_engine/script.cc

@@ -29 +29 @@
 
    if(currentFile.length() != 0)
-   { 
+   {
      printf("Could not load %s because an other file is already loaded: %s\n",filename.c_str(), currentFile.c_str());
      return false;
@@ -216 +216 @@
  }
 
+ void Script::getReturnedString(std::string& string)
+ {
+   char* returnValue;
+   if(returnCount > 0)
+   {
+     if(lua_istring(luaState, -1))
+     {
+       returnValue = lua_tostring(luaState, -1);
+       returnCount--;
+       lua_pop(luaState,1);
+     }
+   }
+  string.assign(returnValue);
+ }
+
  int Script::reportError(int error)
  {

branches/script_engine/src/lib/script_engine/script.h

@@ -31 +31 @@
     bool  getReturnedBool();
     float getReturnedFloat();
+    void getReturnedString(std::string string);
 
 
   private:
 
-    int reportError(int error);
+    int reportError(int error);          //!< Get errormessage from the lua stack and print it.
 
     lua_State*         luaState;         //!< The lua_State that the Script works on

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ -6 +6 @@
 
 
-
-ScriptManager::ScriptManager()
+ScriptManager::ScriptManager(std::string world)
 {
-  this->init();
+  this->init(world);
 
 }
@@ -19 +18 @@
 }
 
+//!< Fills the worldObject list
 
-void ScriptManager::init()
+void ScriptManager::init(std::string world)
 {
 
@@ -30 +30 @@
 void ScriptManager::loadParams(const TiXmlElement* root)
 {
+  //BaseObject::loadParams(root);
+
 
 }
 
+
+void ScriptManager::tick(float timestep)
+{
+}
+
+void ScriptManager::changeWorld(std::string newWorld)
+{
+}
+
+
+void Script::Manager::initScripts()
+{
+}
+
+

branches/script_engine/src/lib/script_engine/script_manager.h

@@ -2 +2 @@
 #define _SCRIPT_MNAGER_H
 
-
+#include <list>
 #include <string>
 
+#include "script.h"
 #include "base_object.h"
 #include "luaincl.h"
@@ -10 +11 @@
 
 
+//!< Contains the names of all objects in a world and a list of all script files that need the object.
+struct worldObject
+{
+  std::string name;
+  std::list<std::string> scriptFiles;
+};
 
 class ScriptManager //: public BaseObject
 {
  public:
-  ScriptManager();
+  ScriptManager(std::string world)
   virtual ~ScriptManager();
 
   virtual void loadParams(const TiXmlElement* root);
 
+  virtual void tick(float timestep);
+
+  void changeWorld(std::string newWorld);
+
+
+  void initScripts(); // initializes all scripts
 
  private:
-  void  init();
+   void  init(std::string world);
+
+   std::list<scriptableObject> objectList; //!< The list of all Objects in a world (read from the *.oxw file of the world)
+   std::string currentWorld;