gosu 0.7.20 → 0.7.21

data/Gosu/Audio.hpp

@@ -5,6 +5,7 @@
 #define GOSU_AUDIO_HPP
 
 #ifdef WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 #include <Gosu/Fwd.hpp>

data/Gosu/Color.hpp

@@ -146,6 +146,11 @@ namespace Gosu
     // require 'gosu'; include Gosu
     // works from within Ruby, the #ifndef guard can be removed.
     #ifndef SWIG
+    inline bool operator<(Color a, Color b)
+    {
+        return a.argb() < b.argb();
+    }
+    
     inline bool operator==(Color a, Color b)
     {
         return a.argb() == b.argb();

data/Gosu/Font.hpp

@@ -7,6 +7,7 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
+#include <Gosu/Platform.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <string>
 
@@ -45,6 +46,7 @@ namespace Gosu
         double textWidth(const std::wstring& text, double factorX = 1) const;
         
         //! Draws text so the top left corner of the text is at (x; y).
+        //! \param text Formatted text without line-breaks.
         void draw(const std::wstring& text, double x, double y, ZPos z,
             double factorX = 1, double factorY = 1,
             Color c = Color::WHITE, AlphaMode mode = amDefault) const;
@@ -59,6 +61,9 @@ namespace Gosu
             double relX, double relY, double factorX = 1, double factorY = 1,
             Color c = Color::WHITE, AlphaMode mode = amDefault) const;
         
+        #ifndef SWIG
+        GOSU_DEPRECATED
+        #endif
         //! Analogous to draw, but rotates the text by a given angle.
         void drawRot(const std::wstring& text, double x, double y, ZPos z, double angle,
             double factorX = 1, double factorY = 1,

data/Gosu/Graphics.hpp

@@ -7,6 +7,7 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
+#include <boost/array.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <memory>
 
@@ -24,6 +25,12 @@ namespace Gosu
     // (Held back until it will not cause a stock Ubuntu to crash. Don't ask me!)
     //extern unsigned const MAX_TEXTURE_SIZE;
     
+    typedef boost::array<double, 16> Transform;
+    Transform rotate(double angle, double aroundX = 0, double aroundY = 0);
+    Transform translate(double x, double y);
+    Transform scale(double factor);
+    Transform scale(double factorX, double factorY);
+    
     //! Serves as the target of all drawing and provides basic drawing
     //! functionality.
     //! Usually created by Gosu::Window.
@@ -66,6 +73,11 @@ namespace Gosu
         //! Finishes building the macro and returns it as a drawable object.
         //! Most usually, the return value is passed to Image::Image().
         std::auto_ptr<Gosu::ImageData> endRecording();
+        
+        //! Pushes one transformation onto the transformation stack.
+        void pushTransform(const Transform& transform);
+        //! Pops one transformation from the transformation stack.
+        void popTransform();
 
         //! Draws a line from one point to another (last pixel exclusive).
         void drawLine(double x1, double y1, Color c1,

data/Gosu/GraphicsBase.hpp

@@ -35,9 +35,10 @@ namespace Gosu
     
     enum FontFlags
     {
-        ffBold      = 1,
-        ffItalic    = 2,
-        ffUnderline = 4
+        ffBold         = 1,
+        ffItalic       = 2,
+        ffUnderline    = 4,
+        ffCombinations = 8
     };
     
     enum TextAlign

data/Gosu/ImageData.hpp

@@ -42,6 +42,7 @@ namespace Gosu
             ZPos z, AlphaMode mode) const = 0;
             
         virtual boost::optional<GLTexInfo> glTexInfo() const = 0;
+        virtual Bitmap toBitmap() const = 0;
     };
 }
 

data/Gosu/Input.hpp

@@ -9,6 +9,7 @@
 
 #ifdef GOSU_IS_WIN
 #include <Gosu/ButtonsWin.hpp>
+#define NOMINMAX
 #include <windows.h>
 #endif
 

data/Gosu/Platform.hpp

@@ -62,4 +62,12 @@ namespace Gosu
 # endif
 #endif
 
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+# define GOSU_DEPRECATED  __attribute__((__deprecated__))
+#elif defined(GOSU_IS_WIN)
+# define GOSU_DEPRECATED __declspec(deprecated)
+#else
+# define GOSU_DEPRECATED 
+#endif
+
 #endif

data/Gosu/Text.hpp

