Changeset 8289 in orxonox.OLD

Timestamp:

Jun 8, 2006, 7:43:10 PM (18 years ago)

Author:

snellen

Message:

added some debug output, script gets called

Location:

branches/script_engine/src

Files:

• lib/script_engine/script.cc (modified) (6 diffs)
• lib/script_engine/script_class.h (modified) (1 diff)
• lib/script_engine/script_manager.cc (modified) (3 diffs)
• story_entities/game_world.cc (modified) (5 diffs)
• util/state.h (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (7 diffs)

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

@@ -23 +23 @@
   luaopen_math(luaState);
   luaopen_debug(luaState);
-
   if (root != NULL)
     this->loadParams(root);
@@ -77 +76 @@
      else
      {
-      reportError(error);
-     }
-
-   }
-   else
-   {
+       printf("ERROR while loading file %s: ",filename.c_str());
+       reportError(error);
+     }
+
+   }
+   else
+   {
+     printf("ERROR while loading file %s: ",filename.c_str());
      reportError(error);
    }
@@ -92 +93 @@
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
+   printf("Script: I am about to add %s of class %s\n",objectName.c_str(),className.c_str());
+   
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
    WorldObject tmpObj;
@@ -162 +165 @@
     if(error != 0)
     {
+     printf("ERROR while executing function %s: \n",currentFunction.c_str());
      reportError(error);
+     //clean up
+     currentFunction.assign(""); 
+     argumentCount = returnCount = 0;
      return false;
     }
@@ -174 +181 @@
    else
      printf("Error: no function selected.\n");
+   
+   return false;
  }
 
@@ -296 +305 @@
   fprintf(stderr, "ERROR: %s\n", msg);
   lua_pop(luaState, 1);
+ }
   return error;
  }
- }
 
 

branches/script_engine/src/lib/script_engine/script_class.h

@@ -61 +61 @@
     virtual int insertObject(Script* L, BaseObject* obj, bool gc=false)
     {
-      Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
+      return Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
     }
 

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

@@ -1 +1 @@
 #include <string>
 #include <list>
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
 
 
@@ -19 +21 @@
 {
   this->setName("ScriptManager");
-  printf("ScriptManager created\n");
   this->scripts = NULL;
   this->triggers = NULL;
@@ -74 +75 @@
   LOAD_PARAM_START_CYCLE(triggers, object);
   {
-    new ScriptTrigger(object);PRINTF(0)("test output from createtriggers\n");
+    new ScriptTrigger(object);
   }
   LOAD_PARAM_END_CYCLE(object);

branches/script_engine/src/story_entities/game_world.cc

@@ -137 +137 @@
   PhysicsEngine::getInstance();
   CREngine::getInstance();
+  
+  State::setScriptManager(&this->scriptManager);
+
 }
 
@@ -146 +149 @@
 ErrorMessage GameWorld::loadData()
 {
-  this->displayLoadScreen();
+  this->displayLoadScreen();  State::setScriptManager(&this->scriptManager);
+
 
   PRINTF(0)("Loading the GameWorld\n");
@@ -189 +193 @@
   Account *b = new Account(30);
   b->setName("b");
-  
+  printf("ScriptManager created by game world\n");
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
 
@@ -229 +233 @@
   this->bRunning = true;
 
-  State::setScripManager(&this->scriptManager);
-
   this->run();
 }
@@ -241 +243 @@
 {
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
-  State::setScripManager(NULL);
+  State::setScriptManager(NULL);
   this->bRunning = false;
 }

branches/script_engine/src/util/state.h

@@ -96 +96 @@
 
   ////////////////////
-  /// SCRIP_ENGINE ///
+  /// SCRIPT_ENGINE ///
   ////////////////////
-  static void setScripManager(ScriptManager* scriptManager) { State::scriptManager = scriptManager; };
+  static void setScriptManager(ScriptManager* scriptManager) { State::scriptManager = scriptManager; };
   static ScriptManager* getScriptManager() { return State::scriptManager; };
 

branches/script_engine/src/world_entities/script_trigger.cc

@@ -18 +18 @@
   loadParams(root);
 
-  printf("scripttrigger generated\n");
 }
 
@@ -95 +94 @@
   if( this->distance(target) < radius)
  {
-   printf("SCRIPTTRIGGER: condition met\n");
   if(!callOnce)
    {
@@ -102 +100 @@
   else if(callOnce && !scriptCalled)
   {
-    printf("action should be executed\n");
    executeAction();
    scriptCalled = true;
   }
  }
- else
-   printf("SCRIPTTRIGGER: target out of range\n");
+ //else
+   //printf("SCRIPTTRIGGER: target out of range\n");
 
 }
@@ -118 +115 @@
      {
        testScriptingFramework();
-     if(!(script->selectFunction(this->functionName,0)) )
+     /*if(!(script->selectFunction(this->functionName,0)) )
        printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      if( !(script->executeFunction()) )
-       printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
+       printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());*/
      }
 }
@@ -128 +125 @@
 void ScriptTrigger::setScript(const std::string& file)
 {
+ 
   ScriptManager* scriptManager = State::getScriptManager();
   if (scriptManager != NULL)
   {
+    
     script = scriptManager->getScriptByFile(file);
     if(script != NULL)
+    {
       scriptIsOk = true;
+    }
   }
 }
@@ -173 +174 @@
 
    script->pushParam(3.14159,main);
+   printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
    script->executeFunction();
 
@@ -187 +189 @@
    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");