Changeset 6135

Timestamp:

Nov 24, 2009, 2:17:38 AM (14 years ago)

Author:

landauf

Message:

replaced UTFStringConversions.h by DisplayStringConversions.h which does basically the same but only if OGRE_UNICODE_SUPPORT is true.

this allows us to build orxonox with the latest release of mingw and this also fixes the broken fonts.

Location:

code/branches/presentation2/src

Files:

• libraries/util/DisplayStringConversions.h (moved) (moved from code/branches/presentation2/src/libraries/util/UTFStringConversions.h) (1 diff)
• modules/overlays/hud/ChatOverlay.cc (modified) (3 diffs)
• modules/overlays/hud/ChatOverlay.h (modified) (2 diffs)
• orxonox/overlays/InGameConsole.cc (modified) (4 diffs)

code/branches/presentation2/src/libraries/util/DisplayStringConversions.h

@@ -33 +33 @@
 */
 
-#ifndef _UTFStringConversions_H__
-#define _UTFStringConversions_H__
+#ifndef _DisplayStringConversions_H__
+#define _DisplayStringConversions_H__
 
 #include "UtilPrereqs.h"
-#include <OgreUTFString.h>
+#include <OgreOverlayElement.h>
 
-namespace orxonox
-{
-    template <>
-    struct ConverterExplicit<std::string, Ogre::UTFString>
+#if OGRE_UNICODE_SUPPORT
+    #include <OgreUTFString.h>
+
+    namespace orxonox
     {
-        //! Converts an std::string into an Ogre::UTFString
-        inline static bool convert(Ogre::UTFString* output, const std::string& input)
+        template <>
+        struct ConverterExplicit<std::string, Ogre::DisplayString>
         {
-            Ogre::UTFString::code_point cp;
-            for (unsigned int i = 0; i < input.size(); ++i)
+            //! Converts an std::string into an Ogre::UTFString
+            inline static bool convert(Ogre::DisplayString* output, const std::string& input)
             {
-              cp = input[i];
-              cp &= 0xFF;
-              output->append(1, cp);
+                Ogre::UTFString::code_point cp;
+                for (unsigned int i = 0; i < input.size(); ++i)
+                {
+                  cp = input[i];
+                  cp &= 0xFF;
+                  output->append(1, cp);
+                }
+                return true;
             }
-            return true;
-        }
-    };
-}
+        };
+    }
+#else
+    namespace orxonox
+    {
+        template <>
+        struct ConverterExplicit<std::string, Ogre::DisplayString>
+        {
+            //! Converts an std::string into an Ogre::String
+            inline static bool convert(Ogre::DisplayString* output, const std::string& input)
+            {
+                *output = input;
+                return true;
+            }
+        };
+    }
+#endif
 
-#endif /* _UTFStringConversions_H__ */
+#endif /* _DisplayStringConversions_H__ */

code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.cc

@@ -33 +33 @@
 
 #include "util/Convert.h"
-#include "util/UTFStringConversions.h"
+#include "util/DisplayStringConversions.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -86 +86 @@
         }
 
-        this->messages_.push_back(multi_cast<Ogre::UTFString>(text));
+        this->messages_.push_back(multi_cast<Ogre::DisplayString>(text));
         COUT(0) << "Chat: " << text << std::endl;
 
@@ -110 +110 @@
         this->text_->setCaption("");
 
-        for (std::list<Ogre::UTFString>::reverse_iterator it = this->messages_.rbegin(); it != this->messages_.rend(); ++it)
+        for (std::list<Ogre::DisplayString>::reverse_iterator it = this->messages_.rbegin(); it != this->messages_.rend(); ++it)
         {
             this->text_->setCaption(this->text_->getCaption() + "\n" + (*it));

code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.h

@@ -33 +33 @@
 
 #include <list>
-#include <OgreUTFString.h>
+#include <OgreOverlayElement.h>
 
 #include "network/ChatListener.h"
@@ -51 +51 @@
             virtual void incomingChat(const std::string& message, unsigned int senderID);
 
-            std::list<Ogre::UTFString> messages_;
+            std::list<Ogre::DisplayString> messages_;
 
         private:

code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc

@@ -44 +44 @@
 #include "util/Convert.h"
 #include "util/Math.h"
-#include "util/UTFStringConversions.h"
+#include "util/DisplayStringConversions.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -477 +477 @@
                 {
                     ++linesUsed;
-                    this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::UTFString>(output.substr(0, this->maxCharsPerLine_)));
+                    this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::DisplayString>(output.substr(0, this->maxCharsPerLine_)));
                     output.erase(0, this->maxCharsPerLine_);
                     output.insert(0, 1, ' ');
@@ -484 +484 @@
                     this->colourLine(level, index);
                 }
-                this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::UTFString>(output));
+                this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::DisplayString>(output));
                 this->displayedText_ = output;
                 this->numLinesShifted_ = linesUsed;
@@ -502 +502 @@
                   this->inputWindowStart_ = 0;
                 this->displayedText_ = output;
-                this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::UTFString>(output));
+                this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::DisplayString>(output));
             }
         }