[Orxonox-commit 3781] r8461 - in code/trunk: data/levels src/orxonox/worldentities

[smerkli at orxonox.net]

Author: smerkli
Date: 2011-05-12 14:38:49 +0200 (Thu, 12 May 2011)
New Revision: 8461

Added:
   code/trunk/data/levels/presentationFS11.oxw
Modified:
   code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc
Log:
a little less verbosity, a little more action please :D

Copied: code/trunk/data/levels/presentationFS11.oxw (from rev 8458, code/trunk/data/levels/myTestLevel.oxw)
===================================================================
--- code/trunk/data/levels/presentationFS11.oxw	                        (rev 0)
+++ code/trunk/data/levels/presentationFS11.oxw	2011-05-12 12:38:49 UTC (rev 8461)
@@ -0,0 +1,52 @@
+<LevelInfo
+ name = "Presentation FS11"
+ description = "Presentation level spring semester '11"
+ tags = "test"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox"
+  >
+
+
+    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+    <SpawnPoint team=0 position="0,0,0" lookat="2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    
+    <SpaceBoundaries warnDistance="1" maxDistance="200" showDistance="100" healthDecrease="0.1" position="0,0,0"/>
+
+    <Template name=PortalDefault>
+        <PortalEndPoint>
+            <attached>
+                <Billboard material="Portals/Default" />
+            </attached>
+        </PortalEndPoint>
+    </Template>
+
+    <PortalEndPoint position="0,0,0" id="1" distance="40" target="MobileEntity" design="PortalDefault"/>
+    <PortalEndPoint position="-1000,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
+    <PortalLink fromID="1" toID="2" />
+    <PortalLink fromID="2" toID="1" />
+    
+  </Scene>
+</Level>
+

Modified: code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc
===================================================================
--- code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc	2011-05-12 12:24:39 UTC (rev 8460)
+++ code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc	2011-05-12 12:38:49 UTC (rev 8461)
@@ -190,7 +190,7 @@
     {
         this->checkWhoIsIn();
         this->removeAllBillboards();
-        COUT(0) << "Groesse der Liste: " << (int) pawnsIn_.size() << std::endl;
+        //COUT(0) << "Groesse der Liste: " << (int) pawnsIn_.size() << std::endl;
         
         float distance;
         bool humanItem;
@@ -201,13 +201,13 @@
             {
                 distance = this->computeDistance(currentPawn);
                 humanItem = this->isHumanPlayer(currentPawn);
-                COUT(0) << "Distanz:" << distance << std::endl; // message for debugging
+                //COUT(0) << "Distanz:" << distance << std::endl; // message for debugging
                 if(distance > this->warnDistance_ && distance < this->maxDistance_) // Zeige Warnung an!
                 {
-                    COUT(0) << "You are near by the boundaries!" << std::endl; // message for debugging
+                    //COUT(0) << "You are near by the boundaries!" << std::endl; // message for debugging
                     if(humanItem)
                     {
-                        COUT(0) << "humanItem ist true" << std::endl;
+                        //COUT(0) << "humanItem ist true" << std::endl;
                         this->displayWarning("Attention! You are near by the boundaries!");
                     }
                 }
@@ -219,7 +219,7 @@
                 {
                     if( humanItem )
                     {
-                        COUT(0) << "Health should be decreasing!" << std::endl;
+                        //COUT(0) << "Health should be decreasing!" << std::endl;
                         this->displayWarning("You are out of the area now!");
                     }
                     currentPawn->removeHealth( (distance - this->maxDistance_) * this->healthDecrease_);