@@ -15,14 +15,18 @@ namespace Gosu
     //! platform.
     std::wstring defaultFontName();
 
-    //! Returns the width a text would span on a bitmap if it were drawn
-    //! using drawText with the same arguments.
+    //! Returns the width an unformatted line of text would span on a bitmap if it were drawn using
+    //! drawText with the same arguments. This is a very low-level function that does not understand
+    //! any of Gosu's HTML-like markup.
+    //! \param text Unformatted text.
     //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/', does not work on Linux).
     unsigned textWidth(const std::wstring& text,
         const std::wstring& fontName, unsigned fontHeight,
         unsigned fontFlags = 0);
 
-    //! Draws a line of text on a bitmap.
+    //! Draws a line of unformatted text on a bitmap. This is a very low-level function that does not understand
+    //! any of Gosu's HTML-like markup.
+    //! \param text Unformatted text.
     //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/', does not work on Linux).
     //! \param fontHeight Height, in pixels, of the text.
     //! \param fontFlags Binary combination of members of the FontFlags
@@ -31,8 +35,9 @@ namespace Gosu
         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.
+    //! Creates a bitmap that is filled with a line of formatted text given to the function.
+    //! The line can contain line breaks and HTML-like markup.
+    //! \param text Formatted text.
     //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/', does not work on Linux).
     //! \param fontHeight Height of the font in pixels.
     //! \param fontFlags Binary combination of members of the FontFlags
@@ -41,8 +46,9 @@ namespace Gosu
         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.
+    //! Creates a bitmap that is filled with the formatted text given to the function.
+    //! The line can contain line breaks and HTML-like markup.
+    //! \param text Formatted text.
     //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/', does not work on Linux).
     //! \param fontHeight Height of the font in pixels.
     //! \param lineSpacing Spacing between two lines of text in pixels.
@@ -55,6 +61,10 @@ namespace Gosu
         const std::wstring& fontName, unsigned fontHeight, 
         unsigned lineSpacing, unsigned maxWidth, TextAlign align,
         unsigned fontFlags = 0);
+    
+    //! Registers a new HTML-style entity that can subsequently be used
+    //! with Gosu::Font and Gosu::createText. The name is given without & and ;.
+    void registerEntity(const std::wstring& name, const Bitmap& replacement);
 }
 
 #endif

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 20
-#define GOSU_VERSION "0.7.20"
+#define GOSU_POINT_VERSION 21
+#define GOSU_VERSION "0.7.21"
 
 #endif

data/Gosu/Window.hpp

@@ -13,6 +13,7 @@
 #include <string>
 
 #ifdef GOSU_IS_WIN
+#define NOMINMAX
 #include <windows.h>
 #endif
 
@@ -100,11 +101,10 @@ namespace Gosu
         const Touches& currentTouches() const;
         #endif        
         
+        GOSU_DEPRECATED const Audio& audio() const;
+        GOSU_DEPRECATED Audio& audio();
+
         #endif
-        
-        // Deprecated.
-        const Audio& audio() const;
-        Audio& audio();
     };
 }
 

data/GosuImpl/Audio/AudioSDL.cpp

@@ -293,6 +293,10 @@ void Gosu::Song::changeVolume(double volume) {
     Mix_VolumeMusic(trunc(data->volume * MIX_MAX_VOLUME));
 }
 
+void Gosu::Song::update()
+{
+}
+
 // Deprecated constructors.
 
 Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)

data/GosuImpl/Graphics/BitmapPNG.cpp

@@ -241,7 +241,7 @@ Gosu::Writer Gosu::saveToPNG(const Bitmap& bmp, Writer writer)
     tmpWriteStream = &writer;  // No more experimental.
     png_set_write_fn(pngPtr, png_get_io_ptr(pngPtr), writePNGdata, flushPNGdata);
 
