gosu 0.10.9.pre1 → 0.11.0

data/src/Graphics/Image.cpp

@@ -1,193 +0,0 @@
-#include <Gosu/Image.hpp>
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/Graphics.hpp>
-#include <Gosu/ImageData.hpp>
-#include <Gosu/Math.hpp>
-#include <Gosu/IO.hpp>
-#include <stdexcept>
-
-Gosu::Image::Image(const std::wstring& filename, unsigned flags)
-{
-	// Forward.
-	Bitmap bmp;
-	loadImageFile(bmp, filename);
-	Image(bmp, flags).data.swap(data);
-}
-
-Gosu::Image::Image(const std::wstring& filename,
-    unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-    unsigned flags)
-{
-	// Forward.
-	Bitmap bmp;
-	loadImageFile(bmp, filename);
-	Image(bmp, srcX, srcY, srcWidth, srcHeight, flags).data.swap(data);
-}
-
-Gosu::Image::Image(const Bitmap& source, unsigned flags)
-{
-	// Forward.
-	Image(source, 0, 0, source.width(), source.height(), flags).data.swap(data);
-}
-
-Gosu::Image::Image(const Bitmap& source,
-        unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-        unsigned flags)
-:   data(Graphics::createImage(source, srcX, srcY, srcWidth, srcHeight, flags).release())
-{
-}
-
-Gosu::Image::Image(GOSU_UNIQUE_PTR<ImageData> data)
-:   data(data.release())
-{
-    if (this->data.get() == 0)
-        throw std::invalid_argument("Gosu::Image cannot be initialized with an ImageData null pointer");
-}
-
-unsigned Gosu::Image::width() const
-{
-    return data->width();
-}
-
-unsigned Gosu::Image::height() const
-{
-    return data->height();
-}
-
-void Gosu::Image::draw(double x, double y, ZPos z,
-    double factorX, double factorY,
-    Color c,
-    AlphaMode mode) const
-{
-    double x2 = x + width() * factorX;
-    double y2 = y + height() * factorY;
-
-    data->draw(x, y, c, x2, y, c, x, y2, c, x2, y2, c, z, mode);
-}
-
-void Gosu::Image::drawMod(double x, double y, ZPos z,
-    double factorX, double factorY,
-    Color c1, Color c2, Color c3, Color c4,
-    AlphaMode mode) const
-{
-    double x2 = x + width() * factorX;
-    double y2 = y + height() * factorY;
-
-    data->draw(x, y, c1, x2, y, c2, x, y2, c3, x2, y2, c4, z, mode);
-}
-
-void Gosu::Image::drawRot(double x, double y, ZPos z,
-    double angle, double centerX, double centerY,
-    double factorX, double factorY,
-    Color c,
-    AlphaMode mode) const
-{
-    double sizeX = width()  * factorX;
-    double sizeY = height() * factorY;
-    double offsX = offsetX(angle, 1);
-    double offsY = offsetY(angle, 1);
-
-    // Offset to the centers of the original Image's edges when it is rotated
-    // by <angle> degrees.
-    double distToLeftX   = +offsY * sizeX * centerX;
-    double distToLeftY   = -offsX * sizeX * centerX;
-    double distToRightX  = -offsY * sizeX * (1 - centerX);
-    double distToRightY  = +offsX * sizeX * (1 - centerX);
-    double distToTopX    = +offsX * sizeY * centerY;
-    double distToTopY    = +offsY * sizeY * centerY;
-    double distToBottomX = -offsX * sizeY * (1 - centerY);
-    double distToBottomY = -offsY * sizeY * (1 - centerY);
-
-    data->draw(x + distToLeftX  + distToTopX,
-               y + distToLeftY  + distToTopY, c,
-               x + distToRightX + distToTopX,
-               y + distToRightY + distToTopY, c,
-               x + distToLeftX  + distToBottomX,
-               y + distToLeftY  + distToBottomY, c,
-               x + distToRightX + distToBottomX,
-               y + distToRightY + distToBottomY,
-               c, z, mode);
-}
-
-Gosu::ImageData& Gosu::Image::getData() const
-{
-    return *data;
-}
-
-std::vector<Gosu::Image> Gosu::loadTiles(const Bitmap& bmp,
-    int tileWidth, int tileHeight, unsigned flags)
-{
-    int tilesX, tilesY;
-    std::vector<Image> images;
-    
-    if (tileWidth > 0)
-        tilesX = bmp.width() / tileWidth;
-    else
-    {
-        tilesX = -tileWidth;
-        tileWidth = bmp.width() / tilesX;
-    }
-    
-    if (tileHeight > 0)
-        tilesY = bmp.height() / tileHeight;
-    else
-    {
-        tilesY = -tileHeight;
-        tileHeight = bmp.height() / tilesY;
-    }
-    
-    for (int y = 0; y < tilesY; ++y)
-        for (int x = 0; x < tilesX; ++x)
-            images.push_back(Image(bmp, x * tileWidth, y * tileHeight, tileWidth, tileHeight, flags));
-    
-    return images;
-}
-
-std::vector<Gosu::Image> Gosu::loadTiles(const std::wstring& filename,
-    int tileWidth, int tileHeight, unsigned flags)
-{
-    Bitmap bmp;
-    loadImageFile(bmp, filename);
-    return loadTiles(bmp, tileWidth, tileHeight, flags);
-}
-
-// Deprecated constructors.
-
-Gosu::Image::Image(Graphics& graphics, const std::wstring& filename, bool tileable)
-{
-    Image(filename, tileable).data.swap(data);
-}
-
-Gosu::Image::Image(Graphics& graphics, const std::wstring& filename,
-                   unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-                   bool tileable)
-{
-    Image(filename, srcX, srcY, srcWidth, srcHeight, tileable).data.swap(data);
-}
-
-Gosu::Image::Image(Graphics& graphics, const Bitmap& source, bool tileable)
-{
-    Image(source, tileable).data.swap(data);
-}
-
-Gosu::Image::Image(Graphics& graphics, const Bitmap& source,
-                   unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-                   bool tileable)
-{
-    Image(source, srcX, srcY, srcWidth, srcHeight, tileable).data.swap(data);
-}
-
-// Deprecated helpers.
-
-std::vector<Gosu::Image> Gosu::loadTiles(Gosu::Graphics& graphics, const Bitmap& bmp,
-    int tileWidth, int tileHeight, bool tileable)
-{
-    return Gosu::loadTiles(bmp, tileWidth, tileHeight, tileable);
-}
-
-std::vector<Gosu::Image> Gosu::loadTiles(Gosu::Graphics& graphics, const std::wstring& filename,
-    int tileWidth, int tileHeight, bool tileable)
-{
-    return Gosu::loadTiles(filename, tileWidth, tileHeight, tileable);
-}
-

