Changeset 10751 in orxonox.OLD for branches/presentation/src

Timestamp:

Jun 20, 2007, 11:01:39 PM (17 years ago)

Author:

snellen

Message:

viewmode correct set in spaceship

Location:

branches/presentation/src/world_entities

Files:

• playable.cc (modified) (1 diff)
• projectiles/plasma_pulse.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (3 diffs)
• space_ships/space_ship.h (modified) (1 diff)

branches/presentation/src/world_entities/playable.cc

@@ -372 +372 @@
       break;
     case Playable::Vertical:
-      this->setCameraMode(Camera::ViewLeft);
+      this->setCameraMode(Camera::ViewNormal);
       break;
     case Playable::FromBehind:

branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

@@ -43 +43 @@
   this->setHealthMax(0);
   this->lifeSpan = 2.0;
-
   this->grid = new Billboard();
   this->grid->setSize(.2, .2);

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

@@ -234 +234 @@
 
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
+  caminit = true;
 
   this->travelNode = new PNode();
@@ -427 +428 @@
 void SpaceShip::tick (float time)
 {
+  if(caminit)
+  {
+  State::getCamera()->setViewMode(Camera::ViewNormal);
+  State::getCameraTargetNode()->setParent(this);
+  State::getCamera()->setParent(this);
+  caminit = false;
+  }
+  
   if ( deadBox != NULL )
   {
@@ -569 +578 @@
     if( event.type == KeyMapper::PEV_VIEW0)
     {
-      State::getCamera()->setViewMode(Camera::ViewNormal);
-      State::getCameraTargetNode()->setParent(this);
-      State::getCamera()->setParent(this);
+
     }
     else if( event.type == KeyMapper::PEV_VIEW1)

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

@@ -224 +224 @@
     void onButtonExit();
     void showDeadScreen();
+    bool caminit;
 
 };