-    png_set_IHDR(pngPtr, infoPtr, bmp.width(), bmp.height(), 8, PNG_COLOR_TYPE_RGB,
+    png_set_IHDR(pngPtr, infoPtr, bmp.width(), bmp.height(), 8, PNG_COLOR_TYPE_RGBA,
         PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
     png_write_info(pngPtr, infoPtr);
@@ -250,12 +250,13 @@ Gosu::Writer Gosu::saveToPNG(const Bitmap& bmp, Writer writer)
     rows = new png_bytep[bmp.height()];
     for(unsigned int y = 0; y < bmp.height(); y++)
     {
-        rows[y] = new png_byte[bmp.width() * 3];
-        for(unsigned int x = 0; x < bmp.width()*3; x += 3)
+        rows[y] = new png_byte[bmp.width() * 4];
+        for(unsigned int x = 0; x < bmp.width()*4; x += 4)
         {
-            rows[y][x] = bmp.getPixel(x/3, y).red();
-            rows[y][x+1] = bmp.getPixel(x/3, y).green();
-            rows[y][x+2] = bmp.getPixel(x/3, y).blue();
+            rows[y][x] = bmp.getPixel(x/4, y).red();
+            rows[y][x+1] = bmp.getPixel(x/4, y).green();
+            rows[y][x+2] = bmp.getPixel(x/4, y).blue();
+            rows[y][x+3] = bmp.getPixel(x/4, y).alpha();
         }
     }
 

data/GosuImpl/Graphics/Common.hpp

@@ -1,9 +1,12 @@
 #ifndef GOSUIMPL_GRAPHICS_COMMON_HPP
 #define GOSUIMPL_GRAPHICS_COMMON_HPP
 
+#include <Gosu/Bitmap.hpp>
+#include <Gosu/Graphics.hpp>
 #include <Gosu/Platform.hpp>
 
 #if defined(GOSU_IS_WIN)
+#define NOMINMAX
 #include <windows.h>
 #include <GL/gl.h>
 #elif defined(GOSU_IS_IPHONE)
@@ -16,6 +19,7 @@
 #endif
 
 #include <algorithm>
+#include <list>
 #include <vector>
 
 namespace Gosu
@@ -24,6 +28,7 @@ namespace Gosu
     class TexChunk;
     struct DrawOp;
     class DrawOpQueue;
+    typedef std::list<Transform> Transforms;
     typedef std::vector<DrawOpQueue> DrawOpQueueStack;
     class Macro;
     
@@ -46,6 +51,29 @@ namespace Gosu
             std::swap(c3, c4);
         }
     }
+    
+    inline Transform multiply(const Transform& left, const Transform& right)
+    {
+        Gosu::Transform result;
+        result.assign(0);
+        for (int i = 0; i < 16; ++i)
+            for (int j = 0; j < 4; ++j)
+                result[i] += left[i / 4 * 4 + j] * right[i % 4 + j * 4];
+        return result;
+    }
+    
+    inline void multiplyBitmapAlpha(Bitmap& bmp, Color::Channel alpha)
+    {
+        for (int y = 0; y < bmp.height(); ++y)
+            for (int x = 0; x < bmp.width(); ++x)
+            {
+                Color c = bmp.getPixel(x, y);
+                c.setAlpha(c.alpha() * alpha / 255);
+                bmp.setPixel(x, y, c);
+            }
+    }
+    
+    const Bitmap& entityBitmap(const std::wstring& name);
 }
 
 #endif

data/GosuImpl/Graphics/DrawOp.hpp

