Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 3, 2018, 3:16:09 PM (6 years ago)
Author:
adamc
Message:

Fixed killing and moving of entities & commit issue

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/AAAAutonomousDrone.cc

    r11928 r11932  
    121121        SUPER(AAAAutonomousDrone, tick, dt);
    122122
     123
    123124        this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxiliaryThrust_);
    124125        this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxiliaryThrust_);
     126
     127
    125128        if (this->localLinearAcceleration_.z() > 0)
    126129            this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxiliaryThrust_);
    127130        else
    128131            this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
     132
    129133        this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
    130134        this->localLinearAcceleration_.setValue(0, 0, 0);
Note: See TracChangeset for help on using the changeset viewer.