[Orxonox-commit 7545] r12148 - in code/branches/OrxoKart_HS18: src/modules/orxokart svn_is_cancer/OrxoKartMushroom

[ottka at orxonox.net]

Author: ottka
Date: 2018-12-05 11:40:51 +0100 (Wed, 05 Dec 2018)
New Revision: 12148

Added:
   code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.material
   code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.png
Modified:
   code/branches/OrxoKart_HS18/src/modules/orxokart/ShroomHUD.cc
Log:
Mushroom GUI

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/ShroomHUD.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/ShroomHUD.cc	2018-12-05 10:25:23 UTC (rev 12147)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/ShroomHUD.cc	2018-12-05 10:40:51 UTC (rev 12148)
@@ -54,7 +54,7 @@
         this->orxoKartGame_ = nullptr;
         this->panel_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
             .createOverlayElement("Panel", "ShroomHUD_Panel_" + getUniqueNumberString()));
-        this->panel_->setMaterialName("Hover/Flag");
+        this->panel_->setMaterialName("mushroom");
         this->overlay_->add2D(this->panel_);
         this->shroomCount_ = 3;
         setShroomCount(3);

Added: code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.material
===================================================================
--- code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.material	                        (rev 0)
+++ code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.material	2018-12-05 10:40:51 UTC (rev 12148)
@@ -0,0 +1,18 @@
+
+material mushroom
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture mushroom.png
+			}
+		}
+	}
+}

Added: code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.png
===================================================================
(Binary files differ)

Index: code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.png
===================================================================
--- code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.png	2018-12-05 10:25:23 UTC (rev 12147)
+++ code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.png	2018-12-05 10:40:51 UTC (rev 12148)

Property changes on: code/branches/OrxoKart_HS18/svn_is_cancer/OrxoKartMushroom/mushroom.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property