Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11559


Ignore:
Timestamp:
Nov 13, 2017, 4:16:35 PM (6 years ago)
Author:
jostoffe
Message:

Pfeil wird angezeigt und fliegt mit dem Raumschiff mit, aber er ist noch nicht an der richtigen Position. Dazu muss ich noch die richtige Formel finden anhand der momentanen Ausrichtung des Raumschiffes

Location:
code/branches/Waypoints_HS17
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw

    r11539 r11559  
    5151
    5252   
    53     <SpawnPoint position="50,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     53    <SpawnPoint position="50,0,0" direction="0,1,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    5454
    5555
     
    6060       <Model scale="10" mesh="arrow.mesh"/>
    6161      </attached>
    62       <controllers>
    63         <ArrowController>
    64         </ArrowController>
    65       </controllers>
    6662    </Arrow>
    6763
    68 
     64<ArrowController>
     65        </ArrowController>
    6966
    7067  </Scene>
  • code/branches/Waypoints_HS17/src/modules/questsystem/Quest.cc

    r11539 r11559  
    8080        XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode);
    8181        XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
    82         XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
     82        //XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
    8383
    8484        QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager.
     
    8686
    8787
    88     bool Quest::addArrowTarget(Quest* quest){
     88    /*bool Quest::addArrowTarget(Quest* quest){
    8989
    9090        assert(quest);
    9191
    9292
    93     }
     93    }*/
    9494
    9595
  • code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc

    r11539 r11559  
    4949        RegisterObject(Arrow);
    5050
    51         this->myController_ = NULL;
     51        //this->myController_ = NULL;
    5252
    5353        this->localLinearAcceleration_.setValue(0, 0, 0);
     
    6969    {
    7070        // Deletes the controller if the object was initialized and the pointer to the controller is not NULL.
    71         if( this->isInitialized() && this->myController_ != NULL )
    72             delete this->myController_;
     71       // if( this->isInitialized() && this->myController_ != NULL )
     72            //delete this->myController_;
    7373    }
    7474
     
    184184    }
    185185
     186
    186187}
  • code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h

    r11539 r11559  
    3333
    3434#include "core/XMLPort.h"
    35 #include "controllers/ArrowController.h"
     35//#include "controllers/ArrowController.h"
    3636
    3737#include "ControllableEntity.h"
     38#include "WorldEntity.h"
    3839
    3940namespace orxonox {
     
    132133
    133134        private:
    134             ArrowController *myController_; //!< The controller of the Arrow.
     135            //ArrowController *myController_; //!< The controller of the Arrow.
    135136
    136137            btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Arrow the next tick.
Note: See TracChangeset for help on using the changeset viewer.