Changeset 10017 for code/branches/pickupsFS14

Timestamp:

Apr 3, 2014, 2:35:54 PM (11 years ago)

Author:

fvultier

Message:

Steuerung funktioniert

Location:

code/branches/pickupsFS14

Files:

• data/levels/Jump.oxw (modified) (5 diffs)
• data/levels/templates/spaceshipJump.oxt (added)
• src/Orxonox.cc (modified) (1 diff)
• src/modules/jump/CMakeLists.txt (modified) (1 diff)
• src/modules/jump/Jump.cc (modified) (1 diff)
• src/modules/jump/JumpCenterPoint.cc (modified) (1 diff)
• src/modules/jump/JumpPlatform.cc (added)
• src/modules/jump/JumpPlatform.h (added)
• src/modules/jump/JumpShip.cc (modified) (5 diffs)
• src/modules/jump/JumpShip.h (modified) (3 diffs)

code/branches/pickupsFS14/data/levels/Jump.oxw

@@ -11 +11 @@
 
 <?lua
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipInvader.oxt")
-  include("templates/enemyInvader.oxt")
-  include("overlays/InvaderHUD.oxo")
+  -- include("templates/spaceshipAssff2.oxt")
+  -- include("templates/spaceshipPirate.oxt") 
+  include("templates/spaceshipJump.oxt")
+  -- include("templates/enemyInvader.oxt")
+  -- include("overlays/InvaderHUD.oxo")
 ?>
+
 
 <Level gametype = Jump>
@@ -35 +36 @@
     />
   
+    <Planet
+      position="0, 0, -2000"
+      scale="1000"
+      collisionType="dynamic"
+      linearDamping="0.8"
+      angularDamping="0"
+      mass="10000000"
+      pitch="0"
+      mesh="planets/muunilinst.mesh"
+      atmosphere="atmosphere1"
+      rotationaxis="1,0,0"
+      rotationrate="1.0"
+      atmospheresize="80.0f"
+      imagesize="1024.0f"
+      collisiondamage = 2
+      enablecollisiondamage = true
+    >
+
+    </Planet>
+
+
 
     <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
@@ -41 +63 @@
 
 
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=JumpShip pawndesign=spaceshipinvader />
-<!--
-    <DistanceTrigger name="start" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=0 />
+    <SpawnPoint team=0 position="0,0,0" lookat="0,0,-1" spawnclass=JumpShip pawndesign=spaceshipjump />
+
+    
 
 
@@ -50 +72 @@
     
     <?lua
-      for i = 1, 300, 1 do
+      for i = 1, 200, 1 do
         j = math.random()
     ?>
 
     <MovableEntity
-      position = "<?lua print(math.random()* 40000 + 1000) ?>,-1000,<?lua print(math.random() * 4000 - 2000) ?>"
+      position = "<?lua print(math.random(-300,300)) ?>,<?lua print(math.random(-250,10000)) ?>,-300>"
       collisionType = dynamic
       linearDamping = 0.8
       angularDamping = 0
-      scale = "<?lua print(j * 150)?>"
+      scale = "10"
       collisiondamage = 0
-      enablecollisiondamage = true
+      enablecollisiondamage = no
+
     >
       <attached>
         <Model mass="<?lua print(j * 1000) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
       </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 350) ?>" />
-      </collisionShapes>
+
     </MovableEntity>
 
@@ -75 +96 @@
     ?>
 
-  -->
+  
     
   </Scene>
 </Level>
-

code/branches/pickupsFS14/src/Orxonox.cc

@@ -27 +27 @@
  *
  */
+
+
 
 /**

code/branches/pickupsFS14/src/modules/jump/CMakeLists.txt

@@ -4 +4 @@
   JumpCenterPoint.cc
   JumpShip.cc
+  JumpPlatform.cc
 END_BUILD_UNIT
 )

code/branches/pickupsFS14/src/modules/jump/Jump.cc

@@ -46 +46 @@
 #include "JumpCenterPoint.h"
 #include "JumpShip.h"
+#include "JumpPlatform.h"
 /*
 #include "JumpEnemy.h"

code/branches/pickupsFS14/src/modules/jump/JumpCenterPoint.cc

@@ -70 +70 @@
         }
     }
+
+
 }

code/branches/pickupsFS14/src/modules/jump/JumpShip.cc

@@ -49 +49 @@
         //isFireing = false;
         //damping = 10;
-        left = false;
-        right = false;
-
+        leftPressed = false;
+        rightPressed = false;
+        upPressed = false;
+        downPressed = false;
+
+        yScreenPosition = 0;
+        yVelocity = 0;
     }
 
     void JumpShip::tick(float dt)
     {
-
-        Vector3 pos = getPosition();
+        Vector3 movement(0,0,0);
+        Vector3 shipPosition = getPosition();
 
         /*
@@ -95 +99 @@
         if (isFireing)
             ControllableEntity::fire(0);
-
+                */
         // Camera