data/src/Graphics/LargeImageData.cpp

@@ -1,133 +0,0 @@
-#include "LargeImageData.hpp"
-#include "Common.hpp"
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/Graphics.hpp>
-#include <Gosu/Math.hpp>
-#include <cmath>
-using namespace std;
-
-Gosu::LargeImageData::LargeImageData(const Bitmap& source,
-    unsigned partWidth, unsigned partHeight, unsigned imageFlags)
-{
-    fullWidth = source.width();
-    fullHeight = source.height();
-    partsX = static_cast<unsigned>(trunc(ceil(1.0 * source.width() / partWidth)));
-    partsY = static_cast<unsigned>(trunc(ceil(1.0 * source.height() / partHeight)));
-    this->partWidth = partWidth;
-    this->partHeight = partHeight;
-
-    parts.resize(partsX * partsY);
-
-    for (unsigned y = 0; y < partsY; ++y)
-        for (unsigned x = 0; x < partsX; ++x)
-        {
-            // The right-most parts don't necessarily have the full width.
-            unsigned srcWidth = partWidth;
-            if (x == partsX - 1 && source.width() % partWidth != 0)
-                srcWidth = source.width() % partWidth;
-
-            // Same for the parts on the bottom.
-            unsigned srcHeight = partHeight;
-            if (y == partsY - 1 && source.height() % partHeight != 0)
-                srcHeight = source.height() % partHeight;
-
-            unsigned localFlags = ifTileable | imageFlags;
-            if (x == 0)
-                localFlags = (localFlags & ~ifTileableLeft) | (imageFlags & ifTileableLeft);
-            if (x == partsX - 1)
-                localFlags = (localFlags & ~ifTileableRight) | (imageFlags & ifTileableRight);
-            if (y == 0)
-                localFlags = (localFlags & ~ifTileableTop) | (imageFlags & ifTileableTop);
-            if (y == partsY - 1)
-                localFlags = (localFlags & ~ifTileableBottom) | (imageFlags & ifTileableBottom);
-            
-            parts[y * partsX + x].reset(Graphics::createImage(source,
-                x * partWidth, y * partHeight, srcWidth, srcHeight,
-                localFlags).release());
-        }
-}
-
-int Gosu::LargeImageData::width() const
-{
-    return fullWidth;
-}
-
-int Gosu::LargeImageData::height() const
-{
-    return fullHeight;
-}
-
-namespace
-{
-    // Local interpolation helper functions.
-
-    double ipl(double a, double b, double ratio)
-    {
-        return a + (b - a) * ratio;
-    }
-
-    Gosu::Color ipl(Gosu::Color a, Gosu::Color b, double ratio)
-    {
-        Gosu::Color result;
-        result.setAlpha(Gosu::round(ipl(a.alpha(), b.alpha(), ratio)));
-        result.setRed  (Gosu::round(ipl(a.red(),   b.red(),   ratio)));
-        result.setGreen(Gosu::round(ipl(a.green(), b.green(), ratio)));
-        result.setBlue (Gosu::round(ipl(a.blue(),  b.blue(),  ratio)));
-        return result;
-    }
-}
-
-void Gosu::LargeImageData::draw(double x1, double y1, Color c1,
-    double x2, double y2, Color c2, double x3, double y3, Color c3,
-    double x4, double y4, Color c4, ZPos z, AlphaMode mode) const
-{
-    if (parts.empty())
-        return;
-
-    reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
-    
-    for (unsigned py = 0; py < partsY; ++py)
-        for (unsigned px = 0; px < partsX; ++px)
-        {
-            ImageData& part = *parts[py * partsX + px];
-
-            double relXL = static_cast<double>(px * partWidth) / width();
-            double relXR = static_cast<double>(px * partWidth + part.width()) / width();
-            double relYT = static_cast<double>(py * partHeight) / height();
-            double relYB = static_cast<double>(py * partHeight + part.height()) / height();
-
-            double absXTL = ipl(ipl(x1, x3, relYT), ipl(x2, x4, relYT), relXL);
-            double absXTR = ipl(ipl(x1, x3, relYT), ipl(x2, x4, relYT), relXR);
-            double absXBL = ipl(ipl(x1, x3, relYB), ipl(x2, x4, relYB), relXL);
-            double absXBR = ipl(ipl(x1, x3, relYB), ipl(x2, x4, relYB), relXR);
-
-            double absYTL = ipl(ipl(y1, y3, relYT), ipl(y2, y4, relYT), relXL);
-            double absYTR = ipl(ipl(y1, y3, relYT), ipl(y2, y4, relYT), relXR);
-            double absYBL = ipl(ipl(y1, y3, relYB), ipl(y2, y4, relYB), relXL);
-            double absYBR = ipl(ipl(y1, y3, relYB), ipl(y2, y4, relYB), relXR);
-
-            Color absCTL = ipl(ipl(c1, c3, relYT), ipl(c2, c4, relYT), relXL);
-            Color absCTR = ipl(ipl(c1, c3, relYT), ipl(c2, c4, relYT), relXR);
-            Color absCBL = ipl(ipl(c1, c3, relYB), ipl(c2, c4, relYB), relXL);
-            Color absCBR = ipl(ipl(c1, c3, relYB), ipl(c2, c4, relYB), relXR);
-
-            part.draw(absXTL, absYTL, absCTL, absXTR, absYTR, absCTR,
-                absXBL, absYBL, absCBL, absXBR, absYBR, absCBR, z, mode);
-        }
-}
-
-Gosu::Bitmap Gosu::LargeImageData::toBitmap() const
-{
-    Bitmap bitmap(width(), height());
-    for (int x = 0; x < partsX; ++x)
-        for (int y = 0; y < partsY; ++y)
-            bitmap.insert(parts[y * partsX + x]->toBitmap(), x * partWidth, y * partHeight);
-    return bitmap;
-}
-
-void Gosu::LargeImageData::insert(const Bitmap& bitmap, int atX, int atY)
-{
-    for (int x = 0; x < partsX; ++x)
-        for (int y = 0; y < partsY; ++y)
-            parts[y * partsX + x]->insert(bitmap, atX - x * partWidth, atY - y * partHeight);
-}

