Changeset 823 for code/branches

Timestamp:

Feb 17, 2008, 5:42:44 PM (17 years ago)

Author:

nicolasc

Message:

added chai's hud

Location:

code/branches/hud

Files:

• cmake/FindOGRE.cmake (modified) (2 diffs)
• src/orxonox/Orxonox.cc (modified) (3 diffs)
• src/orxonox/hud/Bar.cc (added)
• src/orxonox/hud/Bar.h (added)
• src/orxonox/hud/HUD.cc (modified) (1 diff)

code/branches/hud/cmake/FindOGRE.cmake

@@ -7 +7 @@
 #  OGRE_FOUND, If false, do not try to use OGRE
 #
-# Copyright © 2007, Matt Williams
+# Copyright � 2007, Matt Williams
 # Modified by Nicolas Schlumberger to make it work on the Tardis-Infrastucture of the ETH Zurich
 #
@@ -18 +18 @@
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for OGRE")
-    SET(OGRE_INCLUDE_DIR ../libs/ogre/OgreMain/include)
-    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
+    SET(OGRE_INCLUDE_DIR /usr/include/OGRE ../libs/ogre/OgreMain/include)
+    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/usr/include/OGRE ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
     SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
-    PKG_SEARCH_MODULE(OGRE OGRE /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/pkgconfig/OGRE.pc) # tardis specific hack
+    PKG_SEARCH_MODULE(OGRE OGRE /usr/include/OGRE /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/pkgconfig/OGRE.pc) # tardis specific hack
     SET(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIRS})
     SET(OGRE_LIB_DIR ${OGRE_LIBDIR})

code/branches/hud/src/orxonox/Orxonox.cc

@@ -43 +43 @@
 #include <OgreConfigFile.h>
 #include <OgreOverlay.h>
+#include <OgreOverlayContainer.h>
 #include <OgreOverlayManager.h>
 
@@ -73 +74 @@
 #include "core/Debug.h"
 #include "hud/HUD.h"
+#include "hud/Bar.h"
 #include "objects/weapon/BulletManager.h"
 #include "GraphicsEngine.h"
@@ -382 +384 @@
     loader_->loadLevel();
 
-    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    HUD* orxonoxHud;
-    orxonoxHud = new HUD();
-    orxonoxHud->setEnergyValue(20);
-    orxonoxHud->setEnergyDistr(20,20,60);
+//    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+ //   Ogre::OverlayContainer* cont = Ogre::OverlayManager::createOverlayElement("Orxonox/HUD1.2/MyShip", "Orxonox/HUD1.2/shieldLeftTop", false);
+ //   Ogre::OverlayContainer* cont =  Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2/MapBackGround");
+
+//    hud::Bar* newBar = Ogre::OverlayManager::createOverlayElement("Element", "ElementName");
+//new hud::Bar(1,true,Ogre::ColourValue::Black,"Orxonox/hi");
+ //   cont->addChild(newBar-> element_);
+//   hud::Bar* newBar = Ogre::OverlayManager::createOverlayElement("orxonox/bar", "orxonox/newbar", false);
+
+
+    Ogre::OverlayManager& overlayManager = Ogre::OverlayManager::getSingleton();
+
+    Ogre::Overlay* hudOverlay = overlayManager.create("orxonoxsuperoverlay");
+
+    hud::Bar* newBar = static_cast<hud::Bar*>(overlayManager.createOverlayElement("Panel", "Bar"));
+    newBar->setLeft(0);
+    newBar->setTop(0);
+    newBar->setWidth(10);
+    newBar->setHeight(10);
+    newBar->setMaterialName("Orxonox/Red");
+    newBar->setMetricsMode(Ogre::GMM_PIXELS);
+    newBar->setPercentage(0.8);
+    newBar->show();
+
+
+    Ogre::OverlayContainer* panel = static_cast<Ogre::OverlayContainer*> (overlayManager.createOverlayElement("Panel", "PanelName"));
+    panel->setLeft(10);
+    panel->setTop(10);
+    panel->setWidth(100);
+    panel->setHeight(100);
+    panel->setMetricsMode(Ogre::GMM_PIXELS);
+    panel->show();
+
+    hudOverlay->add2D(panel);
+    panel->addChild(newBar);
+
+ //   HUD* orxonoxHud;
+ //   orxonoxHud = new HUD();
+ //   orxonoxHud->setEnergyValue(20);
+ //   orxonoxHud->setEnergyDistr(20,20,60);
     hudOverlay->show();
+
 
         /*

code/branches/hud/src/orxonox/hud/HUD.cc

@@ -33 +33 @@
 
 #include "HUD.h"
+#include "Bar.h"