Changeset 11559 for code/branches/Waypoints_HS17

Timestamp:

Nov 13, 2017, 4:16:35 PM (7 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:

• data/levels/emptyLevel.oxw (modified) (2 diffs)
• src/modules/questsystem/Quest.cc (modified) (2 diffs)
• src/orxonox/worldentities/Arrow.cc (modified) (3 diffs)
• src/orxonox/worldentities/Arrow.h (modified) (2 diffs)

code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw

@@ -51 +51 @@
 
     
-    <SpawnPoint position="50,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint position="50,0,0" direction="0,1,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
 
@@ -60 +60 @@
        <Model scale="10" mesh="arrow.mesh"/>
       </attached>
-      <controllers>
-        <ArrowController>
-        </ArrowController>
-      </controllers>
     </Arrow>
 
-
+<ArrowController>
+        </ArrowController>
 
   </Scene>

code/branches/Waypoints_HS17/src/modules/questsystem/Quest.cc

@@ -80 +80 @@
         XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode);
         XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
-        XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
+        //XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
 
         QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager.
@@ -86 +86 @@
 
 
-    bool Quest::addArrowTarget(Quest* quest){
+    /*bool Quest::addArrowTarget(Quest* quest){
 
         assert(quest);
 
 
-    }
+    }*/
 
 

code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc

@@ -49 +49 @@
         RegisterObject(Arrow);
 
-        this->myController_ = NULL;
+        //this->myController_ = NULL;
 
         this->localLinearAcceleration_.setValue(0, 0, 0);
@@ -69 +69 @@
     {
         // Deletes the controller if the object was initialized and the pointer to the controller is not NULL.
-        if( this->isInitialized() && this->myController_ != NULL )
-            delete this->myController_;
+       // if( this->isInitialized() && this->myController_ != NULL )
+            //delete this->myController_;
     }
 
@@ -184 +184 @@
     }
 
+
 }

code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h

@@ -33 +33 @@
 
 #include "core/XMLPort.h"
-#include "controllers/ArrowController.h"
+//#include "controllers/ArrowController.h"
 
 #include "ControllableEntity.h"
+#include "WorldEntity.h"
 
 namespace orxonox {
@@ -132 +133 @@
 
         private:
-            ArrowController *myController_; //!< The controller of the Arrow.
+            //ArrowController *myController_; //!< The controller of the Arrow.
 
             btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Arrow the next tick.