Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1468 for code/branches


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/network/src/core/InputManager.cc

    r1465 r1468  
    576576            marginalsMin_[i] = INT_MAX;
    577577          }
    578           COUT(1) << "Move all joy stick axes in all directions a few times. "
     578          COUT(0) << "Move all joy stick axes in all directions a few times. "
    579579            << "Then put all axes in zero state and hit enter." << std::endl;
    580580
     
    11251125  {
    11261126    setInputState(IS_NODETECT);
    1127     COUT(1) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;
     1127    COUT(0) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;
    11281128    CommandExecutor::execute("config KeyBinder " + name + " " + bindingCommmandString_s, false);
    11291129  }
     
    11331133    bindingCommmandString_s = command;
    11341134    setInputState(IS_DETECT);
    1135     COUT(1) << "Press any button/key or move a mouse/joystick axis" << std::endl;
     1135    COUT(0) << "Press any button/key or move a mouse/joystick axis" << std::endl;
    11361136  }
    11371137
  • code/branches/network/src/orxonox/console/InGameConsole.cc

    r1455 r1468  
    299299        {
    300300            float top = this->consoleOverlayContainer_->getTop();
     301            float timePassed = scrollTimer_;
    301302            this->scrollTimer_ = 0;
    302303            if (this->scroll_ != 0)
    303304            {
    304305                // scroll
    305                 top = top + 0.02 * this->scroll_;
     306                top = top + timePassed * this->scroll_;
    306307                this->consoleOverlayContainer_->setTop(top);
    307308            }
  • code/branches/network/src/orxonox/console/InGameConsole.h

    r1454 r1468  
    4242namespace orxonox
    4343{
    44     class _OrxonoxExport InGameConsole : public Tickable, public ShellListener
     44    class _OrxonoxExport InGameConsole : public TickableReal, public ShellListener
    4545    {
    4646        public:
Note: See TracChangeset for help on using the changeset viewer.