Changeset 12165 for code/branches

Timestamp:

Dec 7, 2018, 10:18:21 AM (6 years ago)

Author:

zdenis

Message:

Swiggidy swooty im comitting for that booty

Location:

code/branches/TowerDefense_HS18

Files:

• data/levels/towerDefense.oxw (modified) (1 diff)
• src/modules/towerdefense/CMakeLists.txt (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (6 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseField.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefensePrereqs.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseRangeViewer.cc (added)
• src/modules/towerdefense/TowerDefenseRangeViewer.h (added)

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

@@ -662 +662 @@
   </TowerDefenseEnemy>
 </Template>
+
+<Template name=therangeviewer>
+  <TowerDefenseRangeViewer>
+      <attached>
+        <Model yaw=0 pitch=0 roll=0 scale3D="1000,1000,10" mesh="cylinder.mesh" /> 
+      </attached>
+    </TowerDefenseRangeViewer>
+</Template>
+
 
 <Level plugins = "towerdefense" gametype = "TowerDefense">

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

@@ -11 +11 @@
   TDCoordinate.cc
   TowerDefenseController.cc
+  TowerDefenseRangeViewer.cc
 )
 

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

@@ -76 +76 @@
 #include "TowerDefenseCenterpoint.h"
 #include "worldentities/SpawnPoint.h"
+#include "worldentities/StaticEntity.h"
 #include "TowerDefenseController.h" //muss ich noch in den richtigen Ordner verschieben
 #include "graphics/Model.h"
@@ -82 +83 @@
 #include "core/CoreIncludes.h"
 #include "Highscore.h"
+#include "util/Output.h"
+#include "TowerDefenseRangeViewer.h"
+
 
 namespace orxonox
@@ -92 +96 @@
 
         selecter = nullptr;
+        rangeViewer = nullptr;
         this->player_ = nullptr;
         this->setHUDTemplate("TowerDefenseHUD");
@@ -124 +129 @@
                 selecter = new TowerDefenseSelecter(this->center_->getContext());                
             }
+            if(rangeViewer == nullptr){
+                rangeViewer = new TowerDefenseRangeViewer(this->center_->getContext());
+            }
             selecter->addTemplate(center_->getSelecterTemplate());
+            rangeViewer->addTemplate("therangeviewer");
+            rangeViewer->setPosition(-10000,0,-500);
             center_->attach(selecter);
+            center_->attach(rangeViewer);
         }
         else // If no centerpoint was specified, an error is thrown and the level is exited.
@@ -136 +147 @@
 
         createFields();
+
         TeamDeathmatch::start();
 
@@ -282 +294 @@
         timeUntilNextWave_ -= dt;
         timeSinceLastSpawn_ += dt;
+
+        if(selecter != nullptr && getField(selecter->selectedPos_)->canUpgrade() == true ){
+            rangeViewer->setPosition(((selecter->selectedPos_->GetX())-8)*100, ((selecter->selectedPos_->GetY())-8)*100, 200);
+        } else {
+            rangeViewer->setPosition(-10000,0,-500);
+        }
 
         //build/upgrade tower at selecter position

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

@@ -38 +38 @@
 #include "util/Output.h"
 #include "TowerDefenseField.h"
+#include "TowerDefenseRangeViewer.h"
 
 namespace orxonox
@@ -76 +77 @@
         virtual TDCoordinate* getNextStreetCoord(TDCoordinate*);
         
-        TowerDefenseSelecter* selecter;        
+        TowerDefenseSelecter* selecter;   
+        TowerDefenseRangeViewer* rangeViewer;     
 
     private:

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

@@ +1 @@
+
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -282 +283 @@
                 }
             }
+            
         }                           
     }

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

@@ -68 +68 @@
 
     class TowerDefenseTower;
-
+    class TowerDefenseRangeViewer;
     class TowerDefenseCenterpoint;
     class TowerDefenseHUDController;