Changeset 12125

Timestamp:

Nov 28, 2018, 11:50:56 AM (6 years ago)

Author:

michbaum

Message:

Neuer Gegnercontroller und alle noetigen Aenderungen

Location:

code/branches/TowerDefense_HS18

Files:

• data/levels/towerDefense.oxw (modified) (5 diffs)
• src/modules/towerdefense/CMakeLists.txt (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (6 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (3 diffs)
• src/modules/towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)

code/branches/TowerDefense_HS18/data/levels/towerDefense.oxw

@@ -23 +23 @@
   <TowerDefenseSelecter>
     <camerapositions>
-      <CameraPosition position="0,0,1300" lookat="0,0,0" absolute=true drag=true mouselook=true/>
+      <CameraPosition position="0,0,1400" lookat="0,0,0" absolute=true drag=true mouselook=true/>
     </camerapositions>
   </TowerDefenseSelecter>
@@ -301 +301 @@
       <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
     </collisionShapes>
-    <controller>
-       <WaypointController accuracy = 50/>
-    </controller>
+    <!-- Hier wurde der Controller entfernt-->
   </TowerDefenseEnemy>
 </Template>
@@ -374 +372 @@
       <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
     </collisionShapes> 
-    <controller>
-       <WaypointController accuracy = 50/>
-    </controller>
   </TowerDefenseEnemy>
 </Template>
@@ -447 +442 @@
       <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
     </collisionShapes>
-    <controller>
-       <WaypointController accuracy = 50/>
-    </controller>
   </TowerDefenseEnemy>
 </Template>
@@ -501 +493 @@
             F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
             F1F1F1I2F1F1F1F1F1F1F1Y1Y1Y1F1F1
-            F1F1F1R2I3I3I3I3L3F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
-            X1I1I1I1R0F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1L1I1I1I1L2F1F1F1F1F1F1F1
+            F1F1F1R2I3I3I3I3I3I3I3L3F1F1F1F1
+            F1F1F1F1F1F1F1F1F1F1F1I2F1F1F1F1
+            F1F1F1F1F1F1F1F1F1F1F1I2F1F1F1F1
+            X1I1I1I1R0F1F1F1F1F1F1I2F1F1F1F1
+            F1F1F1F1I0F1F1F1F1F1F1I2F1F1F1F1
+            F1F1F1F1I0F1F1F1F1F1F1I2F1F1F1F1
+            F1F1F1F1L1I1I1I1I1I1I1L2F1F1F1F1
             F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
             F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1

code/branches/TowerDefense_HS18/src/modules/towerdefense/CMakeLists.txt

@@ -10 +10 @@
   TowerDefenseField.cc
   TDCoordinate.cc
+  TowerDefenseController.cc
 )
 

code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefense.cc

@@ -76 +76 @@
 #include "TowerDefenseCenterpoint.h"
 #include "worldentities/SpawnPoint.h"
-#include "controllers/WaypointController.h"
+#include "TowerDefenseController.h" //muss ich noch in den richtigen Ordner verschieben
 #include "graphics/Model.h"
 #include "infos/PlayerInfo.h"
@@ -175 +175 @@
         en1->setTeam(2);
 
-        WaypointController* controller = (WaypointController*)(en1->getXMLController());
-
-        if (controller != nullptr && waypoints_.size() > 1)
+        //Jedem Enemy wird ein eigener Controller uebergeben
+        TowerDefenseController* controller = new TowerDefenseController(this->center_->getContext()); 
+        controller->setControllableEntity(en1);
+        en1->setController(controller);
+
+        if (waypoints_.size() > 1)
         {
             en1->setPosition(waypoints_.at(0)->getPosition() + offset_);
@@ -192 +195 @@
         }
 
-        enemies_.push_back(en1);
+        auto pair = std::make_pair(orxonox::WeakPtr<TowerDefenseEnemy>(en1), controller);
+        enemies_.push_back(pair);
     }
 
@@ -291 +295 @@
             }            
         }
+                
         
-        for (std::list<WeakPtr<TowerDefenseEnemy>>::iterator it = enemies_.begin(); it != enemies_.end(); )
-        {
-            if (*it == nullptr)
-            {
-                // the enemy was destroyed by a tower - remove it from the list
-                enemies_.erase(it++);
+        for (EnemyList::iterator it = enemies_.begin(); it != enemies_.end(); )
+        {
+            WeakPtr<TowerDefenseEnemy> enemy = it->first;
+            TowerDefenseController* ctrl = it->second;
+
+            if (enemy == nullptr)
+            {
+
+                // the enemy was destroyed by a tower - remove it from the list AND destroy the corresponding controler
+                ctrl->destroy();
+                it = enemies_.erase(it);
                 addCredit(1);
             }
@@ -303 +313 @@
             {
                 //if ships are at the end they get destroyed
-                Vector3 ship = (*it)->getRVWorldPosition();
+                Vector3 ship = enemy->getRVWorldPosition();
                 float distance = ship.distance(endpoint_);
                 if(distance < 40)
                 {
-                    (*it)->destroy();
-                    enemies_.erase(it++);
+                    enemy->getController()->destroy();
+                    enemy->destroy();
+
+                    it = enemies_.erase(it);
                     this->reduceLifes(1);
                     if (this->getLifes() == 0)
@@ -412 +424 @@
         }
 
+        //Falls kein anliegender Weg gefunden wurde.
         delete nextCoord;
         return nullptr;

code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefense.h

@@ -32 +32 @@
 #include "TDCoordinate.h"
 #include "TowerDefenseSelecter.h"
+#include "TowerDefenseController.h"
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "gametypes/TeamDeathmatch.h"
@@ -40 +41 @@
 namespace orxonox
 {
+    using EnemyList = std::list<std::pair<orxonox::WeakPtr<TowerDefenseEnemy>, TowerDefenseController*>>;
+
     /**
     @brief
@@ -86 +89 @@
         int waveNumber_;
         int lifes_;
-        std::list<orxonox::WeakPtr<TowerDefenseEnemy>> enemies_;
+        EnemyList enemies_;
         TowerDefenseField* fields_[16][16];
         std::vector<orxonox::WeakPtr<TowerDefenseField>> waypoints_;

code/branches/TowerDefense_HS18/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -29 +29 @@
     TowerDefenseEnemy::~TowerDefenseEnemy()
     {
-
     }