[Orxonox-commit 7444] r12051 - code/branches/wagnis_HS18/src/modules/wagnis

[stadlero at orxonox.net]

Author: stadlero
Date: 2018-10-24 11:22:05 +0200 (Wed, 24 Oct 2018)
New Revision: 12051

Modified:
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h
Log:
XML Funkion von Province-Klasse hinzugefuegt

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc	2018-10-21 12:54:21 UTC (rev 12050)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc	2018-10-24 09:22:05 UTC (rev 12051)
@@ -41,13 +41,4 @@
         if(this->provs.size() <= index) return nullptr;
         return this->provs.at(index);
     }
-
-
-
-    void WagnisGameboard::setPosition(const Vector3&){
-        //TODO
-    }
-    void WagnisGameboard::setOrientation(const Quaternion&){
-        //TODO
-    }
 }
\ No newline at end of file

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h	2018-10-21 12:54:21 UTC (rev 12050)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h	2018-10-24 09:22:05 UTC (rev 12051)
@@ -31,14 +31,9 @@
         WagnisProvince* getProvince(unsigned int) const;
         //
 
-        void setPosition(const Vector3&) override;
-        void setOrientation(const Quaternion&) override;
-
     
     private:
         std::vector<WagnisProvince*> provs;
-        Vector3 position;
-        Quaternion orientation;
     };
 }
 

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-10-21 12:54:21 UTC (rev 12050)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-10-24 09:22:05 UTC (rev 12051)
@@ -14,7 +14,7 @@
     RegisterClass(WagnisProvince);
 
     //Constructor
-    WagnisProvince::WagnisProvince(Context* context) : StaticEntity(context){
+    WagnisProvince::WagnisProvince(Context* context) : MovableEntity(context){
         RegisterObject(WagnisProvince);
         this->owner_ID = 0;
         this->troops = 0;
@@ -27,19 +27,17 @@
 
     }
 
+    //XML Port
+    void WagnisProvince::XMLPort(Element& xmlelement,XMLPort::Mode mode){
+        XMLPortParam(WagnisProvince, "ID", setID, getID, xmlelement, mode);
+        XMLPortParam(WagnisProvince, "continent", setContinent, getContinent, xmlelement, mode);
+    }
 
 
 
+
     //SET()
 
-    //set Position
-    void WagnisProvince::setPosition(const Vector3& position){
-        //TODO
-    }
-    //set Orientation
-    void WagnisProvince::setOrientation(const Quaternion& orientation){
-        //TODO
-    }
     //set owner_ID
     void WagnisProvince::setOwner_ID(int owner){
         this->owner_ID = owner;
@@ -61,19 +59,19 @@
     //GET()
 
     //get owner_ID
-    int WagnisProvince::getOwner_ID(){
+    int WagnisProvince::getOwner_ID() const{
         return this->owner_ID;
     }
     //get troops
-    int WagnisProvince::getTroops(){
+    int WagnisProvince::getTroops() const{
         return this->troops;
     }
     //get ID
-    int WagnisProvince::getID(){
+    int WagnisProvince::getID() const{
         return this->ID;
     }
     //get continent
-    int WagnisProvince::getContinent(){
+    int WagnisProvince::getContinent() const{
         return this-> continent;
     }
 

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h	2018-10-21 12:54:21 UTC (rev 12050)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h	2018-10-24 09:22:05 UTC (rev 12051)
@@ -9,20 +9,18 @@
 #include "OrxonoxPrereqs.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "worldentities/StaticEntity.h"
+#include "worldentities/MovableEntity.h"
 #include <vector>
 
 
 namespace orxonox
 {
-    class WagnisProvince : public StaticEntity
+    class WagnisProvince : public MovableEntity
     {
     public:
         WagnisProvince(Context*);
         virtual ~WagnisProvince();
-        void setPosition(const Vector3&) override;
-        void setOrientation(const Quaternion&) override;
-        void addNeighbor(WagnisProvince*);
+        virtual void XMLPort(Element&,XMLPort::Mode);
 
         void setOwner_ID(int);
         void setTroops(int);
@@ -29,12 +27,13 @@
         void setID(int);
         void setContinent(int);
 
-        int getOwner_ID();
-        int getTroops();
-        int getID();
-        int getContinent();
+        int getOwner_ID() const;
+        int getTroops() const;
+        int getID() const;
+        int getContinent() const;
 
-    
+        void addNeighbor(WagnisProvince*);
+
     private:
         int owner_ID;
         int troops;
@@ -41,8 +40,6 @@
         int ID;
         int continent;
         std::vector<WagnisProvince*> neighbors;
-        Vector3 position;
-        Quaternion orientation;
     };
 }