Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8854


Ignore:
Timestamp:
Aug 21, 2011, 11:56:59 PM (13 years ago)
Author:
landauf
Message:

change some output's level to verbose: 1. in Language.cc because it is printed a lot during the first startup of orxonox. 2. in InputManager.cc because the reloading happens each time the in game menu is opened or closed.
fixed possible "mass = 0" warning in presentationDM.oxw and fixed squared scaling of asteroid's size (?) because the scale was used for MovableEntity AND Model.

Location:
code/branches/output
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/output/data/levels/presentationDM.oxw

    r8822 r8854  
    4747      for i = 1, 100, 1 do
    4848        j = math.random()
     49        scale = j * 50 + 5
    4950    ?>
    50       <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass="<?lua print(j * 50) ?>" scale="<?lua print(j * 5) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
     51      <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    5152        <attached>
    52           <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
     53          <Model scale="<?lua print(scale) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    5354        </attached>
    5455        <collisionShapes>
    55           <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
     56          <SphereCollisionShape radius="<?lua print(scale * 2.5) ?>" />
    5657        </collisionShapes>
    5758      </MovableEntity>
  • code/branches/output/src/libraries/core/Language.cc

    r8830 r8854  
    304304    void Language::writeDefaultLanguageFile() const
    305305    {
    306         orxout(internal_info, context::language) << "Write default language file." << endl;
     306        orxout(verbose, context::language) << "Write default language file." << endl;
    307307
    308308        const std::string& filepath = PathConfig::getConfigPathString() + getFilename(this->defaultLanguage_);
  • code/branches/output/src/libraries/core/input/InputManager.cc

    r8806 r8854  
    143143    void InputManager::loadDevices()
    144144    {
    145         orxout(internal_info, context::input) << "InputManager: Loading input devices..." << endl;
     145        orxout(verbose, context::input) << "InputManager: Loading input devices..." << endl;
    146146
    147147        // When loading the devices they should not already be loaded
     
    196196            // Exception-safety
    197197            Loki::ScopeGuard guard = Loki::MakeGuard(OIS::InputManager::destroyInputSystem, oisInputManager_);
    198             orxout(internal_info, context::input) << "Created OIS input manager." << endl;
     198            orxout(verbose, context::input) << "Created OIS input manager." << endl;
    199199
    200200            if (oisInputManager_->getNumberOfDevices(OIS::OISKeyboard) > 0)
     
    219219        this->updateActiveStates();
    220220
    221         orxout(internal_info, context::input) << "Input devices loaded." << endl;
     221        orxout(verbose, context::input) << "Input devices loaded." << endl;
    222222    }
    223223
     
    306306    void InputManager::destroyDevices()
    307307    {
    308         orxout(internal_info, context::input) << "InputManager: Destroying devices..." << endl;
     308        orxout(verbose, context::input) << "InputManager: Destroying devices..." << endl;
    309309
    310310        BOOST_FOREACH(InputDevice*& device, devices_)
     
    315315            delete device;
    316316            device = 0;
    317             orxout(internal_info, context::input) << className << " destroyed." << endl;
     317            orxout(verbose, context::input) << className << " destroyed." << endl;
    318318        }
    319319        devices_.resize(InputDeviceEnumerator::FirstJoyStick);
     
    332332
    333333        internalState_ |= Bad;
    334         orxout(internal_info, context::input) << "Destroyed devices." << endl;
     334        orxout(verbose, context::input) << "Destroyed devices." << endl;
    335335    }
    336336
     
    351351    void InputManager::reloadInternal()
    352352    {
    353         orxout(internal_info, context::input) << "InputManager: Reloading ..." << endl;
     353        orxout(verbose, context::input) << "InputManager: Reloading ..." << endl;
    354354
    355355        this->destroyDevices();
     
    357357
    358358        internalState_ &= ~Bad;
    359         orxout(internal_info, context::input) << "InputManager: Reloading complete." << endl;
     359        orxout(verbose, context::input) << "InputManager: Reloading complete." << endl;
    360360    }
    361361
Note: See TracChangeset for help on using the changeset viewer.