Changeset 12149 for code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc

Timestamp:

Dec 5, 2018, 11:43:36 AM (5 years ago)

Author:

thomkell

Message:

final

File:

• code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc (modified) (5 diffs)

code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc

@@ -38 +38 @@
 #include "core/XMLPort.h"
 #include "TixyTaxyTorxy.h"
+#include <iostream>
+
+using namespace std;
 
 namespace orxonox
@@ -85 +88 @@
         center_ = center;
     }
-
     // void TixyTaxyTorxyField::upgrade()
     // {
@@ -184 +186 @@
     }
 
+
     int TixyTaxyTorxyField::getAngle()
     {
@@ -256 +259 @@
     void TixyTaxyTorxyField::createTower(int upgrade)
     {        
-        counter++;
+        
         if (tower_ == nullptr)
         {
+            counter++;
             if(counter%2==0){
             modelGround_->setMeshSource("TD_T1.mesh");
             tower_ = new TixyTaxyTorxyTower(center_->getContext());
             attach(tower_);
+            type_ = TixyTaxyTorxyFieldType::TOWER1;
 
             }else{
@@ -268 +273 @@
             tower_ = new TixyTaxyTorxyTower(center_->getContext());
             attach(tower_);
-        }
-
-
-            // type_ = TixyTaxyTorxyFieldType::TOWER;
-            // setUpgrade(upgrade);
-            // if (upgrade_ > 0 && modelObject_ != nullptr)
-            // {
-            //     modelObject_->setMeshSource("TD_T2.mesh");                    
-            //     tower_->addTemplate(center_->getTower1Template());
-            //     switch (counter%2 +1)
-            //     {
-            //         case 1:
-            //             modelObject_->setMeshSource("TD_T1.mesh");                    
-            //             tower_->addTemplate(center_->getTower1Template());
-            //             break;
-            //         case 2:
-            //             modelObject_->setMeshSource("TD_T2.mesh");
-            //             tower_->addTemplate(center_->getTower2Template());
-            //             break;
-            //         case 3:
-            //             modelObject_->setMeshSource("TD_T3.mesh");
-            //             tower_->addTemplate(center_->getTower3Template());
-            //             break;
-            //         case 4:
-            //             modelObject_->setMeshSource("TD_T4.mesh");
-            //             tower_->addTemplate(center_->getTower4Template());
-            //             break;
-            //         case 5:
-            //             modelObject_->setMeshSource("TD_T5.mesh");
-            //             tower_->addTemplate(center_->getTower5Template());
-            //             break;
-            //     }
-            // }
+            type_ = TixyTaxyTorxyFieldType::TOWER2;  
+        }
+
         }                           
     }