Changeset 9523 for code/branches/presentationHS12/src/modules/gametypes/SpaceRaceController.h

Timestamp:

Dec 16, 2012, 6:07:37 PM (11 years ago)

Author:

jo

Message:

Merging the Racingbot branch into the presentationHS12 branch.

Location:

code/branches/presentationHS12

Files:

• . (modified) (1 prop)
• src/modules/gametypes/SpaceRaceController.h (copied) (copied from code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h) (2 diffs)

code/branches/presentationHS12/src/modules/gametypes/SpaceRaceController.h

@@ -32 +32 @@
 #include "gametypes/Gametype.h"
 #include "gametypes/RaceCheckPoint.h"
+#include "util/Math.h"
 
 namespace orxonox
@@ -57 +58 @@
             // same as SpaceRaceManager, but needed to add virtuell Checkpoints ( Checkpoints which don't exist but needed to avoid collisions with big Objects)
             RaceCheckPoint* findCheckpoint(int index) const;
-            RaceCheckPoint
-                    * addVirtualCheckPoint(RaceCheckPoint*, int , Vector3);
-            void placeVirtualCheckpoints(RaceCheckPoint*, RaceCheckPoint*);
+            //RaceCheckPoint * addVirtualCheckPoint(RaceCheckPoint*, int , Vector3);
+            //void placeVirtualCheckpoints(RaceCheckPoint*, RaceCheckPoint*);
             bool vergleicheQuader(Vector3, Vector3);
             bool directLinePossible(RaceCheckPoint*, RaceCheckPoint*, std::vector<StaticEntity*>);
-            void computeVirtualCheckpoint(RaceCheckPoint*, RaceCheckPoint*, std::vector<StaticEntity*>);
+            //void computeVirtualCheckpoint(RaceCheckPoint*, RaceCheckPoint*, std::vector<StaticEntity*>);
 
         public: