Changeset 5765 for code/branches/tutorial/src/orxonox

Timestamp:

Sep 23, 2009, 4:54:09 PM (16 years ago)

Author:

scheusso

Message:

this is the complete (and migrated) version of the tutorial branch fs09

Location:

code/branches/tutorial/src/orxonox

Files:

• controllers (modified) (1 prop)
• controllers/CMakeLists.txt (modified) (1 diff)
• controllers/DroneController.cc (copied) (copied from code/branches/tutorial/src/orxonox/objects/controllers/DroneController.cc) (2 diffs)
• controllers/DroneController.h (copied) (copied from code/branches/tutorial/src/orxonox/objects/controllers/DroneController.h) (1 diff)
• worldentities (modified) (1 prop)
• worldentities/CMakeLists.txt (modified) (1 diff)
• worldentities/Drone.cc (copied) (copied from code/branches/tutorial/src/orxonox/objects/worldentities/Drone.cc) (2 diffs)
• worldentities/Drone.h (copied) (copied from code/branches/tutorial/src/orxonox/objects/worldentities/Drone.h) (1 diff)

code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt ¶

@@ -4 +4 @@
   ArtificialController.cc
   AIController.cc
+  DroneController.cc
   ScriptController.cc
   WaypointController.cc

code/branches/tutorial/src/orxonox/controllers/DroneController.cc ¶

@@ -27 +27 @@
  */
 
-#include "OrxonoxStableHeaders.h"
 #include "DroneController.h"
-#include "objects/worldentities/Drone.h"
+#include "worldentities/Drone.h"
 #include "util/Math.h"
 
@@ -59 +58 @@
         totaltime += dt;
         Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
-        if(totaltime<1)
+        if(totaltime<100)
         {
             myDrone->moveFrontBack( -sqrt(dt) );

code/branches/tutorial/src/orxonox/controllers/DroneController.h ¶

@@ -33 +33 @@
 
 #include "Controller.h"
-#include "objects/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox

code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt ¶

@@ -7 +7 @@
 
   BigExplosion.cc
+  Drone.cc
   ExplosionChunk.cc
   CameraPosition.cc

code/branches/tutorial/src/orxonox/worldentities/Drone.cc ¶

@@ -27 +27 @@
  */
 
-#include "OrxonoxStableHeaders.h"
 #include "Drone.h"
 
@@ -53 +52 @@
         this->rotationThrust_ = 10;
         this->steering_ = Vector3::ZERO;
+
+        std::cout << "sdfasdfasdf====================";
         
         this->setCollisionType(WorldEntity::Dynamic);

code/branches/tutorial/src/orxonox/worldentities/Drone.h ¶

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "objects/worldentities/ControllableEntity.h"
-#include "objects/controllers/DroneController.h"
+#include "worldentities/ControllableEntity.h"
+#include "controllers/DroneController.h"
 
 namespace orxonox