Changeset 1463

Timestamp:

May 28, 2008, 10:29:58 PM (16 years ago)

Author:

FelixSchulthess

Message:

minor hud/radar adjustments

Location:

code/branches/network

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/hud/HUD.cc (modified) (1 diff)
• src/orxonox/hud/RadarOverlayElement.cc (modified) (1 diff)

code/branches/network/bin/levels/sample.oxw

@@ -15 +15 @@
 <Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
 <Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
+<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

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

@@ -129 +129 @@
         node = sm->getRootSceneNode()->createChildSceneNode("tomato3", Vector3(0.0, 0.0, 2000.0));
         addRadarObject(node);
+        node = sm->getRootSceneNode()->createChildSceneNode("station", Vector3(10000.0,16000.0,0.0));
+        addRadarObject(node, 3);
     }
 

code/branches/network/src/orxonox/hud/RadarOverlayElement.cc

@@ -90 +90 @@
             // set size to fit distance...
             float d = ((*it)->getPosition()-shipPos_).length();
-            if(d<4000) (*it)->panel_->setDimensions(4,4);
-            else if(d<8000) (*it)->panel_->setDimensions(3,3);
-            else if(d<16000) (*it)->panel_->setDimensions(2,2);
-            else (*it)->panel_->setDimensions(1,1);
+            if(d<10000) (*it)->panel_->setDimensions(4,4);
+            else if(d<20000) (*it)->panel_->setDimensions(3,3);
+            else (*it)->panel_->setDimensions(2,2);
 
             if (right){