Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10605


Ignore:
Timestamp:
Sep 27, 2015, 10:39:57 PM (5 years ago)
Author:
landauf
Message:

added changes from presentationFS15 branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc

    r10600 r10605  
    235235              switch ((int) currentEvent.d) {
    236236                case 3:
    237                   a = new Vector3(this->currentEvent.v1.x + 3000*cos(2*M_PI*dl),
    238                                   this->currentEvent.v1.y + 3000*sin(2*M_PI*dl),
     237                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*cos(2*M_PI*dl),
     238                                  this->currentEvent.v1.y + this->currentEvent.e*sin(2*M_PI*dl),
    239239                                  this->currentEvent.v1.z);
    240240                break;
    241241                case 2:
    242                   a = new Vector3(this->currentEvent.v1.x + 3000*cos(2*M_PI*dl),
     242                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*sin(2*M_PI*dl),
    243243                                  this->currentEvent.v1.y,
    244                                   this->currentEvent.v1.z + 3000*cos(2*M_PI*dl));
     244                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*M_PI*dl));
    245245                break;
    246246                case 1:
    247247                  a = new Vector3(this->currentEvent.v1.x,
    248                                   this->currentEvent.v1.y + 3000*sin(2*M_PI*dl),
    249                                   this->currentEvent.v1.z + 3000*cos(2*M_PI*dl));
     248                                  this->currentEvent.v1.y + this->currentEvent.e*sin(2*M_PI*dl),
     249                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*M_PI*dl));
    250250                break;
    251251              }
Note: See TracChangeset for help on using the changeset viewer.