Changeset 1961 for code/branches/objecthierarchy/src/orxonox
- Timestamp:
- Oct 20, 2008, 12:04:03 AM (16 years ago)
- Location:
- code/branches/objecthierarchy/src/orxonox/objects
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.cc
r1959 r1961 71 71 void DistanceTrigger::addTargets(std::string targets) 72 72 { 73 Identifier* targetId = ID(targets);73 Identifier* targetId = ClassByString(targets); 74 74 targetMask_.include(targetId); 75 75 // trigger shouldn't react on itself or other triggers … … 80 80 void DistanceTrigger::removeTargets(std::string targets) 81 81 { 82 Identifier* targetId = ID(targets);82 Identifier* targetId = ClassByString(targets); 83 83 targetMask_.exclude(targetId); 84 84 } -
code/branches/objecthierarchy/src/orxonox/objects/Script.cc
r1959 r1961 30 30 #include "Script.h" 31 31 32 #include "util/Debug.h" 32 33 #include "core/CoreIncludes.h" 33 34 #include "core/XMLPort.h" 34 35 #include "core/LuaBind.h" 35 #include "core/Debug.h"36 36 37 37 namespace orxonox -
code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc
r1959 r1961 31 31 32 32 #include <OgreBillboard.h> 33 #include " core/Debug.h"33 #include "util/Debug.h" 34 34 #include "core/CoreIncludes.h" 35 35 #include "core/ConsoleCommand.h" … … 39 39 { 40 40 41 ConsoleCommand(Trigger, setVisibility, AccessLevel::Debug, false).setDefaultValues(0);41 SetConsoleCommand(Trigger, setVisibility, false).accessLevel(AccessLevel::User).defaultValues(0); 42 42 43 43 CreateFactory(Trigger); … … 74 74 { 75 75 if(bVisible) 76 this->setScale(2 ,2,2);76 this->setScale(2); 77 77 else 78 this->setScale(0 ,0,0);78 this->setScale(0); 79 79 } 80 80 … … 84 84 return NULL; 85 85 86 std::set<Trigger*>:: iterator it;86 std::set<Trigger*>::const_iterator it; 87 87 it = children_.begin(); 88 88 … … 226 226 //XMLPortParamLoadOnlyTemplate(Trigger, "mode", setMode, xmlelement, mode, std::string); 227 227 228 XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode, false, true); 228 // what are those last two parameters? 229 //XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode, false, true); 230 XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode); 229 231 230 232 this->init(); -
code/branches/objecthierarchy/src/orxonox/objects/Trigger.h
r1959 r1961 35 35 #include "OrxonoxPrereqs.h" 36 36 37 #include " WorldEntity.h"37 #include "worldentities/PositionableEntity.h" 38 38 39 39 #include "../tools/BillboardSet.h" … … 48 48 }; 49 49 50 class _OrxonoxExport Trigger : public WorldEntity50 class _OrxonoxExport Trigger : public PositionableEntity 51 51 { 52 52 public:
Note: See TracChangeset
for help on using the changeset viewer.