Changeset 8461 for code/trunk

Timestamp:

May 12, 2011, 2:38:49 PM (14 years ago)

Author:

smerkli

Message:

a little less verbosity, a little more action please

Location:

code/trunk

Files:

• data/levels/presentationFS11.oxw (copied) (copied from code/trunk/data/levels/myTestLevel.oxw) (2 diffs)
• src/orxonox/worldentities/SpaceBoundaries.cc (modified) (3 diffs)

code/trunk/data/levels/presentationFS11.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "MyTestLevel"
- description = "A level to test the Class SpaceBoundaries."
+ name = "Presentation FS11"
+ description = "Presentation level spring semester '11"
  tags = "test"
 />
@@ -29 +29 @@
   >
 
+
     <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>

code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc

@@ -191 +191 @@
         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;
@@ -202 +202 @@
                 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!");
                     }
@@ -220 +220 @@
                     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!");
                     }