[Orxonox-commit 6657] r11295 - code/branches/HUD_HS16/src/modules/overlays/hud

patricwi at orxonox.net patricwi at orxonox.net
Mon Nov 21 12:55:57 CET 2016


Author: patricwi
Date: 2016-11-21 12:55:57 +0100 (Mon, 21 Nov 2016)
New Revision: 11295

Modified:
   code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc
   code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h
   code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc
Log:
latest changes because of linker

Modified: code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc
===================================================================
--- code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc	2016-11-21 10:18:57 UTC (rev 11294)
+++ code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc	2016-11-21 11:55:57 UTC (rev 11295)
@@ -69,6 +69,11 @@
         overlayElement_->setMaterialName(s);
     }
 
+    void printHello()
+    {
+        orxout() << "lets say hello" << endl;
+    }
+
     // void HUDWeapon::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     // {
     //     SUPER(HUDWeapon, XMLPort, xmlelement, mode);

Modified: code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h
===================================================================
--- code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h	2016-11-21 10:18:57 UTC (rev 11294)
+++ code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h	2016-11-21 11:55:57 UTC (rev 11295)
@@ -35,7 +35,8 @@
         // virtual void sizeChanged() override;
 
         // void setPickup(Pickup* pickup);  
-        void initializeMaterial(const std::string& s);   
+        void initializeMaterial(const std::string& s);  
+        void printHello(); 
 
     private:
         // void createHUDChilds();

Modified: code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc
===================================================================
--- code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc	2016-11-21 10:18:57 UTC (rev 11294)
+++ code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc	2016-11-21 11:55:57 UTC (rev 11295)
@@ -69,7 +69,8 @@
         for(Pickup* p : picks)
         {
             HUDPickupItem* item = new HUDPickupItem(this->getContext());
-            item->initializeMaterial(p->getRepresentationName());
+            // item->initializeMaterial(p->getRepresentationName());
+            item->printHello();
         }
     }
 




More information about the Orxonox-commit mailing list