Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 20, 2008, 12:04:03 AM (16 years ago)
Author:
rgrieder
Message:

updated msvc files and adjusted merged files.

Location:
code/branches/objecthierarchy/src/orxonox/objects
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.cc

    r1959 r1961  
    7171  void DistanceTrigger::addTargets(std::string targets)
    7272  {
    73     Identifier* targetId = ID(targets);
     73    Identifier* targetId = ClassByString(targets);
    7474    targetMask_.include(targetId);
    7575    // trigger shouldn't react on itself or other triggers
     
    8080  void DistanceTrigger::removeTargets(std::string targets)
    8181  {
    82     Identifier* targetId = ID(targets);
     82    Identifier* targetId = ClassByString(targets);
    8383    targetMask_.exclude(targetId);
    8484  }
  • code/branches/objecthierarchy/src/orxonox/objects/Script.cc

    r1959 r1961  
    3030#include "Script.h"
    3131
     32#include "util/Debug.h"
    3233#include "core/CoreIncludes.h"
    3334#include "core/XMLPort.h"
    3435#include "core/LuaBind.h"
    35 #include "core/Debug.h"
    3636
    3737namespace orxonox
  • code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc

    r1959 r1961  
    3131
    3232#include <OgreBillboard.h>
    33 #include "core/Debug.h"
     33#include "util/Debug.h"
    3434#include "core/CoreIncludes.h"
    3535#include "core/ConsoleCommand.h"
     
    3939{
    4040
    41   ConsoleCommand(Trigger, setVisibility, AccessLevel::Debug, false).setDefaultValues(0);
     41  SetConsoleCommand(Trigger, setVisibility, false).accessLevel(AccessLevel::User).defaultValues(0);
    4242
    4343  CreateFactory(Trigger);
     
    7474  {
    7575    if(bVisible)
    76       this->setScale(2,2,2);
     76      this->setScale(2);
    7777    else
    78       this->setScale(0,0,0);
     78      this->setScale(0);
    7979  }
    8080
     
    8484      return NULL;
    8585
    86     std::set<Trigger*>::iterator it;
     86    std::set<Trigger*>::const_iterator it;
    8787    it = children_.begin();
    8888
     
    226226    //XMLPortParamLoadOnlyTemplate(Trigger, "mode", setMode, xmlelement, mode, std::string);
    227227
    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);
    229231
    230232    this->init();
  • code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

    r1959 r1961  
    3535#include "OrxonoxPrereqs.h"
    3636
    37 #include "WorldEntity.h"
     37#include "worldentities/PositionableEntity.h"
    3838
    3939#include "../tools/BillboardSet.h"
     
    4848  };
    4949
    50   class _OrxonoxExport Trigger : public WorldEntity
     50  class _OrxonoxExport Trigger : public PositionableEntity
    5151  {
    5252    public:
Note: See TracChangeset for help on using the changeset viewer.