Changeset 6883

Timestamp:

May 10, 2010, 4:17:20 PM (14 years ago)

Author:

freicy

Message:

by cyrill

Location:

code/branches/fps

Files:

• data/levels/presentation_FS10.oxw (added)
• data/levels/templates/fps.oxt (modified) (2 diffs)
• data/overlays/hudtamplates_fps.oxo (modified) (2 diffs)
• src/orxonox/controllers/NewHumanController.cc (modified) (2 diffs)

code/branches/fps/data/levels/templates/fps.oxt

@@ -1 +1 @@
 <Template name=fps>
   <FpsPlayer
-   hudtemplate            = spaceshiphud
+   hudtemplate            = fpshud
    camerapositiontemplate = fpscamera
  
@@ -29 +29 @@
 -->
     <collisionShapes>
-      <BoxCollisionShape position="0,0,0" halfExtents="100,10,100" />
+      <BoxCollisionShape position="0,0,0" halfExtents="7,7,7" />
     <!--
       <SphereCollisionShape radius="10" />

code/branches/fps/data/overlays/hudtamplates_fps.oxo

@@ -4 +4 @@
 </Template>
 
-<Template name="spaceshiphud">
-  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+<Template name="fpshud">
+  <OverlayGroup name = "fpshud" scale = "1, 1">
     <Map />
 
@@ -73 +73 @@
     />
 
-    <GUIOverlay
+ <!--   <GUIOverlay
       name = "QuestGUI"
       guiname = "QuestGUI"
       visible = "false"
     />
-
+-->
   </OverlayGroup>
 </Template>

code/branches/fps/src/orxonox/controllers/NewHumanController.cc

@@ -210 +210 @@
                 if (!controlPaused_ )
                 {
-                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket")) || this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))))
-                        this->showOverlays();
+                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
+                        {this->showOverlays();}
+                        
+                    if (this->getControllableEntity() &&  this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))\
+                        {this->showOverlays();
+                        this->hideArrows();}
 
                     this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5f-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5f-overlaySize_/2));
@@ -460 +464 @@
         if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
         {
+            
             this->showOverlays_ = true;
             if (!this->controlPaused_)