Changeset 10634 in orxonox.OLD

Timestamp:

Apr 19, 2007, 11:45:56 AM (17 years ago)

Author:

snellen

Message:

Got nothing to do during the MTU lecture… so I finished the ActionTrigger

Location:

branches/inputdevice/src

Files:

• lib/script_engine/script.cc (modified) (1 diff)
• world_entities/player.cc (modified) (3 diffs)
• world_entities/script_triggers/action_trigger.cc (modified) (5 diffs)
• world_entities/script_triggers/action_trigger.h (modified) (2 diffs)
• world_entities/script_triggers/script_trigger.h (modified) (1 diff)

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

@@ -409 +409 @@
     this->registerClass("TickTrigger");
     this->registerClass("TimeTrigger");
+    this->registerClass("ActionTrigger");
+
 
    return success;

branches/inputdevice/src/world_entities/player.cc

@@ -17 +17 @@
 #include "playable.h"
 #include "space_ships/space_ship.h"
-#include "script_triggers/action_trigger.h"
 
 #include "event_handler.h"
@@ -41 +40 @@
 
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_CHANGE_SHIP);
-  this->subscribeEvent(ES_GAME, KeyMapper::PEV_ACTION);
 }
 
@@ -134 +132 @@
     this->enterNewPlayable();
   }
-  else if(event.type == KeyMapper::PEV_ACTION && event.bPressed)
-  {
-   for (ObjectList<ActionTrigger>::const_iterator it = ActionTrigger::objectList().begin();
-       it != ActionTrigger::objectList().end();
-       ++it)
-      (*it)->executeAction();
-  }
 
   if (likely(this->playable != NULL))

branches/inputdevice/src/world_entities/script_triggers/action_trigger.cc

@@ -17 +17 @@
 #include "action_trigger.h"
 #include "debug.h"
+#include "event_handler.h"
 
 ObjectListDefinition(ActionTrigger);
@@ -48 +49 @@
 {
   this->registerObject(this, ActionTrigger::_objectList);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_ACTION);
 
   radius = 10;
@@ -117 +119 @@
 }
 
+void ActionTrigger::process( const Event &event)
+{
+ if (event.type == KeyMapper::PEV_ACTION && event.bPressed)
+  actionScheduled = true;
+}
 
 void ActionTrigger::tick( float timestep )
@@ -128 +135 @@
       executeScriptFunction(timestep);
       scriptCalled = true;
-      return;
     }
     else if( invert && this->distance(target) > radius  && actionScheduled)
@@ -134 +140 @@
       executeScriptFunction(timestep);
       scriptCalled = true;
-      return;
     }
   }

branches/inputdevice/src/world_entities/script_triggers/action_trigger.h

@@ -12 +12 @@
 #include "script_class.h"
 #include "script_trigger.h"
+#include "event_listener.h"
 
-class ActionTrigger : public ScriptTrigger
+class ActionTrigger : public ScriptTrigger, public EventListener
 {
   ObjectListDeclaration(ActionTrigger);
@@ -26 +27 @@
 
     /// DO WORK
-    virtual void executeAction(){actionScheduled = true;}
+    virtual void process( const Event &event);
     virtual void tick(float timestep);
 

branches/inputdevice/src/world_entities/script_triggers/script_trigger.h

@@ -29 +29 @@
     virtual void tick(float timestep){}
     virtual void executeScriptFunction(float timestep);
-    void testScriptingFramework();
 
     /// SET MEMBER