gosu 0.7.10.3 → 0.7.11

data/Gosu/ButtonsMac.hpp

@@ -32,6 +32,32 @@ namespace Gosu
         kb8 = 0x1c,
         kb9 = 0x19,
         kb0 = 0x1d,
+        kbA	= 0x00,
+        kbB	= 0x0b,
+        kbC	= 0x08,
+        kbD	= 0x02,
+        kbE	= 0x0e,
+        kbF	= 0x03,
+        kbG	= 0x05,
+        kbH	= 0x04,
+        kbI	= 0x22,
+        kbJ	= 0x26,
+        kbK	= 0x28,
+        kbL	= 0x25,
+        kbM	= 0x2e,
+        kbN	= 0x2d,
+        kbO	= 0x1f,
+        kbP	= 0x23,
+        kbQ	= 0x0c,
+        kbR	= 0x0f,
+        kbS	= 0x01,
+        kbT	= 0x11,
+        kbU	= 0x20,
+        kbV	= 0x09,
+        kbW	= 0x0d,
+        kbX	= 0x07,
+        kbY	= 0x10,
+        kbZ	= 0x06,
         kbTab = 0x30,
         kbReturn = 0x24,
         kbSpace = 0x31,

data/Gosu/ButtonsWin.hpp

@@ -52,6 +52,32 @@ namespace Gosu
 		kbPageUp = 0xc9,
 		kbPageDown = 0xd1,
 		kbEnter = 0x9c,
+		kbA = 0x1e,
+		kbB = 0x30,
+		kbC = 0x2e,
+		kbD = 0x20,
+		kbE = 0x12,
+		kbF = 0x21,
+		kbG = 0x22,
+		kbH = 0x23,
+		kbI = 0x17,
+		kbJ = 0x24,
+		kbK = 0x25,
+		kbL = 0x26,
+		kbM = 0x32,
+		kbN = 0x31,
+		kbO = 0x18,
+		kbP = 0x19,
+		kbQ = 0x10,
+		kbR = 0x13,
+		kbS = 0x1f,
+		kbT = 0x14,
+		kbU = 0x16,
+		kbV = 0x2f,
+		kbW = 0x11,
+		kbX = 0x2d,
+		kbY = 0x15,
+		kbZ = 0x2c,
 		kbNumpad0 = 0x52,
 		kbNumpad1 = 0x4f,
 		kbNumpad2 = 0x50,

data/Gosu/ButtonsX.hpp

@@ -9,6 +9,32 @@ namespace Gosu
     enum ButtonName
     {
         kbRangeBegin = 0x01,
+        kbA = 'a',
+        kbB = 'b',
+        kbC = 'c',
+        kbD = 'd',
+        kbE = 'e',
+        kbF = 'f',
+        kbG = 'g',
+        kbH = 'h',
+        kbI = 'i',
+        kbJ = 'j',
+        kbK = 'k',
+        kbL = 'l',
+        kbM = 'm',
+        kbN = 'n',
+        kbO = 'o',
+        kbP = 'p',
+        kbQ = 'q',
+        kbR = 'r',
+        kbS = 's',
+        kbT = 't',
+        kbU = 'u',
+        kbV = 'v',
+        kbW = 'w',
+        kbX = 'x',
+        kbY = 'y',
+        kbZ = 'z',
         kbEscape = XK_Escape,
         kbF1 = XK_F1,
         kbF2 = XK_F2,

data/Gosu/Gosu.hpp

@@ -21,6 +21,7 @@
 #include <Gosu/Text.hpp>
 #include <Gosu/TextInput.hpp>
 #include <Gosu/Timing.hpp>
+#include <Gosu/Utility.hpp>
 #include <Gosu/Window.hpp>
 
 #endif

data/Gosu/Graphics.hpp

@@ -40,7 +40,7 @@ namespace Gosu
         double factorY() const;
         void setResolution(unsigned virtualWidth, unsigned virtualHeight);
         // End of Undocumented
-
+        
         unsigned width() const;
         unsigned height() const;
         bool fullscreen() const;

data/Gosu/Input.hpp

@@ -58,9 +58,8 @@ namespace Gosu
 		return !(lhs == rhs);
 	}
 	