data/src/Graphics/LargeImageData.hpp

@@ -1,46 +0,0 @@
-#ifndef GOSU_SRC_LARGEIMAGEDATA_HPP
-#define GOSU_SRC_LARGEIMAGEDATA_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/ImageData.hpp>
-#include <Gosu/TR1.hpp>
-#include <Gosu/Platform.hpp>
-#include <stdexcept>
-#include <vector>
-
-namespace Gosu
-{
-    class LargeImageData : public ImageData
-    {
-        unsigned fullWidth, fullHeight, partsX, partsY, partWidth, partHeight;
-        std::vector<std::tr1::shared_ptr<ImageData> > parts;
-
-    public:
-        LargeImageData(const Bitmap& source,
-            unsigned partWidth, unsigned partHeight, unsigned imageFlags);
-
-        int width() const;
-        int height() const;
-
-        void draw(double x1, double y1, Color c1,
-            double x2, double y2, Color c2,
-            double x3, double y3, Color c3,
-            double x4, double y4, Color c4,
-            ZPos z, AlphaMode mode) const;
-            
-        const GLTexInfo* glTexInfo() const
-        {
-            return 0;
-        }
-        
-        GOSU_UNIQUE_PTR<ImageData> subimage(int x, int y, int w, int h) const
-        {
-            return GOSU_UNIQUE_PTR<ImageData>();
-        }
-        
-        Bitmap toBitmap() const;
-        void insert(const Bitmap& bitmap, int x, int y);
-    };
-}
-
-#endif

