Changeset 12108 for code/branches/OrxoKart_HS18

Timestamp:

Nov 21, 2018, 9:32:15 AM (6 years ago)

Author:

ottka

Message:

implement simple respawn

Location:

code/branches/OrxoKart_HS18

Files:

• data/levels/OrxoKart1.oxw (modified) (2 diffs)
• src/modules/orxokart/CMakeLists.txt (modified) (1 diff)
• src/modules/orxokart/OrxoKart.cc (modified) (5 diffs)
• src/modules/orxokart/OrxoKart.h (modified) (1 diff)
• src/modules/orxokart/OrxoKartFlag.cc (added)
• src/modules/orxokart/OrxoKartFlag.h (added)
• src/modules/orxokart/OrxoKartPrereqs.h (modified) (1 diff)
• src/modules/orxokart/TimeHUD.cc (modified) (1 diff)

code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw

@@ -19 +19 @@
 <?lua
 --number of tiles
-N = 11
+N = 25
 --scaling factor
 S = 80
@@ -65 +65 @@
     <SpawnPoint
       team=0
-      position="<?lua print(S*0)?>,40,<?lua print(8*S)?>"
+      position="<?lua print(S*0)?>,40,<?lua print(19*S)?>"
       lookat="0,40,0"
       spawnclass=OrxoKartKart

code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt

@@ -4 +4 @@
   OrxoKartTile.cc
   OrxoKartOrigin.cc
+  OrxoKartFlag.cc
   TimeHUD.cc
 )

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc

@@ -33 +33 @@
 
 #include "OrxoKart.h"
-
+#include "OrxoKartFlag.h"
+#include "OrxoKartKart.h"
 #include "OrxoKartOrigin.h"
 #include "OrxoKartTile.h"
@@ -47 +48 @@
 
         this->origin_ = nullptr;
-        // this->numberOfFlags_ = 1;
+        this->numberOfFlags_ = 1;
         this->firstTick_ = true;
 
@@ -57 +58 @@
         SUPER(OrxoKart, tick, dt);
 
+
         if(this->firstTick_ && this->origin_)
         {
@@ -64 +66 @@
             int s = this->origin_->getCellSize();
 
-            int levelcodeArray[] =  {1,1,1,1,1,1,1,1,0,0,0
-                                    ,1,0,0,0,0,0,0,1,1,1,0
-                                    ,1,0,1,1,1,1,0,0,0,1,1
-                                    ,1,1,1,0,0,1,1,0,0,0,1
-                                    ,0,0,0,0,0,0,1,0,1,1,1
-                                    ,1,1,1,1,1,1,1,0,1,0,0
-                                    ,1,0,0,0,0,0,0,0,1,0,0
-                                    ,1,0,0,0,0,0,0,0,1,0,0
-                                    ,1,1,1,1,1,0,0,0,1,1,1
-                                    ,0,0,0,0,1,0,0,0,0,0,1
-                                    ,0,0,0,0,1,1,1,2,1,1,1};
+            int map_1[] =   {1,1,1,1,1,1,1,1,0,0,0
+                            ,1,0,0,0,0,0,0,1,1,1,0
+                            ,1,0,1,1,1,1,0,0,0,1,1
+                            ,1,1,1,0,0,1,1,0,0,0,1
+                            ,0,0,0,0,0,0,1,0,1,1,1
+                            ,1,1,1,1,1,1,1,0,1,0,0
+                            ,1,0,0,0,0,0,0,0,1,0,0
+                            ,1,0,0,0,0,0,0,0,1,0,0
+                            ,1,1,1,1,1,0,0,0,1,1,1
+                            ,0,0,0,0,1,0,0,0,0,0,1
+                            ,0,0,0,0,1,1,1,2,1,1,1};
+
+            int map_2[] =  {1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
+                            1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
+                            1,0,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
+                            1,0,1,0,0,0,0,0,0,0,1,0,1,0,1,1,1,1,1,1,1,1,1,0,0,
+                            1,0,1,0,1,1,1,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,1,0,0,
+                            1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,1,1,1,1,0,1,0,0,
+                            1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,0,
+                            1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,0,
+                            1,0,1,1,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,0,
+                            1,0,0,0,0,0,0,0,1,0,1,0,1,0,1,0,1,0,1,1,1,1,1,0,0,
+                            1,1,1,1,1,1,1,1,1,0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,
+                            0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,
+                            0,1,1,1,1,1,1,1,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,
+                            0,1,0,0,0,0,0,0,0,0,0,0,1,0,1,1,1,1,0,0,0,0,0,0,1,
+                            0,1,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,1,0,0,0,0,0,0,1,
+                            0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,1,1,1,1,
+                            0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,
+                            0,1,0,1,1,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,
+                            0,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,
+                            0,1,0,1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,
+                            0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+                            0,1,0,1,0,1,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,
+                            0,1,1,1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,
+                            0,0,0,0,0,1,1,1,0,0,0,1,0,0,0,0,0,0,0,0,1,1,1,0,1,
+                            0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,1,1,1,0,1,1,1};
+
+
+
+            int *levelcodeArray =  map_2;
 
 
@@ -85 +117 @@
             }
 
+            //bottom flag
+            
+                OrxoKartFlag* flag = new OrxoKartFlag(origin_->getContext());
+                flag->init(n, s);
+                flag_ = flag;
+            
+
+
             
 
         }//firsttick end
-            /*
-        // Check if ship collided with one of the flags
-        for ( unsigned int i = 0; i < flags_.size(); i++ ){
-            if(flags_[i]->getCollided()){
-                flags_[i]->destroyLater();
-                flags_.erase (flags_.begin()+i);
-            }
+
+        
+            
+        // Check if ship collided with the flag
+        if(flag_->getCollided()){
+            OrxoKartKart* player = flag_->getObjectofCollision();
+            orxout() << "Orientation= " << player->getOrientation() << endl;
+            player->setPosition(Vector3(80*0, 40, 80*18));
+            player->setOrientation(Quaternion(1, 0, 0, 0));   // 0, 0, 0
+            player->setVelocity(Vector3(0,0,0));
+            player->setAcceleration(Vector3(0,0,0));
+            flag_->setCollided(false); 
+
+
+            // flag_->destroyLater();
+           // flags_.erase (flags_.begin()+i);
+            numberOfFlags_ = 0;
         }
-        numberOfFlags_ = flags_.size(); */
         
     }

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h

@@ -55 +55 @@
                 { this->origin_ = origin; }
 
-            /*inline int getNumberOfFlags() const
-                { return this->numberOfFlags_; }*/
+            inline int getNumberOfFlags() const
+                { return this->numberOfFlags_; }
 
         private:
             WeakPtr<OrxoKartOrigin> origin_;
+            OrxoKartFlag* flag_;
             //std::vector<OrxoKartFlag*> flags_;
-            //int numberOfFlags_;
+            int numberOfFlags_;
             bool firstTick_;
     };

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartPrereqs.h

@@ -69 +69 @@
 {
     class OrxoKart;
+    class OrxoKartFlag;
     class OrxoKartOrigin;
     class OrxoKartKart;

code/branches/OrxoKart_HS18/src/modules/orxokart/TimeHUD.cc

@@ -82 +82 @@
         {
             this->setCaption(getTimeString(this->time_));
-            //if (this->orxokartGame_->getNumberOfFlags() == 0)
-              //  setRunning(false);
+            if (this->orxokartGame_->getNumberOfFlags() == 0)
+                setRunning(false);
         }