Changeset 11543 for code/branches

Timestamp:

Nov 6, 2017, 4:18:11 PM (7 years ago)

Author:

pascscha

Message:

camera changes

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/templates/spaceshipFlappyOrx.oxt (modified) (1 diff)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (4 diffs)

code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt

@@ -86 +86 @@
       <CameraPosition position="0,20, 90" drag=true mouselook=true />
       <CameraPosition position="0,30,120" drag=true mouselook=true /> -->
-      <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false mouselook=true />
+      <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false absolute=true mouselook=true />
     </camerapositions>
   </FlappyOrxShip>

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

@@ -69 +69 @@
         {
             if(getHealth()<0){
-                 getGame()->costLife();
-                 getGame()->death();
-                 death();
+                setHealth(1);
+                getGame()->death();
+                death();   
             }
             Vector3 pos = getPosition();
@@ -87 +87 @@
             pos += Vector3(speed + velocity.x, 0, velocity.y) * dt;
             
-            if(pos.z > 150){
-                pos.z=0;
-                velocity.y = 0;
-            }
-            
-            // restart if game ended
-            if (getGame())
-                if (getGame()->bEndGame)
-                {
-                    getGame()->start();
-                    return;
-                }
-            
+
             
             // Camera
@@ -105 +93 @@
             if (camera != nullptr)
             {
-                camera->setPosition(Vector3(-pos.z, -pos.y, 0));
-                camera->setOrientation(Vector3::UNIT_Z, Degree(90));
+                //camera->setPosition(Vector3(-pos.z, -pos.y, 0));
+                camera->setPosition(pos.x,-100,0);
+                camera->setOrientation(Vector3::UNIT_Z, Degree(0));
+
             }
 
             
             setPosition(pos);
-            setOrientation(Vector3::UNIT_Y, Degree(270));
+            setOrientation(Vector3::UNIT_Y, Degree(270-velocity.y/10));
+
+            if(pos.z > 150){
+                getGame()->death();
+                death();
+            }
             
         }
@@ -154 +149 @@
         Vector3 pos = getPosition();
         pos.x = 0;
+        pos.z = 0;
+        pos.y = 0;
+        velocity.y = 0;
         setPosition(pos);
+        usleep(1000u);
     }
 }