@@ -24,6 +24,7 @@ namespace Gosu
     
     struct DrawOp
     {
+        Gosu::Transform* transform;
         int clipX, clipY;
         unsigned clipWidth, clipHeight;
             
@@ -41,17 +42,24 @@ namespace Gosu
         const TexChunk* chunk;
         AlphaMode mode;
 
-        DrawOp() { clipWidth = 0xffffffff; usedVertices = 0; chunk = 0; }
+        DrawOp(Gosu::Transform& transform) : transform(&transform) { clipWidth = 0xffffffff; usedVertices = 0; chunk = 0; }
         
 #ifndef GOSU_IS_IPHONE
-        void perform(GLuint& currentTexName, const void*) const
+        void perform(GLuint& currentTexName, Transform*& currentTransform, const void*) const
         {
             if (clipWidth != 0xffffffff)
             {
                 glEnable(GL_SCISSOR_TEST);
                 glScissor(clipX, clipY, clipWidth, clipHeight);
             }
-        
+            
+            if (transform != currentTransform) {
+                glPopMatrix();
+                glPushMatrix();
+                glMultMatrixd(transform->data());
+                currentTransform = transform;
+            }
+            
             if (mode == amAdditive)
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
             else if (mode == amMultiply)
@@ -113,7 +121,7 @@ namespace Gosu
                 glDisable(GL_SCISSOR_TEST);
         }
 #else
-        void perform(unsigned& currentTexName, const DrawOp* next) const
+        void perform(unsigned& currentTexName, Transform*& currentTransform, const DrawOp* next) const
         {
             if (usedVertices != 4)
                 return; // No triangles, no lines on iPhone
@@ -140,6 +148,13 @@ namespace Gosu
                 isSetup = true;
             }
             
+            if (transform != currentTransform) {
+                glPopMatrix();
+                glPushMatrix();
+                glMultMatrixd(transform->data());
+                currentTransform = transform;
+            }
+            
             if (clipWidth != 0xffffffff)
             {
                 glEnable(GL_SCISSOR_TEST);
@@ -283,7 +298,11 @@ namespace Gosu
             if (z == zImmediate)
             {
                 GLuint currentTexName = NO_TEXTURE;
-                op.perform(currentTexName, 0);
+                Transform* currentTransform = 0;
+                glMatrixMode(GL_MODELVIEW);
+                glPushMatrix();
+                op.perform(currentTexName, currentTransform, 0);
+                glPopMatrix();
                 if (currentTexName != NO_TEXTURE)
                     glDisable(GL_TEXTURE_2D);
             }
@@ -308,15 +327,21 @@ namespace Gosu
         void performDrawOps() const
         {
             GLuint currentTexName = NO_TEXTURE;
+            Transform* currentTransform = 0;
+            
+            glMatrixMode(GL_MODELVIEW);
+            glPushMatrix();
             
             std::multiset<DrawOp>::const_iterator last, cur = set.begin(), end = set.end();
             while (cur != end)
             {
                 last = cur;
                 ++cur;
-                last->perform(currentTexName, cur == end ? 0 : &*cur);
+                last->perform(currentTexName, currentTransform, cur == end ? 0 : &*cur);
             }
             
+            glPopMatrix();
+            
             if (currentTexName != NO_TEXTURE)
                 glDisable(GL_TEXTURE_2D);
         }

data/GosuImpl/Graphics/Font.cpp

@@ -3,7 +3,11 @@
 #include <Gosu/Image.hpp>
 #include <Gosu/Math.hpp>
 #include <Gosu/Text.hpp>
+#include <GosuImpl/Graphics/Common.hpp>
+#include <GosuImpl/Graphics/FormattedString.hpp>
 #include <boost/array.hpp>
+#include <boost/shared_ptr.hpp>
+#include <map>
 using namespace std;
 
 namespace
@@ -28,25 +32,39 @@ struct Gosu::Font::Impl
 {
     Graphics* graphics;
     wstring name;
-    unsigned height;
-    unsigned flags;
+    unsigned height, flags;
 
     // Chunk of 2^16 characters (on Windows, there'll only be one of them).
     // IMPR: I couldn't find a way to determine the size of wchar_t at compile
     // time, so I can't get rid of the magic numbers or even do some #ifdef
     // magic.
     typedef boost::array<boost::scoped_ptr<Image>, 65536> CharChunk;
-    boost::scoped_ptr<CharChunk> chunks[65536];
+    boost::scoped_ptr<CharChunk> chunks[65536][ffCombinations];
+    
+    std::map<std::wstring, boost::shared_ptr<Image> > entityCache;
 
-    Image& getChar(wchar_t wc)
+    const Image& imageAt(const FormattedString& fs, unsigned i)
     {
+        if (fs.entityAt(i))
+        {
+            boost::shared_ptr<Image>& ptr = entityCache[fs.entityAt(i)];
+            if (!ptr)
+                ptr.reset(new Image(*graphics, entityBitmap(fs.entityAt(i)), false));
+            return *ptr;
+        }
+        
+        wchar_t wc = fs.charAt(i);
+        unsigned flags = fs.flagsAt(i);
+        
+        assert(flags < ffCombinations);
+    
         size_t chunkIndex = wc / 65536;
         size_t charIndex = wc % 65536;
 
-        if (!chunks[chunkIndex])
-            chunks[chunkIndex].reset(new CharChunk);
+        if (!chunks[chunkIndex][flags])
+            chunks[chunkIndex][flags].reset(new CharChunk);
 
-        boost::scoped_ptr<Image>& imgPtr = (*chunks[chunkIndex])[charIndex];
+        boost::scoped_ptr<Image>& imgPtr = (*chunks[chunkIndex][flags])[charIndex];
 
         if (imgPtr)
             return *imgPtr;
@@ -62,6 +80,14 @@ struct Gosu::Font::Impl
         imgPtr.reset(new Image(*graphics, bmp));
         return *imgPtr;
     }
+    
+    double factorAt(const FormattedString& fs, unsigned index) const
+    {
+        if (fs.entityAt(index))
+            return 1;
+        else
+            return 0.5;
+    }
 };
 
 Gosu::Font::Font(Graphics& graphics, const wstring& fontName, unsigned fontHeight,
@@ -70,7 +96,7 @@ Gosu::Font::Font(Graphics& graphics, const wstring& fontName, unsigned fontHeigh
 {
     pimpl->graphics = &graphics;
     pimpl->name = fontName;
-    pimpl->height = fontHeight * 2; // Auto-AA!
+    pimpl->height = fontHeight * 2;
     pimpl->flags = fontFlags;
 }
 
@@ -95,24 +121,29 @@ unsigned Gosu::Font::flags() const
 
 double Gosu::Font::textWidth(const std::wstring& text, double factorX) const
 {
+    FormattedString fs(text, flags());
     double result = 0;
-    for (unsigned i = 0; i < text.length(); ++i)
-        result += pimpl->getChar(text[i]).width();
-    return result * factorX / 2;
+    for (unsigned i = 0; i < fs.length(); ++i)
+        result += pimpl->imageAt(fs, i).width() * pimpl->factorAt(fs, i);
+    return result * factorX;
 }
 
 void Gosu::Font::draw(const wstring& text, double x, double y, ZPos z,
     double factorX, double factorY, Color c, AlphaMode mode) const
 {
-    factorX /= 2;
-    factorY /= 2;
+    FormattedString fs(text, flags());
+
     enum {
         LTR = 1,
         RTL = -1
     } dir = LTR;
 
-    for (unsigned i = 0; i < text.length(); ++i)
+    for (unsigned i = 0; i < fs.length(); ++i)
     {
+        /*
+        
+        Sorry, LTR/RTL support taken out until somebody uses it
+        
         if (isLtrChar(text[i]))
         {
             if (dir == RTL)
@@ -124,18 +155,25 @@ void Gosu::Font::draw(const wstring& text, double x, double y, ZPos z,
             if (dir == LTR)
                 x += 2 * textWidth(text.substr(i + 1, wstring::npos)) * factorX, dir = RTL;
             continue;
-        }
-    
-        Image& curChar = pimpl->getChar(text[i]);
-        if (dir == LTR)
-            curChar.draw(x, y, z, factorX, factorY, c, mode);
+        }*/
+        
+        const Image& curChar = pimpl->imageAt(fs, i);
+        double curFactor;
+        Gosu::Color color;
+        if (fs.entityAt(i))
+            curFactor = 1.0, color = Gosu::Color(fs.colorAt(i).alpha() * c.alpha() / 255, 255, 255, 255);
         else
-            curChar.draw(x - curChar.width() * factorX, y, z, factorX, factorY, c, mode);
+            curFactor = 0.5, color = Gosu::multiply(fs.colorAt(i), c);
+
+        //if (dir == LTR)
+            curChar.draw(x, y, z, factorX * curFactor, factorY * curFactor, color, mode);
+        //else
+        //    curChar.draw(x - curChar.width() * factorX, y, z, factorX, factorY, c, mode);
         
-        x += curChar.width() * factorX * dir;
+        x += curChar.width() * factorX * curFactor * dir;
     }
 }
-                     
+
 void Gosu::Font::drawRel(const wstring& text, double x, double y, ZPos z,
     double relX, double relY, double factorX, double factorY, Color c,
     AlphaMode mode) const
@@ -149,16 +187,7 @@ void Gosu::Font::drawRel(const wstring& text, double x, double y, ZPos z,
 void Gosu::Font::drawRot(const wstring& text, double x, double y, ZPos z, double angle,
     double factorX, double factorY, Color c, AlphaMode mode) const
 {
-    factorX /= 2;
-    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]);
-        curChar.drawRot(x, y, z, angle, 0.0, 0.0, factorX, factorY, c, mode);
-        x += curChar.width() * factorX * stepX;
-        y += curChar.width() * factorX * stepY;
-    }
+    pimpl->graphics->pushTransform(rotate(angle, x, y));
+    draw(text, x, y, z, factorX, factorY, c, mode);
+    pimpl->graphics->popTransform();
 }