Changeset 8231 in orxonox.OLD

Timestamp:

Jun 8, 2006, 12:21:21 PM (18 years ago)

Author:

snellen

Message:

Prepared tests

Location:

branches/script_engine/src

Files:

• defs/class_id.h (modified) (2 diffs)
• lib/script_engine/example.cc (modified) (2 diffs)
• lib/script_engine/script.cc (modified) (10 diffs)

branches/script_engine/src/defs/class_id.h

@@ -217 +217 @@
   // Testing Entities
   CL_TEST_ENTITY                =    0x00000409,
+  CL_ACCOUNT                    =    0x00000410,
+  CL_TEST_OBJECT                =    0x00000411,
 
   // misc
@@ -236 +238 @@
   CL_AMMO_CONTAINER             =    0x00000604,
   CL_HUD                        =    0x00000620,
-  
-  
+
+
   CL_SCRIPT_MANAGER             =    0x00000650,
   CL_SCRIPT                     =    0x00000651,

branches/script_engine/src/lib/script_engine/example.cc

@@ -6 +6 @@
 #include "script.h"
 
+// create classdummys for the scripts
+CREATE_SCRIPTABLE_CLASS(Account, CL_ACCOUNT)
+CREATE_SCRIPTABLE_CLASS(Object, CL_TEST_OBJECT)
 
     class Account : public BaseObject {
@@ -81 +84 @@
     int main(int argc, char *argv[])
     {
-      Script script;
-      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      std::string file("lunartest2.lua");
+     // Script script;
+      Script* script = ScriptManager::getInstance()->getScriptByFile(file);
+      printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
 
       // Register classes with the script
-      Lunar<Account>::Register(&script);
-      Lunar<Object>::Register(&script);
+      // Lunar<Account>::Register(&script);
+      //Lunar<Object>::Register(&script);
 
-      Object* obj= new Object();
-      Account a;
-      Account *b = new Account(30);
+      //Object* obj= new Object();
+      //Account a;
+      //Account *b = new Account(30);
 
       // Add instances to the script
-      Lunar<Object>::insertObject(&script,obj,"Obj",true);
-      Lunar<Account>::insertObject(&script,&a,"a",false);
-      Lunar<Account>::insertObject(&script,b,"b",true);
-       printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      //Lunar<Object>::insertObject(&script,obj,"Obj",true);
+      //Lunar<Account>::insertObject(&script,&a,"a",false);
+      //Lunar<Account>::insertObject(&script,b,"b",true);
+       //printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
 
       //Load a file
-      std::string file(argv[1]);
+      //std::string file("lunartest2.lua");
 
-      if(script.loadFile(file))
-        printf("File %s succefully loaded\n", file.c_str());
-      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      //if(script.loadFile(file))
+        //printf("File %s succefully loaded\n", file.c_str());
+      //printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
 
       //execute a function
       printf("----------- main -----------\n");
       std::string main("main");
-      if( script.selectFunction(main,3))
+      if( script->selectFunction(main,3))
        printf("function %s selected\n",main.c_str());
 
-      script.pushParam(3.14159,main);
-      script.executeFunction();
+      script->pushParam(3.14159,main);
+      script->executeFunction();
 
-      float retf = script.getReturnedFloat();
+      float retf = script->getReturnedFloat();
       printf("main returned %f\n",retf);
 
 
-      if(script.getReturnedBool())
+      if(script->getReturnedBool())
        printf("main returned true\n");
       else
        printf("main returned false\n");
 
-      int ret = script.getReturnedInt();
+      int ret = script->getReturnedInt();
       printf("main returned %i\n",ret);
 
-      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      //printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
       //execute a 2nd function
       printf("----------- test -----------\n");
       std::string test("test");
-      if( script.selectFunction(test,0))
+      if( script->selectFunction(test,0))
        printf("function %s selected\n",test.c_str());
 
-      script.executeFunction();
+      script->executeFunction();
 
 
       //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);
-      printf("-------------------------- top of the stack:%i\n",lua_gettop(script.getLuaState()));
+      printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
 
       return 0;

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

@@ -12 +12 @@
 {
   this->setClassID(CL_SCRIPT, "Script");
-  
+
   returnCount = argumentCount = 0;
 
@@ -23 +23 @@
   luaopen_math(luaState);
   luaopen_debug(luaState);
-  
+
   if (root != NULL)
     this->loadParams(root);
@@ -39 +39 @@
 {
   BaseObject::loadParams(root);
-  
+
   LOAD_PARAM_START_CYCLE(root, object);
   {
@@ -89 +89 @@
  }
 
- 
+
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
@@ -96 +96 @@
    if (scriptClass != NULL)
    {
+     tmpObj.type = className;
      if( !classIsRegistered(className) )
      {
      static_cast<ScriptClass*>(scriptClass)->registerClass(this);
-     tmpObj.type = className;
-     }
-     
+     }
+
      BaseObject* object = ClassList::getObject(objectName, className);
      if (object != NULL && !objectIsAdded(objectName))
@@ -112 +112 @@
  }
 
- 
- 
- 
+
+
+
  bool Script::executeFile()
  {
-   if(currentFile.length() != 0)
+   printf("WARNING: script.executeFile is not implemented yet");
+   /*if(currentFile.length() != 0)
    {
     int error = lua_pcall(luaState, 0, 0, 0);
@@ -127 +128 @@
        return false;
       }
-   }
+ }*/
    return false;
  }
@@ -299 +300 @@
  }
 
- 
+
  bool Script::classIsRegistered(const std::string& type)
  {
@@ -311 +312 @@
    return false;
  }
- 
- 
- 
+
+
+
  bool Script::objectIsAdded(const std::string& name)
  {
@@ -324 +325 @@
    }
    return false;
- 
- 
- }
+
+
+ }