data/src/Graphics/Macro.hpp

@@ -1,36 +0,0 @@
-#ifndef GOSU_SRC_GRAPHICS_MACRO_HPP
-#define GOSU_SRC_GRAPHICS_MACRO_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/ImageData.hpp>
-#include <Gosu/TR1.hpp>
-#include <Gosu/Platform.hpp>
-#include "Common.hpp"
-
-class Gosu::Macro : public Gosu::ImageData
-{
-    struct Impl;
-    std::tr1::shared_ptr<Impl> pimpl;
-    
-public:
-    Macro(DrawOpQueue& queue, int width, int height);
-    
-    int width() const;
-    int height() const;
-    
-    void draw(double x1, double y1, Color c1,
-        double x2, double y2, Color c2,
-        double x3, double y3, Color c3,
-        double x4, double y4, Color c4,
-        ZPos z, AlphaMode mode) const;
-    
-    const Gosu::GLTexInfo* glTexInfo() const;
-    
-    Gosu::Bitmap toBitmap() const;
-    
-    GOSU_UNIQUE_PTR<ImageData> subimage(int x, int y, int width, int height) const;
-    
-    void insert(const Bitmap& bitmap, int x, int y);
-};
-
-#endif

data/src/Graphics/RenderState.hpp

@@ -1,211 +0,0 @@
-#ifndef GOSU_SRC_GRAPHICS_RENDERSTATE_HPP
-#define GOSU_SRC_GRAPHICS_RENDERSTATE_HPP
-
-#include "Common.hpp"
-#include "Texture.hpp"
-
-// Properties that potentially need to be changed between each draw operation.
-// This does not include the color or vertex data of the actual quads.
-struct Gosu::RenderState
-{
-    std::tr1::shared_ptr<Texture> texture;
-    const Transform* transform;
-    ClipRect clipRect;
-    AlphaMode mode;
-    
-    RenderState()
-    : transform(0), mode(amDefault)
-    {
-        clipRect.width = NO_CLIPPING;
-    }
-    
-    bool operator==(const RenderState& rhs) const
-    {
-        return texture == rhs.texture && transform == rhs.transform &&
-            clipRect == rhs.clipRect && mode == rhs.mode;
-    }
-    
-    void applyTexture() const
-    {
-        if (texture)
-        {
-            glEnable(GL_TEXTURE_2D);
-            glBindTexture(GL_TEXTURE_2D, texture->texName());
-        }
-        else
-        {
-            glDisable(GL_TEXTURE_2D);
-        }
-    }
-    
-    void applyAlphaMode() const
-    {
-        if (mode == amAdd)
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-        else if (mode == amMultiply)
-            glBlendFunc(GL_DST_COLOR, GL_ZERO);
-        else
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    }
-    
-    void applyClipRect() const
-    {
-        if (clipRect.width == NO_CLIPPING)
-        {
-            glDisable(GL_SCISSOR_TEST);
-        }
-        else
-        {
-            glEnable(GL_SCISSOR_TEST);
-            glScissor(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
-        }
-    }
-    
-    // Only used by Macro so far
-    #ifndef GOSU_IS_OPENGLES
-    void apply() const
-    {
-        applyTexture();
-        // TODO: No inner clipRect yet - how would this work?!
-        applyAlphaMode();
-    }
-    #endif
-};
-
-// Manages the OpenGL rendering state. It caches the current state, only forwarding the
-// changes to OpenGL if the new state is really different.
-class Gosu::RenderStateManager : private Gosu::RenderState
-{
-    // Not copyable
-    RenderStateManager(const RenderStateManager&);
-    RenderStateManager& operator=(const RenderStateManager&);
-    
-    void applyTransform() const
-    {
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-        
-        #ifndef GOSU_IS_OPENGLES
-        glMultMatrixd(&(*transform)[0]);
-        #else
-        // TODO: Ouch, should always use floats!
-        GLfloat matrix[16];
-        for (int i = 0; i < 16; ++i)
-            matrix[i] = (*transform)[i];
-        glMultMatrixf(matrix);
-        #endif
-    }
-    
-public:
-    RenderStateManager()
-    {
-        applyAlphaMode();
-        // Preserve previous MV matrix
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-    }
-    
-    ~RenderStateManager()
-    {
-        ClipRect noClipping;
-        noClipping.width = NO_CLIPPING;
-        setClipRect(noClipping);
-        setTexture(std::tr1::shared_ptr<Texture>());
-        // Return to previous MV matrix
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-    }
-    
-    void setRenderState(const RenderState& rs)
-    {
-        setTexture(rs.texture);
-        setTransform(rs.transform);
-        setClipRect(rs.clipRect);
-        setAlphaMode(rs.mode);
-    }
-    
-    void setTexture(std::tr1::shared_ptr<Texture> newTexture)
-    {
-        if (newTexture == texture)
-            return;
-    
-        if (newTexture)
-        {
-            // New texture *is* really a texture - change to it.
-            
-            if (!texture)
-                glEnable(GL_TEXTURE_2D);
-            glBindTexture(GL_TEXTURE_2D, newTexture->texName());
-        }
-        else
-            // New texture is NO_TEXTURE, disable texturing.
-            glDisable(GL_TEXTURE_2D);
-        texture = newTexture;
-    }
-    
-    void setTransform(const Transform* newTransform)
-    {
-        if (newTransform == transform)
-            return;
-        transform = newTransform;
-        applyTransform();
-    }
-
-    void setClipRect(const ClipRect& newClipRect)
-    {
-        if (newClipRect.width == NO_CLIPPING)
-        {
-            // Disable clipping
-            if (clipRect.width != NO_CLIPPING)
-            {
-                glDisable(GL_SCISSOR_TEST);
-                clipRect.width = NO_CLIPPING;
-            }
-        }
-        else
-        {
-            // Enable clipping if off
-            if (clipRect.width == NO_CLIPPING)
-            {
-                glEnable(GL_SCISSOR_TEST);
-                clipRect = newClipRect;
-                glScissor(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
-            }
-            // Adjust clipping if necessary
-            else if (!(clipRect == newClipRect))
-            {
-                clipRect = newClipRect;
-                glScissor(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
-            }
-        }
-    }
-    
-    void setAlphaMode(AlphaMode newMode)
-    {
-        if (newMode == mode)
-            return;
-        mode = newMode;
-        applyAlphaMode();
-    }
-    
-    // The cached values may have been messed with. Reset them again.
-    void enforceAfterUntrustedGL() const
-    {
-        applyTexture();
-        applyTransform();
-        applyClipRect();
-        applyAlphaMode();
-    }
-};
-
-namespace Gosu
-{
-    struct VertexArray
-    {
-        RenderState renderState;
-        std::vector<ArrayVertex> vertices;
-    };
-    typedef std::list<VertexArray> VertexArrays;    
-}
-    
-#endif