Changeset 1783 for code/trunk

Timestamp:

Sep 15, 2008, 9:54:31 AM (16 years ago)

Author:

rgrieder

Message:

• fixed F1 and F2 keys. F1 can now again be used to toggle the visibility of the debug overlay.
• Tamed debug output in SpaceShip.cc a little bit.. (3 → 4)

Location:

code/trunk

Files:

• bin/def_keybindings.ini (modified) (1 diff)
• src/core/input/Button.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (3 diffs)

code/trunk/bin/def_keybindings.ini

@@ -59 +59 @@
 KeySPACE=
 KeyCAPITAL=
-KeyF1=toggleFPS
-KeyF2=toggleRenderTime
+KeyF1=Overlaygroup toggleVisibility Debug
+KeyF2=
 KeyF3=
 KeyF4=

code/trunk/src/core/input/Button.cc

@@ -220 +220 @@
         if (serious)
         {
-            COUT(2) << "Error while parsing binding for button/axis" << this->name_ << ". "
+            COUT(2) << "Error while parsing binding for button/axis " << this->name_ << ". "
                 << message << std::endl;
         }
         else
         {
-            COUT(3) << "Warning while parsing binding for button/axis" << this->name_ << ". "
+            COUT(3) << "Warning while parsing binding for button/axis " << this->name_ << ". "
                 << message << std::endl;
         }

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -342 +342 @@
 
     void SpaceShip::getFocus(){
-      COUT(3) << "requesting focus" << std::endl;
+      COUT(4) << "requesting focus" << std::endl;
       //if(!network::Host::running() || network::Host::getShipID()==objectID)
       if(myShip_)
@@ -356 +356 @@
 //       COUT(4) << "begin camera creation" << std::endl;
       this->camNode_ = this->getNode()->createChildSceneNode(camName_);
-      COUT(3) << "position: (this)" << this->getNode()->getPosition() << std::endl;
+      COUT(4) << "position: (this)" << this->getNode()->getPosition() << std::endl;
       this->camNode_->setPosition(Vector3(-25,0,5));
 //      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
@@ -374 +374 @@
       //if(!network::Host::running() || network::Host::getShipID()==objectID){ //TODO: check this
       if(myShip_){
-        COUT(3) << "requesting focus for camera" << std::endl;
+        COUT(4) << "requesting focus for camera" << std::endl;
         //CameraHandler::getInstance()->requestFocus(cam_);
         if(this->isExactlyA(Class(SpaceShip))){
           getFocus();
-          COUT(3) << "getting focus for obj id: " << objectID << std::endl;
+          COUT(4) << "getting focus for obj id: " << objectID << std::endl;
         }else
-          COUT(3) << "not getting focus (not exactly spaceship) for obj id: " << objectID << std::endl;
+          COUT(4) << "not getting focus (not exactly spaceship) for obj id: " << objectID << std::endl;
       }else
-        COUT(3) << "not getting focus (not my ship) for obj id: " << objectID << std::endl;
+        COUT(4) << "not getting focus (not my ship) for obj id: " << objectID << std::endl;
     }