Changeset 1959 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 19, 2008, 11:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged script_trigger branch into objecthierarchy branch.
Also merged changes in Script.cc and Script.h manually to LuaBind.cc and LuaBind.h.

Location:

code/branches/objecthierarchy

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/DistanceTrigger.cc (copied) (copied from code/branches/script_trigger/src/orxonox/objects/DistanceTrigger.cc) (1 prop)
• src/orxonox/objects/DistanceTrigger.h (copied) (copied from code/branches/script_trigger/src/orxonox/objects/DistanceTrigger.h) (1 prop)
• src/orxonox/objects/Script.cc (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Script.cc) (1 prop)
• src/orxonox/objects/Script.h (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Script.h) (1 prop)
• src/orxonox/objects/Trigger.cc (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Trigger.cc) (1 diff, 1 prop)
• src/orxonox/objects/Trigger.h (copied) (copied from code/branches/script_trigger/src/orxonox/objects/Trigger.h) (1 diff, 1 prop)

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -54 +54 @@
   objects/Tickable.cc
   objects/Test.cc
+  objects/Script.cc
+  objects/Trigger.cc
+  objects/DistanceTrigger.cc
 
   objects/infos/Info.cc
@@ -74 +77 @@
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
-        
+
+
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 

code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc

@@ -223 +223 @@
     XMLPortParamLoadOnly(Trigger, "stayOn", setStayOn, xmlelement, mode);
     XMLPortParamLoadOnly(Trigger, "activations", setActivations, xmlelement, mode);
+    XMLPortParamLoadOnly(Trigger, "invert", setInvert, xmlelement, mode);
     //XMLPortParamLoadOnlyTemplate(Trigger, "mode", setMode, xmlelement, mode, std::string);
 

code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

@@ -56 +56 @@
       inline bool isActive() { return bActive_; }
       void addTrigger(Trigger* trig);
+      void setInvert(int invert) { bInvertMode_ = invert; }
       const Trigger* getTrigger(unsigned int index) const;
       void setVisibility(bool bVisible);