Changeset 9142 for code/branches/newlevel2012

Timestamp:

Apr 29, 2012, 5:22:56 PM (13 years ago)

Author:

mentzerf

Message:

+ Tried to create waypoints programmatically, succeeded, BUT: the spaceship does not follow them!!

• Changed WaypointController to log some debug info

Location:

code/branches/newlevel2012

Files:

• data/levels/towerDefense.oxw (modified) (2 diffs)
• src/modules/towerdefense/TowerDefense.cc (modified) (3 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (2 diffs)
• src/orxonox/controllers/WaypointController.cc (modified) (1 diff)

code/branches/newlevel2012/data/levels/towerDefense.oxw

@@ -65 +65 @@
         <!-- Spawns the camera, attached to a crate -->
         <SpawnPoint team=0 position="0,0,0" spawnclass=Pawn pawndesign=centerpointmark />
+        <!--TeamSpawnPoint team=1 position="-7,7,4" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
         
         <!--SpawnPoint team=1 position="0,0,10" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff  /-->
         <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
         
-        <!--SpaceShip position="-10,0,20" lookat="0,0,0">
+        <!--SpaceShip position="-10,0,20" lookat="0,0,0" scale=0.3>
       <templates>
         <Template link=spaceshipassff />
@@ -76 +77 @@
         <WaypointController accuracy=3>
           <waypoints>
-            <Model mesh="cube.mesh" scale=1 position="110,90,20" />
-            <Model mesh="cube.mesh" scale=2 position="290,90,20" />
-            <Model mesh="cube.mesh" scale=3 position="290,-90,20" />
-            <Model mesh="cube.mesh" scale=4 position="110,-90,20" />
+            <Model mesh="cube.mesh" scale=0.2 position="-8,-8,3" />
+            <Model mesh="cube.mesh" scale=0.2 position="8,8,3" />
+            <Model mesh="cube.mesh" scale=0.2 position="8,-8,3" />
+            <Model mesh="cube.mesh" scale=0.2 position="-8,8,3" />
           </waypoints>
         </WaypointController>

code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc

@@ -62 +62 @@
 #include "worldentities/pawns/Pawn.h"
 #include "worldentities/pawns/SpaceShip.h"
-
+#include "controllers/WaypointController.h"
+         
+#include "graphics/Model.h"
+#include "infos/PlayerInfo.h"
+         
 #include "chat/ChatManager.h"
 
@@ -78 +82 @@
                 /* Temporary hack to allow the player to add towers */
                 this->dedicatedAddTower_ = createConsoleCommand( "addTower", createExecutor( createFunctor(&TowerDefense::addTower, this) ) );
-                
+        
+                // Quick hack to test waypoints
+                createConsoleCommand( "aw", createExecutor( createFunctor(&TowerDefense::addWaypointsAndFirstEnemy, this) ) );
     }
         
@@ -149 +155 @@
         SUPER(TowerDefense, tick, dt);
                 
-        static bool test = false;
-        if (!test)
+        static int test = 0;
+        if (++test == 10)
         {
-                        orxout()<< "First tick." <<endl;
+                        orxout()<< "10th tick." <<endl;
+                        /*
+                        for (std::set<SpawnPoint*>::iterator it = this->spawnpoints_.begin(); it != this->spawnpoints_.end(); it++)
+                        {
+                                orxout() << "checking spawnpoint with name " << (*it)->getSpawnClass()->getName() << endl;
+                        }
+                        */
+                        
+                        //addWaypointsAndFirstEnemy();
+                        
         }
-        test = true;
     }
+        
+        // Function to test if we can add waypoints using code only. Doesn't work yet
+        
+        // THE PROBLEM: WaypointController's getControllableEntity() returns null, so it won't track. How do we get the controlableEntity to NOT BE NULL???
+        
+        void TowerDefense::addWaypointsAndFirstEnemy()
+        {
+                SpaceShip *newShip = new SpaceShip(this->center_);
+                newShip->addTemplate("spaceshipassff");
+                
+                WaypointController *newController = new WaypointController(newShip);
+                newController->setAccuracy(3);
+                
+                Model *wayPoint1 = new Model(newController);
+                wayPoint1->setMeshSource("crate.mesh"); 
+                wayPoint1->setPosition(7,-7,5);
+                wayPoint1->setScale(0.2);
+                        
+                Model *wayPoint2 = new Model(newController);
+                wayPoint2->setMeshSource("crate.mesh");
+                wayPoint2->setPosition(7,7,5);
+                wayPoint2->setScale(0.2);
+                        
+                newController->addWaypoint(wayPoint1);
+                newController->addWaypoint(wayPoint2);
+                        
+                // The following line causes the game to crash
+//              newController -> getPlayer() -> startControl(newShip);
+                newShip->setController(newController);
+                newShip->setPosition(-7,-7,5);
+                newShip->setScale(0.1);
+                newShip->addSpeed(1);
+                
+                
+                
+//              this->center_->attach(newShip);
+        }
         
         /*

code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h

@@ -58 +58 @@
                 //virtual void playerScored(PlayerInfo* player);
                 
+                
                 /*      Called by TowerDefenseCenterpoint upon game start 
                         The centerpoint is used to create towers
@@ -72 +73 @@
 //              WeakPtr<TowerDefenseCenterpoint> center_;
                 TowerDefenseCenterpoint *center_;
+                
+                void addWaypointsAndFirstEnemy();
     };
 }

code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc

@@ -62 +62 @@
     void WaypointController::tick(float dt)
     {
-        if (!this->isActive())
+                if (!this->isActive())
             return;
+
+                orxout() << "(" << this->waypoints_.size() << ") entity: " << this->getControllableEntity() << endl;
+
 
         if (this->waypoints_.size() == 0 || !this->getControllableEntity())
             return;
 
+                printf("3");
+
         if (this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_)
             this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
+
+                printf("4");
 
         this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());