-    //! Manages initialization and shutdown of the input system; only one Input
-	//! instance can live per application. (Should this limitation ever get into
-	//! anyone's way, I will happily remove it; until then, I practice YAGNI.)
+    //! Manages initialization and shutdown of the input system. Only one Input
+	//! instance can exist per application.
     class Input
     {
         struct Impl;
@@ -82,7 +81,7 @@ namespace Gosu
         #endif
         
         ~Input();
-
+        
         //! Returns the character a button usually produces, or 0.
         static wchar_t idToChar(Button btn);
         //! Returns the button that has to be pressed to produce the
@@ -91,7 +90,7 @@ namespace Gosu
         
 		//! Returns true if a button is currently pressed.
 		bool down(Button btn) const;
-
+        
         //! Returns the horizontal position of the mouse relative to the top
         //! left corner of the window given to Input's constructor.
         double mouseX() const;

data/Gosu/Math.hpp

@@ -29,6 +29,17 @@ namespace Gosu
     //! to call std::srand before using it).
     double random(double min, double max);
 
+    //! Translates between Gosu's angle system and radians.
+    inline double gosuToRadians(double angle)
+    {
+        return (angle - 90) * pi / 180;
+    }
+    //! Translates between Gosu's angle system and radians.
+    inline double radiansToGosu(double angle)
+    {
+        return angle * 180 / pi + 90;
+    }
+
     //! Returns the horizontal distance between the origin and the point to
     //! which you would get if you moved radius pixels in the direction
     //! specified by angle.

data/Gosu/Text.hpp

@@ -1,47 +1,59 @@
-//! \file Text.hpp
-//! Functions to output text on bitmaps.
-
-#ifndef GOSU_TEXT_HPP
-#define GOSU_TEXT_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <string>
-
-namespace Gosu
-{
-    //! Returns the name of a neutral font that is available on the current
-    //! platform.
-    std::wstring defaultFontName();
-
-    //! Returns the width a text would span on a bitmap if it were drawn
-    //! using drawText with the same arguments.
-    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
-    unsigned textWidth(const std::wstring& text,
-        const std::wstring& fontName, unsigned fontHeight,
-        unsigned fontFlags = 0);
-
-    //! Draws a line of text on a bitmap.
-    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
-    //! \param fontHeight Height, in pixels, of the text.
-    //! \param fontFlags Binary combination of members of the FontFlags
-    //! enum.
-    void drawText(Bitmap& bitmap, const std::wstring& text, int x, int y,
-        Color c, const std::wstring& fontName, unsigned fontHeight,
-        unsigned fontFlags = 0);
-
-    //! Creates a bitmap that is filled with the text given to the function.
-    //! The text may contain line breaks.
-    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
-    //! \param fontHeight Height of the font in pixels.
-    //! \param lineSpacing Spacing between two lines of text in pixels.
-    //! \param maxWidth Maximal width of the bitmap that will be returned. Text
-    //! will be split into multiple lines to avoid drawing over the right
-    //! border. When a single word is too long, it will be truncated.
-    Bitmap createText(const std::wstring& text,
-        const std::wstring& fontName, unsigned fontHeight, 
-        unsigned lineSpacing, unsigned maxWidth, TextAlign align,
-        unsigned fontFlags = 0);
-}
-
-#endif
+//! \file Text.hpp
+//! Functions to output text on bitmaps.
+
+#ifndef GOSU_TEXT_HPP
+#define GOSU_TEXT_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/GraphicsBase.hpp>
+#include <string>
+
+namespace Gosu
+{
+    //! Returns the name of a neutral font that is available on the current
+    //! platform.
+    std::wstring defaultFontName();
+
+    //! Returns the width a text would span on a bitmap if it were drawn
+    //! using drawText with the same arguments.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    unsigned textWidth(const std::wstring& text,
+        const std::wstring& fontName, unsigned fontHeight,
+        unsigned fontFlags = 0);
+
+    //! Draws a line of text on a bitmap.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    //! \param fontHeight Height, in pixels, of the text.
+    //! \param fontFlags Binary combination of members of the FontFlags
+    //! enum.
+    void drawText(Bitmap& bitmap, const std::wstring& text, int x, int y,
+        Color c, const std::wstring& fontName, unsigned fontHeight,
+        unsigned fontFlags = 0);
+
+    //! Creates a bitmap that is filled with a line of text given to the function.
+    //! The line cannot contain line breaks.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    //! \param fontHeight Height of the font in pixels.
+    //! \param fontFlags Binary combination of members of the FontFlags
+    //! enum.
+    Bitmap createText(const std::wstring& text,
+        const std::wstring& fontName, unsigned fontHeight,
+        unsigned fontFlags = 0);
+
+    //! Creates a bitmap that is filled with the text given to the function.
+    //! The text may contain line breaks.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    //! \param fontHeight Height of the font in pixels.
+    //! \param lineSpacing Spacing between two lines of text in pixels.
+    //! \param maxWidth Width of the bitmap that will be returned. Text
+    //! will be split into multiple lines to avoid drawing over the right
+    //! border. When a single word is too long, it will be truncated.
+    //! \param fontFlags Binary combination of members of the FontFlags
+    //! enum.
+    Bitmap createText(const std::wstring& text,
+        const std::wstring& fontName, unsigned fontHeight, 
+        unsigned lineSpacing, unsigned maxWidth, TextAlign align,
+        unsigned fontFlags = 0);
+}
+
+#endif

