[Orxonox-commit 7556] r12159 - in code/branches/wagnis_HS18: data/overlays src/modules/wagnis

[kunzro at orxonox.net]

Author: kunzro
Date: 2018-12-05 13:24:26 +0100 (Wed, 05 Dec 2018)
New Revision: 12159

Modified:
   code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.h
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.h
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h
Log:
highlight and dehighlight function added for province and WagnisHUD info adjusts colour

Modified: code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo
===================================================================
--- code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo	2018-12-05 11:49:23 UTC (rev 12158)
+++ code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo	2018-12-05 12:24:26 UTC (rev 12159)
@@ -14,7 +14,7 @@
 
       <WagnisHUDinfo
        name      = "descr1"
-       position  = "0.1, 0.20"
+       position  = "0.2, 0.1"
        pickpoint = "0, 1"
        font      = "Monofur"
        caption   = "player name"

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.cc	2018-12-05 11:49:23 UTC (rev 12158)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.cc	2018-12-05 12:24:26 UTC (rev 12159)
@@ -20,12 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Felix Schulthess
- *   Co-authors:
- *      Reto Grieder
- *      Oliver Scheuss
- *      Matthias Spalinger
- *
+ *      Roman Kunz
  */
 
 #include "WagnisHUD.h"

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.h	2018-12-05 11:49:23 UTC (rev 12158)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUD.h	2018-12-05 12:24:26 UTC (rev 12159)
@@ -20,10 +20,8 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Felix Schulthess
- *   Co-authors:
- *      Reto Grieder
- *      Matthias Spalinger
+ *      Roman Kunz
+
  *
  */
 

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.cc	2018-12-05 11:49:23 UTC (rev 12158)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.cc	2018-12-05 12:24:26 UTC (rev 12159)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Florian Zinggeler
+ *      Roman Kunz
  *
  */
 
@@ -49,7 +49,27 @@
         if(wagnisgame==nullptr){
             findWagnis();
         }
-    enum GameStage { NOT_READY, CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
+        switch(wagnisgame->active_player){
+            case 1: setColour( colour({255,0,0}, 100.0f) );
+                    break;
+            case 2: setColour( colour({0,255,0}, 100.0f) );
+                    break;
+            case 3: setColour( colour({255,255,0}, 100.0f) );
+                    break;
+            case 4: setColour( colour({0,0,255}, 100.0f) );
+                    break;
+            case 5: setColour( colour({255,0,255}, 100.0f) );
+                    break;
+            case 6: setColour( colour({128,128,0}, 40.0f) );
+                    break;
+            case 7: setColour( colour({0,255,255}, 100.0f) );
+                    break;
+            case 8: setColour( colour({153,255,204}, 100.0f) );
+                    break;
+            case 9: setColour( colour({102,51,0}, 100.0f) );
+                    break;
+        }
+
         std::stringstream ss;
         switch(wagnisgame->gameStage){
             case CHOOSE_PROVINCE_STAGE: {

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.h	2018-12-05 11:49:23 UTC (rev 12158)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisHUDinfo.h	2018-12-05 12:24:26 UTC (rev 12159)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Florian Zinggeler
+ *      Roman Kunz
  *
  */
 

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-12-05 11:49:23 UTC (rev 12158)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-12-05 12:24:26 UTC (rev 12159)
@@ -72,6 +72,14 @@
         }
 
     }
+    //highlight a province
+    void WagnisProvince::highlight(){
+        this->setRadarObjectColour( colour({255,255,255}, 100.0f) );
+    }
+    //dehighlight a province
+    void WagnisProvince::dehighlight(){
+        this->setOwner_ID( this->getOwner_ID() );
+    }
     //set troops
     void WagnisProvince::setTroops(int troops){
         this->troops = troops;

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h	2018-12-05 11:49:23 UTC (rev 12158)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h	2018-12-05 12:24:26 UTC (rev 12159)
@@ -31,6 +31,8 @@
         void setTroops(int);
         void setID(int);
         void setContinent(int);
+        void highlight();
+        void dehighlight();
 
         int getOwner_ID() const;
         int getTroops() const;