Changeset 12102 for code/branches

Timestamp:

Nov 14, 2018, 10:30:44 AM (6 years ago)

Author:

stadlero

Message:

Billboard added to Province

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• WagnisProvince.cc (modified) (3 diffs)
• WagnisProvince.h (modified) (3 diffs)

code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc

@@ -2 +2 @@
 #include "core/CoreIncludes.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "worldentities/StaticEntity.h"
 #include <vector>
 
@@ -16 +17 @@
         this->continent = -1;
         this->neighbors = std::vector<WagnisProvince*>();
+        this->markerBillboard = nullptr;
     }
     //Destructor
@@ -26 +28 @@
         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;
     }
 

code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h

@@ -11 +11 @@
 #include "core/XMLPort.h"
 #include "worldentities/MovableEntity.h"
+#include "graphics/Billboard.h"
 #include <vector>
 
@@ -22 +23 @@
         virtual ~WagnisProvince();
         virtual void XMLPort(Element&,XMLPort::Mode);
+        void addMarkerBillboard(Billboard*);
+        Billboard* getMarkerBillboard(unsigned int) const;
 
         void setOwner_ID(int);
@@ -41 +44 @@
         int continent;
         std::vector<WagnisProvince*> neighbors;
+        Billboard* markerBillboard;
     };
 }