data/Gosu/Utility.hpp

@@ -12,13 +12,14 @@
 namespace Gosu
 {
     //! Converts an std::string into an std::wstring.
-    std::wstring widen(const std::string& s);
-    //! Converts an std::wstring into an std::string.
-    std::string narrow(const std::wstring& ws);
-    
-    // Undocumented, temporary: Please ignore. ;)
     std::wstring utf8ToWstring(const std::string& utf8);
+    //! Converts an std::wstring into an std::string.
     std::string wstringToUTF8(const std::wstring& ws);
+
+    //! Converts an std::string into an std::wstring using local encoding.
+    std::wstring widen(const std::string& s);
+    //! Converts an std::wstring into an std::string using local encoding.
+    std::string narrow(const std::wstring& ws);
 }
 
 #endif

data/GosuImpl/Graphics/Font.cpp

@@ -6,6 +6,24 @@
 #include <boost/array.hpp>
 using namespace std;
 
+namespace
+{
+    bool isRtlChar(wchar_t wc)
+    {
+        return wc == 0x202e;
+    }
+    
+    bool isLtrChar(wchar_t wc)
+    {
+        return wc == 0x202d;
+    }
+    
+    bool isFormattingChar(wchar_t wc)
+    {
+        return isLtrChar(wc) || isRtlChar(wc);
+    }
+}
+
 struct Gosu::Font::Impl
 {
     Graphics* graphics;
@@ -33,6 +51,8 @@ struct Gosu::Font::Impl
             return *imgPtr;
 
         wstring charString(1, wc);
+        if (isFormattingChar(wc))
+            charString.clear(); // Don't draw formatting characters
         unsigned charWidth = Gosu::textWidth(charString, fontName, height, ffBold);
         Bitmap bmp;
         bmp.resize(charWidth, height);
@@ -73,12 +93,33 @@ void Gosu::Font::draw(const wstring& text, double x, double y, ZPos z,
 {
     factorX /= 2;
     factorY /= 2;
+    enum {
+        LTR = 1,
+        RTL = -1
+    } dir = LTR;
 
     for (unsigned i = 0; i < text.length(); ++i)
     {
+        if (isLtrChar(text[i]))
+        {
+            if (dir == RTL)
+                x -= 2 * textWidth(text.substr(i + 1, wstring::npos)) * factorX, dir = LTR;
+            continue;
+        }
+        if (isRtlChar(text[i]))
+        {
+            if (dir == LTR)
+                x += 2 * textWidth(text.substr(i + 1, wstring::npos)) * factorX, dir = RTL;
+            continue;
+        }
+    
         Image& curChar = pimpl->getChar(text[i]);
-        curChar.draw(x, y, z, factorX, factorY, c, mode);
-        x += curChar.width() * factorX;
+        if (dir == LTR)
+            curChar.draw(x, y, z, factorX, factorY, c, mode);
+        else
+            curChar.draw(x - curChar.width() * factorX, y, z, factorX, factorY, c, mode);
+        
+        x += curChar.width() * factorX * dir;
     }
 }
                      
@@ -88,7 +129,7 @@ void Gosu::Font::drawRel(const wstring& text, double x, double y, ZPos z,
 {
     x -= textWidth(text) * factorX * relX;
     y -= height() * factorY * relY;
-
+    
     draw(text, x, y, z, factorX, factorY, c, mode);
 }
 
@@ -99,7 +140,7 @@ void Gosu::Font::drawRot(const wstring& text, double x, double y, ZPos z, double
     factorY /= 2;
     
     double stepX = offsetX(angle + 90, 1.0), stepY = offsetY(angle + 90, 1.0);
-
+    
     for (unsigned i = 0; i < text.length(); ++i)
     {
         Image& curChar = pimpl->getChar(text[i]);

data/GosuImpl/Graphics/Graphics.cpp

@@ -9,6 +9,8 @@
 #include <boost/thread.hpp>
 #endif
 #include <cmath>
+#include <algorithm>
+#include <limits>
 
 struct Gosu::Graphics::Impl
 {
@@ -19,6 +21,7 @@ struct Gosu::Graphics::Impl
     DrawOpQueue queue;
     typedef std::vector<boost::shared_ptr<Texture> > Textures;
     Textures textures;
+
 #if 0
     boost::mutex texMutex;
 #endif
@@ -79,6 +82,11 @@ void Gosu::Graphics::setResolution(unsigned virtualWidth, unsigned virtualHeight
 
     pimpl->virtWidth = virtualWidth;
     pimpl->virtHeight = virtualHeight;
+    /*    
+    pimpl->factorX = pimpl->factorY =
+        std::min(1.0 / virtualWidth * pimpl->physWidth,
+                 1.0 / virtualHeight * pimpl->physHeight);
+    */
     pimpl->factorX = 1.0 / virtualWidth * pimpl->physWidth;
     pimpl->factorY = 1.0 / virtualHeight * pimpl->physHeight;
 }
@@ -99,7 +107,24 @@ bool Gosu::Graphics::begin(Gosu::Color clearWithColor)
 
 void Gosu::Graphics::end()
 {
+    /*double vBarWidth = pimpl->physWidth / factorX() - width();
+    if (vBarWidth > 0)
+    {
+        drawQuad(0, 0, 0x00000000, vBarWidth, 0, 0x00000000,
+                 0, height(), 0x00000000, vBarWidth, height(), 0x00000000,
+                 std::numeric_limits<double>::max());
+    }
+    
+    double hBarHeight = pimpl->physHeight / factorY() - height();
+    if (hBarHeight > 0)
+    {
+        drawQuad(0, 0, 0x00000000, width(), 0, 0x00000000,
+                 0, hBarHeight, 0x00000000, width(), hBarHeight, 0x00000000,
+                 std::numeric_limits<double>::max());
+    }*/
+
     pimpl->queue.performDrawOps();
+
     glFlush();
 }
 

data/GosuImpl/Graphics/Text.cpp

@@ -210,14 +210,38 @@ Gosu::Bitmap Gosu::createText(const std::wstring& text,
     const std::wstring& fontName, unsigned fontHeight, unsigned lineSpacing,
     unsigned maxWidth, TextAlign align, unsigned fontFlags)
 {
+    if (text.empty())
+    {
+        Bitmap emptyBitmap;
+        emptyBitmap.resize(1, fontHeight);
+        return emptyBitmap;
+    }
+    
     // Set up the builder object which will manage all the drawing and
     // conversions for us.
     TextBlockBuilder builder(fontName, fontHeight, fontFlags,
         lineSpacing, maxWidth, align);
-
+    
     // Let the process* functions draw everything.
     processText(builder, text);
-
+    
     // Done!
     return builder.result();
 }
+
+// Very easy special case.
+Gosu::Bitmap Gosu::createText(const std::wstring& text,
+    const std::wstring& fontName, unsigned fontHeight, unsigned fontFlags)
+{
+    if (text.empty())
+    {
+        Bitmap emptyBitmap;
+        emptyBitmap.resize(1, fontHeight);
+        return emptyBitmap;
+    }
+    
+    Gosu::Bitmap bmp;
+    bmp.resize(Gosu::textWidth(text, fontName, fontHeight, fontFlags), fontHeight);
+    drawText(bmp, text, 0, 0, 0xffffffff, fontName, fontHeight, fontFlags);
+    return bmp;
+}