Changeset 10032 for code/branches

Timestamp:

Apr 11, 2014, 12:07:05 PM (11 years ago)

Author:

fvultier

Message:

Neue Platformen werden zur Laufzeit hinzugefugt, wenn sich die Ansicht nach oben verschiebt. Eigene Modelle importieren funktioniert.

Location:

code/branches/pickupsFS14

Files:

• data/levels/Jump.oxw (modified) (2 diffs)
• src/modules/jump/Jump.cc (modified) (5 diffs)
• src/modules/jump/Jump.h (modified) (5 diffs)
• src/modules/jump/JumpPlatform.cc (modified) (1 diff)
• src/modules/jump/JumpPlatform.h (modified) (1 diff)
• src/modules/jump/JumpPrereqs.h (modified) (1 diff)
• src/modules/jump/JumpShip.cc (modified) (4 diffs)
• src/modules/jump/JumpShip.h (modified) (2 diffs)

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

@@ -56 +56 @@
     </Planet>
 
+    <MovableEntity
+      position="0, 0, 500"
+      scale="5"
+      collisionType="dynamic"
+      mass="10000000"
+    >
+      <attached>
+        <Model mesh="Platform01.mesh" />
+      </attached>
+    </MovableEntity>
+
 
 
@@ -64 +75 @@
 
     <SpawnPoint team=0 position="0,0,0" lookat="0,0,-1" spawnclass=JumpShip pawndesign=spaceshipjump />
-
-    
 
 

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

@@ -60 +60 @@
     {
         RegisterObject(Jump);
+        platformList.clear();
+        yScreenPosition = 0;
+        screenShiftSinceLastUpdate = 0;
+
         //this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
         //this->center_ = 0;
-       // init();
         //this->setHUDTemplate("JumpHUD");
 
-    }
-
-    void Jump::init()
-    {
-        /*bEndGame = false;
-        lives = 3;
-        level = 1;
-        point = 0;
-        bShowLevel = false;
-        multiplier = 1;
-        b_combo = false;*/
-        // spawn enemy every 3.5 seconds
-        //enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&Jump::spawnEnemy, this)));
-        //comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&Jump::comboControll, this)));
-    }
+
+    }
+
 
     /*void Jump::levelUp()
@@ -104 +95 @@
         if (player == NULL)
         {
-                ObjectList<JumpShip>::iterator it;
-                it = ObjectList<JumpShip>::begin();
-                /*for (ObjectList<JumpShip>::iterator it = ObjectList<JumpShip>::begin(); it != ObjectList<JumpShip>::end(); ++it)
+                for (ObjectList<JumpShip>::iterator it = ObjectList<JumpShip>::begin(); it != ObjectList<JumpShip>::end(); ++it)
                 {
                 player = *it;
-                }*/
+                }
         }
         return player;
     }
+
+    void Jump::tick(float dt)
+    {
+
+
+        if (getPlayer() != NULL)
+        {
+            Vector3 shipPosition = getPlayer()->getPosition();
+
+                // Bildschirmposition kann nur nach oben verschoben werden
+                if (shipPosition.y > yScreenPosition)
+                {
+                        screenShiftSinceLastUpdate += shipPosition.y - yScreenPosition;
+
+                        yScreenPosition = shipPosition.y;
+                }
+
+                // Kameraposition nachfuehren
+                if (camera == NULL)
+                {
+                        camera = getPlayer()->getCamera();
+                }
+            if (camera != NULL)
+            {
+                camera->setPosition(Vector3(-shipPosition.x, yScreenPosition-shipPosition.y, 100));
+                //camera->setOrientation(Vector3::UNIT_Z, Degree(180));
+            }
+
+            if (screenShiftSinceLastUpdate > 200.0)
+            {
+                screenShiftSinceLastUpdate -= 200.0;
+                orxout() << "new section added" << endl;
+                addPlatform(shipPosition.x, shipPosition.y + 300.0);
+            }
+
+        }
+
+        SUPER(Jump, tick, dt);
+    }
+
 
     /*void Jump::spawnEnemy()
@@ -158 +187 @@
     }*/
 
-    /*void Jump::start()
-    {
-        init();
+
+    void Jump::start()
+    {
+        // Call start for the parent class.
+        Deathmatch::start();
+
+        /*
         // Set variable to temporarily force the player to spawn.
         this->bForceSpawn_ = true;
@@ -170 +203 @@
             return;
         }
-        // Call start for the parent class.
-        Deathmatch::start();
-    }*/
+        */
+
+        //addPlatform(0,0);
+
+    }
+
 
     /*void Jump::addPoints(int numPoints)
@@ -191 +227 @@
         GSLevel::startMainMenu();
     }*/
+
+    void Jump::addPlatform(float xPosition, float yPosition)
+    {
+                JumpPlatform* newPlatform = new JumpPlatform(center_->getContext());
+                newPlatform->setPosition(Vector3(xPosition, yPosition, 0));
+                platformList.push_front(newPlatform);
+    }
+
 }

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

@@ -41 +41 @@
 #include "tools/Timer.h"
 #include "JumpPlatform.h"
+#include <list>
+
 
 namespace orxonox
@@ -49 +51 @@
         public:
             Jump(Context* context);