-        WeakPtr<Camera> camera = this->getCamera();
-        if (camera != NULL)
-        {
-            camera->setPosition(Vector3(-pos.z, -posforeward, 0));
-            camera->setOrientation(Vector3::UNIT_Z, Degree(90));
-        }
-
-
-
+
+
+
+
+            /*
         // bring back on track!
         if(pos.y != 0)
@@ -121 +121 @@
         */
 
-        if (left == true)
-        {
-                pos += Vector3(100 + pos.y, 0, 0) * dt;
-                left = false;
-        }
-        else if (right == true)
-        {
-                right = false;
-        }
-
-        setPosition(pos);
-
+        // Berechne Bewegung anhand der Eingabe
+        if (leftPressed == true)
+        {
+                movement -= Vector3(xVelocity, 0, 0);
+                leftPressed = false;
+        }
+        else if (rightPressed == true)
+        {
+                movement += Vector3(xVelocity, 0, 0);
+                rightPressed = false;
+        }
+
+        if (upPressed == true)
+        {
+                //movement += Vector3(0, xVelocity, 0);
+                yVelocity = ySpeedAfterJump;
+                upPressed = false;
+        }
+        else if (downPressed == true)
+        {
+                movement -= Vector3(0, 0, 0);
+                downPressed = false;
+        }
+
+        movement += Vector3(0, yVelocity, 0);
+        yVelocity -= yAcceleration;
+
+        // Skalierung der Bewegung je nach vergangener Zeit
+        movement *= dt;
+
+        // Verschiebe das Schiff um den berechneten Vektor movement und verhindere Verlassen des Bildschrims
+        shipPosition.x = clamp(shipPosition.x + movement.x, -xBoundary, xBoundary);
+                shipPosition.y += movement.y;
+
+        setPosition(shipPosition);
+
+        // Bildschirmposition kann nur nach oben verschoben werden
+        if (shipPosition.y > yScreenPosition)
+        {
+                yScreenPosition = shipPosition.y;
+        }
+
+        // Kameraposition nachfuehren
+        if (camera == NULL)
+        {
+                camera = getCamera();
+        }
+        if (camera != NULL)
+        {
+
+            camera->setPosition(Vector3(-shipPosition.x, yScreenPosition-shipPosition.y, 100));
+            //camera->setOrientation(Vector3::UNIT_Z, Degree(180));
+        }
 
         SUPER(JumpShip, tick, dt);
@@ -146 +187 @@
     void JumpShip::moveFrontBack(const Vector2& value)
     {
+        if (value.y < 0)
+        {
+                downPressed = true;
+        }
+        else if (value.y > 0)
+        {
+                upPressed = true;
+        }
         //lastTimeLeft = 0;
         //desiredVelocity.x = -value.x * speed;
@@ -152 +201 @@
     void JumpShip::moveRightLeft(const Vector2& value)
     {
-        if (value.y < 0)
-        {
-                left = true;
-        }
-        else if (value.y > 0)
-        {
-                right = true;
+        if (value.x < 0)
+        {
+                leftPressed = true;
+        }
+        else if (value.x > 0)
+        {
+                rightPressed = true;
         }
         //lastTimeFront = 0;

code/branches/pickupsFS14/src/modules/jump/JumpShip.h

@@ -56 +56 @@
             // Starts or stops fireing
             virtual void boost(bool bBoost);
-
+*/
             //no rotation!
             virtual void rotateYaw(const Vector2& value){}; 
             virtual void rotatePitch(const Vector2& value){};
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+            virtual void rotateRoll(const Vector2& value){};
 
-            virtual void updateLevel();
+            /*virtual void updateLevel();
 
             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
@@ -72 +72 @@
             WeakPtr<Jump> getGame();
             WeakPtr<Jump> game;
-            //Camera* camera;
+            WeakPtr<Camera> camera;
+            const float xVelocity = 150.0f;
+            const float xBoundary = 200.0f;
+
+
             //bool isFireing;
             //float speed;
@@ -90 +94 @@
             } velocity, desiredVelocity;*/
 
-            bool left;
-            bool right;
+            bool leftPressed;
+            bool rightPressed;
+            bool upPressed;
+            bool downPressed;
 
-
-
+            float yScreenPosition;
+            float yVelocity;
+            const float yAcceleration = 10.0f;
+            const float ySpeedAfterJump = 300.0f;
     };
 }