Changeset 1468

Timestamp:

May 29, 2008, 12:15:08 AM (16 years ago)

Author:

rgrieder

Message:

• InGameConsole: - Tickable —> TickableReal (cursor now blinks independently of timeFactor_)
  • made console scroll down speed independent of frame rate
• InputManager: - COUT(1) —> COUT(0)

Location:

code/branches/network/src

Files:

• core/InputManager.cc (modified) (3 diffs)
• orxonox/console/InGameConsole.cc (modified) (1 diff)
• orxonox/console/InGameConsole.h (modified) (1 diff)

code/branches/network/src/core/InputManager.cc

@@ -576 +576 @@
             marginalsMin_[i] = INT_MAX;
           }
-          COUT(1) << "Move all joy stick axes in all directions a few times. "
+          COUT(0) << "Move all joy stick axes in all directions a few times. "
             << "Then put all axes in zero state and hit enter." << std::endl;
 
@@ -1125 +1125 @@
   {
     setInputState(IS_NODETECT);
-    COUT(1) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;
+    COUT(0) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;
     CommandExecutor::execute("config KeyBinder " + name + " " + bindingCommmandString_s, false);
   }
@@ -1133 +1133 @@
     bindingCommmandString_s = command;
     setInputState(IS_DETECT);
-    COUT(1) << "Press any button/key or move a mouse/joystick axis" << std::endl;
+    COUT(0) << "Press any button/key or move a mouse/joystick axis" << std::endl;
   }
 

code/branches/network/src/orxonox/console/InGameConsole.cc

@@ -299 +299 @@
         {
             float top = this->consoleOverlayContainer_->getTop();
+            float timePassed = scrollTimer_;
             this->scrollTimer_ = 0;
             if (this->scroll_ != 0)
             {
                 // scroll
-                top = top + 0.02 * this->scroll_;
+                top = top + timePassed * this->scroll_;
                 this->consoleOverlayContainer_->setTop(top);
             }

code/branches/network/src/orxonox/console/InGameConsole.h

@@ -42 +42 @@
 namespace orxonox
 {
-    class _OrxonoxExport InGameConsole : public Tickable, public ShellListener
+    class _OrxonoxExport InGameConsole : public TickableReal, public ShellListener
     {
         public: