[Orxonox-commit 6314] r10971 - in code/branches/campaignHS15: data/levels src/orxonox/controllers

[gania at orxonox.net]

Author: gania
Date: 2015-12-11 15:32:33 +0100 (Fri, 11 Dec 2015)
New Revision: 10971

Modified:
   code/branches/campaignHS15/data/levels/AITest.oxw
   code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h
   code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h
   code/branches/campaignHS15/src/orxonox/controllers/SectionController.h
   code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h
Log:
referenced the testing level in headers of child classes

Modified: code/branches/campaignHS15/data/levels/AITest.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/AITest.oxw	2015-12-11 14:26:20 UTC (rev 10970)
+++ code/branches/campaignHS15/data/levels/AITest.oxw	2015-12-11 14:32:33 UTC (rev 10971)
@@ -161,7 +161,7 @@
    
 <!-- HERE ENDS DEMO FOR THE ACTIONPOINTS -->
 <!-- HERE STARTS DEMO FOR FIGHTING -->
-    <!-- 
+    
 
     <SpaceShip position="-4000, 1500, -1000" lookat="0,0,0" team=0 name="d1sd1">
       <templates>
@@ -237,11 +237,11 @@
         <WingmanController team=1>
         </WingmanController>
       </controller>
-    </SpaceShip>  -->
+    </SpaceShip> 
 
 <!-- HERE ENDS DEMO FOR FIGHTING -->
 <!-- HERE STARTS DEMO FOR FORMATIONS -->
-    
+    <!-- 
     <Model mesh="cube.mesh" scale=8 position="   0,2000,    0" />
     <Model mesh="cube.mesh" scale=8 position="   0,2000,-2000" />
     <Model mesh="cube.mesh" scale=8 position="2000,2000,-2000" />
@@ -290,7 +290,7 @@
         </WingmanController>
       </controller>
     </SpaceShip> 
-   
+    -->
 <!-- HERE ENDS DEMO FOR FORMATIONS -->
     <!-- 1 division is roughly equal to 6 AIControllers--!>
 <!-- 

Modified: code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h	2015-12-11 14:26:20 UTC (rev 10970)
+++ code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h	2015-12-11 14:32:33 UTC (rev 10971)
@@ -62,6 +62,7 @@
         being stored in an array of type Point::Value.
     @note
         ActionpointController will not work, if there is no MasterController in the level!
+        All the demos are in a file called AITest.oxw. In the menu look for New AI Testing Level.
     */
     namespace Action
     {  

Modified: code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h	2015-12-11 14:26:20 UTC (rev 10970)
+++ code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h	2015-12-11 14:32:33 UTC (rev 10971)
@@ -38,6 +38,7 @@
     /**
         @note
         ActionpointController will not work, if there is no MasterController in the level!
+        All the demos are in a file called AITest.oxw. In the menu look for New AI Testing Level.
     */
     class _OrxonoxExport DivisionController : public ActionpointController
     {

Modified: code/branches/campaignHS15/src/orxonox/controllers/SectionController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/SectionController.h	2015-12-11 14:26:20 UTC (rev 10970)
+++ code/branches/campaignHS15/src/orxonox/controllers/SectionController.h	2015-12-11 14:32:33 UTC (rev 10971)
@@ -37,6 +37,7 @@
     /**
         @note
         ActionpointController will not work, if there is no MasterController in the level!
+        All the demos are in a file called AITest.oxw. In the menu look for New AI Testing Level.
     */
     class _OrxonoxExport SectionController : public ActionpointController
     {

Modified: code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h	2015-12-11 14:26:20 UTC (rev 10970)
+++ code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h	2015-12-11 14:32:33 UTC (rev 10971)
@@ -38,6 +38,7 @@
     /**
         @note
         ActionpointController will not work, if there is no MasterController in the level!
+        All the demos are in a file called AITest.oxw. In the menu look for New AI Testing Level.
     */
     class _OrxonoxExport WingmanController : public ActionpointController
     {