Changeset 8854 for code/branches

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:

• data/levels/presentationDM.oxw (modified) (1 diff)
• src/libraries/core/Language.cc (modified) (1 diff)
• src/libraries/core/input/InputManager.cc (modified) (8 diffs)

code/branches/output/data/levels/presentationDM.oxw

@@ -47 +47 @@
       for i = 1, 100, 1 do
         j = math.random()
+        scale = j * 50 + 5
     ?>
-      <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) ?>">
+      <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) ?>">
         <attached>
-          <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+          <Model scale="<?lua print(scale) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
         </attached>
         <collisionShapes>
-          <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
+          <SphereCollisionShape radius="<?lua print(scale * 2.5) ?>" />
         </collisionShapes>
       </MovableEntity>

code/branches/output/src/libraries/core/Language.cc

@@ -304 +304 @@
     void Language::writeDefaultLanguageFile() const
     {
-        orxout(internal_info, context::language) << "Write default language file." << endl;
+        orxout(verbose, context::language) << "Write default language file." << endl;
 
         const std::string& filepath = PathConfig::getConfigPathString() + getFilename(this->defaultLanguage_);

code/branches/output/src/libraries/core/input/InputManager.cc

@@ -143 +143 @@
     void InputManager::loadDevices()
     {
-        orxout(internal_info, context::input) << "InputManager: Loading input devices..." << endl;
+        orxout(verbose, context::input) << "InputManager: Loading input devices..." << endl;
 
         // When loading the devices they should not already be loaded
@@ -196 +196 @@
             // Exception-safety
             Loki::ScopeGuard guard = Loki::MakeGuard(OIS::InputManager::destroyInputSystem, oisInputManager_);
-            orxout(internal_info, context::input) << "Created OIS input manager." << endl;
+            orxout(verbose, context::input) << "Created OIS input manager." << endl;
 
             if (oisInputManager_->getNumberOfDevices(OIS::OISKeyboard) > 0)
@@ -219 +219 @@
         this->updateActiveStates();
 
-        orxout(internal_info, context::input) << "Input devices loaded." << endl;
+        orxout(verbose, context::input) << "Input devices loaded." << endl;
     }
 
@@ -306 +306 @@
     void InputManager::destroyDevices()
     {
-        orxout(internal_info, context::input) << "InputManager: Destroying devices..." << endl;
+        orxout(verbose, context::input) << "InputManager: Destroying devices..." << endl;
 
         BOOST_FOREACH(InputDevice*& device, devices_)
@@ -315 +315 @@
             delete device;
             device = 0;
-            orxout(internal_info, context::input) << className << " destroyed." << endl;
+            orxout(verbose, context::input) << className << " destroyed." << endl;
         }
         devices_.resize(InputDeviceEnumerator::FirstJoyStick);
@@ -332 +332 @@
 
         internalState_ |= Bad;
-        orxout(internal_info, context::input) << "Destroyed devices." << endl;
+        orxout(verbose, context::input) << "Destroyed devices." << endl;
     }
 
@@ -351 +351 @@
     void InputManager::reloadInternal()
     {
-        orxout(internal_info, context::input) << "InputManager: Reloading ..." << endl;
+        orxout(verbose, context::input) << "InputManager: Reloading ..." << endl;
 
         this->destroyDevices();
@@ -357 +357 @@
 
         internalState_ &= ~Bad;
-        orxout(internal_info, context::input) << "InputManager: Reloading complete." << endl;
+        orxout(verbose, context::input) << "InputManager: Reloading complete." << endl;
     }