Changeset 9904 for code/branches/presentationHS13/data

Timestamp:

Dec 16, 2013, 2:00:00 PM (11 years ago)

Author:

smerkli

Message:

Merged branch radarDreiD into presentationbranch

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• data/gui/scripts/MiscConfigMenu.lua (modified) (2 diffs)
• data/levels/radar3D_test.oxw (copied) (copied from code/branches/radarDreiD/data/levels/radar3D_test.oxw)
• data/overlays/HUD.oxo (modified) (1 diff)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)

code/branches/presentationHS13/data/gui/scripts/MiscConfigMenu.lua

@@ -38 +38 @@
     table.insert(P.commandList, "HUDNavigation MarkerLimit_")
     table.insert(P.commandList, "HUDNavigation showDistance")
+    table.insert(P.commandList, "HUDRadar RadarMode_")
 
     P.nameList = {}
@@ -60 +61 @@
     table.insert(P.nameList, "Marker Limit")
     table.insert(P.nameList, "Show Distance next to cursor")
+    table.insert(P.nameList, "Set Radar on 3D mode")
 
     P.linesList = {}

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

@@ -68 +68 @@
   <HUDRadar
    name          = "Radar"
-   background    = "Orxonox/Radar"
+   background    = "Orxonox/radar"
    correctAspect = true
    size          = "0.17, 0.17"

code/branches/presentationHS13/data/overlays/HUDTemplates3.oxo

@@ -108 +108 @@
     />
 
-    <HUDRadar
-     name          = "Radar"
-     background    = "Orxonox/Radar"
-     correctaspect = true
-     size          = "0.17, 0.17"
-     position      = "1.0, 1.0"
-     pickpoint     = "1.0, 1.0"
-     rotation      = 0
-     sensitivity   = 1.0
-     halfDotSizeDistance = 3000
-     maximumDotSize      = 0.1
+        <HUDRadar
+     name                               = "Radar"
+     background                         = "Orxonox/Radar3D"
+     material2D                         = "Orxonox/Radar"
+     material3DMiddle           = "Orxonox/Radar3D"
+     material3DFront            = "Orxonox/Radar3DFront"
+     material3DBack                     = "Orxonox/Radar3DBack"
+     correctaspect                      = true
+     size                               = "0.17, 0.17"
+     position                           = "1.0, 1.0"
+     pickpoint                          = "1.0, 1.0"
+     rotation                           = 0
+     sensitivity                        = 1.0
+     halfDotSizeDistance        = 3000
+     detectionLimit             = 10000.0
+     maximumDotSize             = 0.1
+     maximumDotSize3D           = 0.06
+     mapAngle3D                         = 0.6435011
     />
-
+    
     <HUDTimer
      name     = "Timer"