Changeset 9400

Timestamp:

Oct 15, 2012, 4:33:52 PM (12 years ago)

Author:

mottetb

Message:

first checkin

Location:

code/branches/spaceNavigation

Files:

• data/overlays/HUD.oxo (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDAimAssistant.cc (added)
• src/modules/overlays/hud/HUDAimAssistant.h (added)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (2 diffs)

code/branches/spaceNavigation/data/overlays/HUD.oxo

@@ -65 +65 @@
    aimMarkerSize = 0.04
   />
+  
+  <HUDAimAssistant
+   name                  = "AimAssistant"
+   correctAspect = true
+   pointerSize   = 0.03
+ />
 
   <HUDRadar

code/branches/spaceNavigation/src/modules/overlays/OverlaysPrereqs.h

@@ -91 +91 @@
     class HUDBoostBar;
     class HUDTimer;
+    class HUDAimAssistant;
     class KillMessage;
     class LastManStandingInfos;

code/branches/spaceNavigation/src/modules/overlays/hud/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(OVERLAYS_SRC_FILES
+  HUDAimAssistant.cc
   HUDBar.cc
   HUDNavigation.cc

code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc

@@ -55 +55 @@
 namespace orxonox
 {
-    bool compareDistance(std::pair<RadarViewable*, unsigned int> a, std::pair<RadarViewable*, unsigned int> b)
+    static bool compareDistance(std::pair<RadarViewable*, unsigned int> a, std::pair<RadarViewable*, unsigned int> b)
     {
         return a.second < b.second;
@@ -158 +158 @@
     {
         SUPER(HUDNavigation, tick, dt);
+
+        orxout() << "hello world" << std::endl;
 
         Camera* cam = CameraManager::getInstance().getActiveCamera();