Context Navigation

Changeset 10611 in orxonox.OLD

Timestamp:

Mar 29, 2007, 9:16:43 PM (18 years ago)

Author:

snellen

Message:

Triggers can now be creater from the xml file… again

Location:

branches/scriptimprovements/src

Files:

-                      r10584
+                      r10611
    //this->registerClass(std::string("Vector"));
+    this->registerClass("ScriptTrigger");
+    this->registerClass("SpaceTrigger");
+    this->registerClass("TickTrigger");
   //  this->registerClass("AttractorMine");

r10606	r10611
28	28	#include "luaincl.h"
29	29	#include "loading/load_param_xml.h"
	30	#include "util/loading/factory.h"
30	31
31	32
…	…
85	86	void ScriptManager::createTriggers(const TiXmlElement* triggers)
86	87	{
	88
87	89	LOAD_PARAM_START_CYCLE(triggers, object);
88	90	{
89		new ScriptTrigger(object);
	91	Factory::fabricate(object);
	92	// new ScriptTrigger(object);
90	93	}
91	94	LOAD_PARAM_END_CYCLE(object);

-                      r10609
+                      r10611
     /// DO WORK
     virtual void tick(float timestep);
+    virtual void tick(float timestep){}
     virtual void executeAction(float timestep);
     void testScriptingFramework();
 …
     //for internal use
     bool         executionStopped;   // true when something goes wrong and the trigger has to be stopped
+    bool         executionStopped;   // true when something goes wrong and the trigger had to be stopped
     int          returnCount;        //TODO: set return count correctly

r10610	r10611
19	19
20	20	ObjectListDefinition(SpaceTrigger);
	21	CREATE_FACTORY(SpaceTrigger);
21	22
22	23	CREATE_SCRIPTABLE_CLASS(SpaceTrigger,

r10610	r10611
19	19
20	20	ObjectListDefinition(TickTrigger);
	21	CREATE_FACTORY(TickTrigger);
21	22
22	23	CREATE_SCRIPTABLE_CLASS(TickTrigger,

Note: See TracChangeset for help on using the changeset viewer.