Changeset 10638 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Apr 19, 2007, 4:06:51 PM (17 years ago)

Author:

snellen

Message:

Merged inputdevice-branch back to trunk: New ScriptTrigger (ActionTrigger) available

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• script_triggers/action_trigger.cc (copied) (copied from branches/inputdevice/src/world_entities/script_triggers/action_trigger.cc)
• script_triggers/action_trigger.h (copied) (copied from branches/inputdevice/src/world_entities/script_triggers/action_trigger.h)
• script_triggers/script_trigger.cc (modified) (3 diffs)
• script_triggers/script_trigger.h (modified) (1 diff)
• script_triggers/space_trigger.cc (modified) (3 diffs)
• script_triggers/tick_trigger.cc (modified) (1 diff)
• script_triggers/time_trigger.cc (modified) (1 diff)

trunk/src/world_entities/WorldEntities.am

@@ -111 +111 @@
                 world_entities/script_triggers/tick_trigger.cc \
                 world_entities/script_triggers/time_trigger.cc \
+                world_entities/script_triggers/action_trigger.cc \
                 \
                 \
@@ -234 +235 @@
                 script_triggers/tick_trigger.h \
                 script_triggers/time_trigger.h \
+                script_triggers/action_trigger.h \
                 \
                 \

trunk/src/world_entities/script_triggers/script_trigger.cc

@@ -104 +104 @@
 
 
-void ScriptTrigger::executeAction(float timestep)
+void ScriptTrigger::executeScriptFunction(float timestep)
 {
   if(executionStopped && scriptIsOk) // If the script has been loaded correctly but something is wrong with the settings of the trigger
@@ -114 +114 @@
   if(scriptIsOk)
   {
-       //testScriptingFramework();
     if(!(script->selectFunction(this->functionName,returnCount)) )
      {
@@ -166 +165 @@
   }
 }
-
-/*
- void ScriptTrigger::testScriptingFramework()
-{
-   std::string file("lunartest2.lua");
-   //get script
-   Script* script = State::getScriptManager()->getScriptByFile(file);
-   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))
-     printf("function %s selected\n",main.c_str());
-
-   script->pushParam(3.14159,main);
-   printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
-   script->executeFunction();
-
-   int ret = script->getReturnedInt();
-   printf("main returned %i\n",ret);
-
-   if(script->getReturnedBool())
-     printf("main returned true\n");
-   else
-     printf("main returned false\n");
-
-   float retf = script->getReturnedFloat();
-   printf("main returned %f\n",retf);
-
-
-   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))
-     printf("function %s selected\n",test.c_str());
-
-   script->executeFunction();
-
-
-      //if(argc>1) lua_dofile(script.getLuaState(), argv[1]);
-   printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));
-
-}*/

trunk/src/world_entities/script_triggers/script_trigger.h

@@ -27 +27 @@
 
     /// DO WORK
-    virtual void tick(float timestep) = 0;
-    virtual void executeAction(float timestep);
-    void testScriptingFramework();
+    virtual void tick(float timestep){}
+    virtual void executeScriptFunction(float timestep);
 
     /// SET MEMBER

trunk/src/world_entities/script_triggers/space_trigger.cc

@@ -128 +128 @@
   if(triggerRemains && scriptCalled )
   {
-    executeAction(timestep);
+    executeScriptFunction(timestep);
     return;
   }
@@ -136 +136 @@
     if( !invert && this->distance(target) < radius)
     {
-    //printf("Distance is %f \n", this->distance(target));
-      executeAction(timestep);
+      executeScriptFunction(timestep);
       scriptCalled = true;
       return;
@@ -144 +143 @@
     else if( invert && this->distance(target) > radius)
     {
-      executeAction(timestep);
+      executeScriptFunction(timestep);
       scriptCalled = true;
       return;

trunk/src/world_entities/script_triggers/tick_trigger.cc

@@ -72 +72 @@
   if( scriptFinished ) return;
 
-  this->executeAction(timestep);
+  this->executeScriptFunction(timestep);
       
 }

trunk/src/world_entities/script_triggers/time_trigger.cc

@@ -102 +102 @@
     if(currentTime < 0)
     {
-      this->executeAction(timestep);
+      this->executeScriptFunction(timestep);
       this->stop();
     }