- Timestamp:
- Feb 14, 2009, 10:17:35 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc
- Property svn:mergeinfo changed
r2261 r2662 31 31 32 32 #include <OgreBillboard.h> 33 #include <OgreBillboardSet.h> 33 34 #include "util/Debug.h" 34 35 #include "core/CoreIncludes.h" 35 36 #include "core/ConsoleCommand.h" 36 37 #include "core/XMLPort.h" 38 #include "core/Core.h" 37 39 #include "objects/Scene.h" 38 40 … … 44 46 CreateFactory(Trigger); 45 47 46 Trigger::Trigger(BaseObject* creator) : PositionableEntity(creator)48 Trigger::Trigger(BaseObject* creator) : StaticEntity(creator) 47 49 { 48 50 RegisterObject(Trigger); … … 65 67 // this->bUpdating_ = false; 66 68 67 if (this->getScene() && this->getScene()->getSceneManager())69 if (this->getScene() && Core::showsGraphics()) 68 70 { 69 71 this->debugBillboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 0.0, 0.0), 1); … … 71 73 72 74 if (this->debugBillboard_.getBillboardSet()) 73 this->getNode()->attachObject(this->debugBillboard_.getBillboardSet());75 this->attachOgreObject(this->debugBillboard_.getBillboardSet()); 74 76 } 75 77 … … 106 108 if (!this->BaseObject::isActive()) 107 109 return; 110 111 SUPER(Trigger, tick, dt); 108 112 109 113 bool newTriggered = this->isTriggered() ^ this->bInvertMode_;
Note: See TracChangeset
for help on using the changeset viewer.