Changeset 6135 for code/branches/presentation2/src/libraries

Timestamp:

Nov 24, 2009, 2:17:38 AM (15 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.

File:

• code/branches/presentation2/src/libraries/util/DisplayStringConversions.h (moved) (moved from code/branches/presentation2/src/libraries/util/UTFStringConversions.h) (1 diff)

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__ */