Changeset 8627

Timestamp:

May 27, 2011, 9:54:03 PM (13 years ago)

Author:

landauf

Message:

merged revisions 8527-8530 from trunk to presentation branch:

• 8527: build fix for mingw, d_ostream.open() is not defined for wchar
• 8528: disable LOD for some of the debris meshes which cause a crash on old versions of Ogre
• 8529: fixed lua error when pressing ESC ingame after closing the console
• 8530: added config value to define the scroll speed in CEGUI listboxes. default 1 line.

Location:

code/branches/presentation

Files:

• data/gui/scripts/SheetManager.lua (modified) (1 diff)
• data/levels/templates/lodInformation.oxt (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (6 diffs)
• src/libraries/core/GUIManager.h (modified) (1 diff)

code/branches/presentation/data/gui/scripts/SheetManager.lua

@@ -216 +216 @@
 function keyESC()
     -- HUGE, very HUGE hacks!
-    
+
     -- If the InGameConsole is active, ignore the ESC command.
     if bInGameConsoleClosed == true then
         bInGameConsoleClosed = false
-        if activeMenuSheets[i] and activeMenuSheets[1].sheet.name == "MainMenu" then
+        if activeMenuSheets[1] and activeMenuSheets[1].sheet.name == "MainMenu" then
             return
         end

code/branches/presentation/data/levels/templates/lodInformation.oxt

@@ -15 +15 @@
       <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
       <MeshLodInformation mesh=HydroHarvester.mesh enabled=false />
+
+      <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->
+      <MeshLodInformation mesh=BodyDebris1.mesh enabled=false/>
+      <MeshLodInformation mesh=WingDebris2.mesh enabled=false/>
     </lodinformation>
   </Level>

code/branches/presentation/src/libraries/core/GUIManager.cc

@@ -65 +65 @@
 #endif
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_COMPILER_MINGW)
 #  include <windows.h>
 #endif
@@ -73 +73 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/Math.h"
 #include "util/OrxAssert.h"
 #include "ConfigValueIncludes.h"
@@ -121 +122 @@
                 d_ostream.close();
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_COMPILER_MINGW)
             // filename.c_str() is UTF-8 encoded, but Windows expects characters
             // according to the current codepage or UTF-16 (wchar)
@@ -156 +157 @@
         }
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_COMPILER_MINGW)
         /// Converts a UTF-8 character sequence to Windows UTF-16
         static std::wstring utf8ToUtf16(const std::string& utf8text)
@@ -355 +356 @@
     {
         SetConfigValue(guiScheme_, GUIManager::defaultScheme_) .description("Changes the current GUI scheme.") .callback(this, &GUIManager::changedGUIScheme);
+        SetConfigValue(numScrollLines_, 1).description("How many lines to scroll in a list if the scroll wheel is used");
     }
 
@@ -593 +595 @@
     void GUIManager::mouseScrolled(int abs, int rel)
     {
-        this->protectedCall(boost::bind(&CEGUI::System::injectMouseWheelChange, _1, (float)rel));
+        this->protectedCall(boost::bind(&CEGUI::System::injectMouseWheelChange, _1, (float)sgn(rel) * this->numScrollLines_));
     }
 

code/branches/presentation/src/libraries/core/GUIManager.h

@@ -186 +186 @@
         std::string guiScheme_;
 
+        int numScrollLines_; ///< How many lines to scroll in a list if the scroll wheel is used
+
     }; // tolua_export
 } // tolua_export