Changeset 10270 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Jan 17, 2007, 5:52:08 PM (17 years ago)

Author:

muellmic

Message:

1) the centerpoint of the radar is now the centerpoint of the camera, so the enemies won't move in the radar when the player is moving; 2)fovy and cameradistance of each viewmode can now be set dynamically. so one would't have to readjust the fovy for each viewmode, when it has been manually changed once. (it's better to just change the fovy or distance for the viewmode where you need it); 3)unlike in the last revision, it doesnt have a soft- zoom- effect when setting a fovy anymore.

Location:

branches/playability/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (4 diffs)
• space_ship.h (modified) (2 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -395 +395 @@
 
   LoadParam(root, "playmode", this, SpaceShip, setPlaymodeXML);
+  LoadParam(root, "cameraDistance", this, SpaceShip, setCameraDistance);
+  LoadParam(root, "cameraFovy", this, SpaceShip, setCameraFovy);
 }
 
@@ -418 +420 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
+  State::getPlayer()->hud().setRadarCenterNode(this->travelNode);
   State::getPlayer()->hud().setOverlayActive(true);
   //dynamic_cast <OrxGui::GLGuiEnergyWidgetVertical*> (State::getPlayer()->hud().getArmorWidget())->setDisplayedName("Armor");
@@ -431 +434 @@
   State::getPlayer()->hud().setOverlayActive(false);
   State::getCamera()->setEventHandling(true);
+  State::getPlayer()->hud().setRadarCenterNode(NULL);
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   //this->detachCamera();
@@ -1080 +1084 @@
   }
 }
+
+void SpaceShip::setCameraDistance(float dist)
+{
+  State::getCamera()->setViewTopDistance(dist);
+}
+
+void SpaceShip::setCameraFovy(float fovy)
+{
+  State::getCamera()->setViewTopFovy(fovy);
+}

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -71 +71 @@
     inline float getElectronicCur() { return this->electronicCur; }; //!< returns current electronic value
     inline float getElectronicMax() { return this->electronicMax; }; //!< returns current electronic value
+
+    inline PNode* getTravelNode() { return this->travelNode; };
 
     //damage handler
@@ -179 +181 @@
     float                 cameraSpeed;
 
+    void                  setCameraDistance(float dist);
+    void                  setCameraFovy(float fovy);
+
     /*
     Quaternion            mouseDir;           //!< the direction where the player wants to fly