-
-            //virtual void start();
+            virtual void start();
             //virtual void end();
             //virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+
+            virtual void tick(float dt);
 
             //void spawnEnemy();
 
             void setCenterpoint(JumpCenterPoint* center){ this->center_ = center; }
+
+            virtual void addPlatform(float x, float y);
 
            /*int getLives(){return this->lives;}
@@ -68 +73 @@
             // checks if multiplier should be reset.
             void comboControll();*/
-            void init();
             //int lives;
             //int multiplier;
@@ -78 +82 @@
             WeakPtr<JumpCenterPoint> center_;
             WeakPtr<JumpShip> player;
+            WeakPtr<Camera> camera;
 
             /*Timer enemySpawnTimer;
@@ -86 +91 @@
             int point;
             bool b_combo;*/
+            std::list<JumpPlatform*> platformList;
+            float yScreenPosition;
+            float screenShiftSinceLastUpdate;
     };
 }

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

@@ -51 +51 @@
         model = new Model(getContext());
         model->setSyncMode(0);
-        model->setMeshSource("drone.mesh");
+        model->setMeshSource("Platform01.mesh");
 
-        movableEntity = new MovableEntity(getContext());
-        movableEntity->attach(model);
-
-        movableEntity->setScale(100);
-        //movableEntity->setPosition(Vector3(0,0,0));
-        //movableEntity->setVelocity(Vector3(0,0,1));
-
+        attach(model);
+        setScale(5);
+        setPosition(Vector3(0,0,0));
+        setVelocity(Vector3(0,0,0));
 
     }
 
+    void JumpPlatform::tick(float dt)
+    {
+        //setAngularVelocity(getAngularVelocity() + Vector3(0.05,0,0));
+        /*Vector3 movement(0,0,0);
+        Vector3 shipPosition = getPosition();*/
 
 
 
+        SUPER(JumpPlatform, tick, dt);
+    }
+
+
 }

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

@@ -45 +45 @@
         public:
             JumpPlatform(Context* context);
-
+            virtual void tick(float dt);
 
         private:
             Model* model;
-            MovableEntity* movableEntity;
-
     };
 }

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

@@ -71 +71 @@
     class JumpCenterPoint;
     class JumpShip;
+    class JumpPlatform;
     class JumpEnemy;
     class JumpEnemyShooter;

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

@@ -53 +53 @@
         upPressed = false;
         downPressed = false;
-
-        yScreenPosition = 0;
         yVelocity = 0;
     }
@@ -60 +58 @@
     void JumpShip::tick(float dt)
     {
+
+
         Vector3 movement(0,0,0);
         Vector3 shipPosition = getPosition();
-
-        /*
-        //Movement calculation
-        lastTimeFront += dt * damping;
-        lastTimeLeft += dt * damping;
-        lastTime += dt;
-
-        velocity.x = interpolate(clamp(lastTimeLeft, 0.0f, 1.0f), desiredVelocity.x, 0.0f);
-        velocity.y = interpolate(clamp(lastTimeFront, 0.0f, 1.0f), desiredVelocity.y, 0.0f);
-
-        //Execute movement
-        if (this->hasLocalController())
-        {
-            float dist_y = velocity.y * dt;
-            float dist_x = velocity.x * dt;
-            if(dist_y + posforeward > -42*3 && dist_y + posforeward < 42*6)
-                posforeward += dist_y;
-            else
-            {
-                velocity.y = 0;
-                // restart if game ended
-                if (getGame())
-                    if (getGame()->bEndGame)
-                    {
-                        getGame()->start();
-                        return;
-                    }
-            }
-            if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
-                velocity.x = 0;
-            pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
-
-        }
-
-        // shoot!
-        if (isFireing)
-            ControllableEntity::fire(0);
-                */
-        // Camera
-
-
-
-
-            /*
-        // bring back on track!
-        if(pos.y != 0)
-            pos.y = 0;
-
-        setPosition(pos);
-        setOrientation(Vector3::UNIT_Y, Degree(270));
-
-        // Level up!
-        if (pos.x > 42000)
-        {
-            updateLevel();
-            setPosition(Vector3(0, 0, pos.z)); // pos - Vector3(30000, 0, 0)
-        }
-        */
 
         // Berechne Bewegung anhand der Eingabe
@@ -141 +83 @@
         else if (downPressed == true)
         {
-                platform = new JumpPlatform(getContext());
-                platform->setPosition(Vector3(0, 0, 0));
-                platform->setVelocity(Vector3(0, 0, 0));
-                platform->setScale(100);
-
                 movement -= Vector3(0, 0, 0);
                 downPressed = false;
@@ -162 +99 @@
         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);
+        SUPER(JumpShip, tick, dt);
     }
 /*

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

@@ -73 +73 @@
             WeakPtr<Jump> getGame();
             WeakPtr<Jump> game;
-            WeakPtr<Camera> camera;
             const float xVelocity = 150.0f;
             const float xBoundary = 200.0f;
@@ -100 +99 @@
             bool downPressed;
 
-            float yScreenPosition;
             float yVelocity;
             const float yAcceleration = 10.0f;
             const float ySpeedAfterJump = 300.0f;
-
-            JumpPlatform* platform;
     };
 }