[Orxonox-commit 7496] r12102 - code/branches/wagnis_HS18/src/modules/wagnis

[stadlero at orxonox.net]

Author: stadlero
Date: 2018-11-14 10:30:44 +0100 (Wed, 14 Nov 2018)
New Revision: 12102

Modified:
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h
Log:
Billboard added to Province

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-11-14 09:01:05 UTC (rev 12101)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-11-14 09:30:44 UTC (rev 12102)
@@ -1,6 +1,7 @@
 #include "WagnisProvince.h"
 #include "core/CoreIncludes.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "worldentities/StaticEntity.h"
 #include <vector>
 
 namespace orxonox
@@ -15,6 +16,7 @@
         this->ID = -1;
         this->continent = -1;
         this->neighbors = std::vector<WagnisProvince*>();
+        this->markerBillboard = nullptr;
     }
     //Destructor
     WagnisProvince::~WagnisProvince(){
@@ -25,13 +27,23 @@
     void WagnisProvince::XMLPort(Element& xmlelement,XMLPort::Mode mode){
         SUPER(WagnisProvince, XMLPort, xmlelement, mode);
 
+        XMLPortObject(WagnisProvince, Billboard, "MarkerBillboard", addMarkerBillboard, getMarkerBillboard, xmlelement, mode);
         XMLPortParam(WagnisProvince, "ID", setID, getID, xmlelement, mode);
         XMLPortParam(WagnisProvince, "continent", setContinent, getContinent, xmlelement, mode);
     }
 
+    void WagnisProvince::addMarkerBillboard(Billboard* billi){
+        this->markerBillboard = billi;
+        attach(billi);
+    }
+    Billboard* WagnisProvince::getMarkerBillboard(unsigned int i) const{
+        if(i != 0) return nullptr;
+        return this->markerBillboard;
+    }
 
 
 
+
     //SET()
 
     //set owner_ID

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h	2018-11-14 09:01:05 UTC (rev 12101)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h	2018-11-14 09:30:44 UTC (rev 12102)
@@ -10,6 +10,7 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "worldentities/MovableEntity.h"
+#include "graphics/Billboard.h"
 #include <vector>
 
 
@@ -21,6 +22,8 @@
         WagnisProvince(Context*);
         virtual ~WagnisProvince();
         virtual void XMLPort(Element&,XMLPort::Mode);
+        void addMarkerBillboard(Billboard*);
+        Billboard* getMarkerBillboard(unsigned int) const;
 
         void setOwner_ID(int);
         void setTroops(int);
@@ -40,6 +43,7 @@
         int ID;
         int continent;
         std::vector<WagnisProvince*> neighbors;
+        Billboard* markerBillboard;
     };
 }