gosu 0.10.9.pre1 → 0.11.0

data/src/DirectoriesApple.mm

@@ -1,71 +0,0 @@
-#import <Gosu/Directories.hpp>
-#import <Gosu/Utility.hpp>
-#import "AppleUtility.hpp"
-#import <Foundation/Foundation.h>
-#import <unistd.h>
-
-
-static std::wstring stringFromNSString(NSString *string, const wchar_t *fallback)
-{
-    return string ? Gosu::utf8ToWstring([string UTF8String]) : fallback;
-}
-
-void Gosu::useResourceDirectory()
-{
-    chdir(Gosu::wstringToUTF8(resourcePrefix()).c_str());
-}
-
-std::wstring Gosu::userSettingsPrefix()
-{
-    static std::wstring result = [] {
-        @autoreleasepool {
-            NSString *library =
-                NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES)[0];
-            NSString *preferences = [library stringByAppendingPathComponent:@"Preferences"];
-            
-            return stringFromNSString(preferences, L".") + L"/";
-        }
-    }();
-    return result;
-}
-
-std::wstring Gosu::userDocsPrefix()
-{
-    static std::wstring result = [] {
-        @autoreleasepool {
-            NSString *documents =
-                NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)[0];
-            
-            return stringFromNSString(documents, L".") + L"/";
-        }
-    }();
-    return result;
-}
-
-std::wstring Gosu::resourcePrefix()
-{
-    static std::wstring result = [] {
-        @autoreleasepool {
-            NSString *resources = [NSBundle mainBundle].resourcePath;
-            return stringFromNSString(resources, L".") + L"/";
-        }
-    }();
-    return result;
-}
-
-std::wstring Gosu::sharedResourcePrefix()
-{
-#ifdef GOSU_IS_IPHONE
-    return resourcePrefix();
-#else
-    static std::wstring result = [] {
-        @autoreleasepool {
-            NSString *bundlePath = [NSBundle mainBundle].bundlePath;
-            NSString *containingPath = [bundlePath stringByDeletingLastPathComponent];
-            
-            return stringFromNSString(containingPath, L".");
-        }
-    }();
-    return result;
-#endif
-}

data/src/Graphics/BlockAllocator.cpp

@@ -1,142 +0,0 @@
-#include "BlockAllocator.hpp"
-#include <stdexcept>
-#include <vector>
-
-struct Gosu::BlockAllocator::Impl
-{
-    unsigned width, height;
-
-    typedef std::vector<Block> Blocks;
-    Blocks blocks;
-    unsigned firstX, firstY;
-    unsigned maxW, maxH;
-    
-    void markBlockUsed(const Block& block, unsigned aWidth, unsigned aHeight)
-    {
-        firstX += aWidth;
-        if (firstX + aWidth >= width)
-        {
-            firstX = 0;
-            firstY += aHeight;
-        }
-        blocks.push_back(block);
-    }
-
-    bool isBlockFree(const Block& block) const
-    {
-        // (The right-th column and the bottom-th row are outside of the block.)
-        unsigned right = block.left + block.width;
-        unsigned bottom = block.top + block.height;
-
-        // Block isn't valid.
-        if (right > width || bottom > height)
-            return false;
-
-        // Test if the block collides with any existing rects.
-        Blocks::const_iterator i, end = blocks.end();
-        for (i = blocks.begin(); i != end; ++i)
-            if (i->left < right && block.left < i->left + i->width &&
-                i->top < bottom && block.top < i->top + i->height)
-            {
-                return false;
-            }
-
-        return true;
-    }
-};
-
-Gosu::BlockAllocator::BlockAllocator(unsigned width, unsigned height)
-: pimpl(new Impl)
-{
-    pimpl->width = width;
-    pimpl->height = height;
-
-    pimpl->firstX = 0;
-    pimpl->firstY = 0;
-
-    pimpl->maxW = width;
-    pimpl->maxH = height;
-}
-
-Gosu::BlockAllocator::~BlockAllocator()
-{
-}
-
-unsigned Gosu::BlockAllocator::width() const
-{
-    return pimpl->width;
-}
-
-unsigned Gosu::BlockAllocator::height() const
-{
-    return pimpl->height;
-}
-
-bool Gosu::BlockAllocator::alloc(unsigned aWidth, unsigned aHeight, Block& b)
-{
-    // The rect wouldn't even fit onto the texture!
-    if (aWidth > width() || aHeight > height())
-        return false;
-
-    // We know there's no space left.
-    if (aWidth > pimpl->maxW && aHeight > pimpl->maxH)
-        return false;
-    
-    // Start to look for a place next to the last returned rect. Chances are
-    // good we'll find a place there.
-    b = Block(pimpl->firstX, pimpl->firstY, aWidth, aHeight);
-    if (pimpl->isBlockFree(b))
-    {
-        pimpl->markBlockUsed(b, aWidth, aHeight);
-        return true;
-    }
-
-    // Brute force: Look for a free place on this texture.
-    unsigned& x = b.left;
-    unsigned& y = b.top;
-    for (y = 0; y <= height() - aHeight; y += 16)
-        for (x = 0; x <= width() - aWidth; x += 8)
-        {
-            if (!pimpl->isBlockFree(b))
-                continue;
-
-            // Found a nice place!
-
-            // Try to make up for the large for()-stepping.
-            while (y > 0 && pimpl->isBlockFree(Block(x, y - 1, aWidth, aHeight)))
-                --y;
-            while (x > 0 && pimpl->isBlockFree(Block(x - 1, y, aWidth, aHeight)))
-                --x;
-            
-            pimpl->markBlockUsed(b, aWidth, aHeight);
-            return true;
-        }
-
-    // So there was no space for the bitmap. Remember this for later.
-    pimpl->maxW = aWidth - 1;
-    pimpl->maxH = aHeight - 1;
-    return false;
-}
-
-void Gosu::BlockAllocator::block(unsigned left, unsigned top, unsigned width, unsigned height)
-{
-    pimpl->blocks.push_back(Block(left, top, width, height));
-}
-
-void Gosu::BlockAllocator::free(unsigned left, unsigned top, unsigned width, unsigned height)
-{
-    for (Impl::Blocks::iterator i = pimpl->blocks.begin();
-        i != pimpl->blocks.end(); ++i)
-    {
-        if (i->left == left && i->top == top && i->width == width && i->height == height)
-        {
-            pimpl->blocks.erase(i);
-			// Be optimistic again!
-            pimpl->maxW = pimpl->width - 1;
-            pimpl->maxH = pimpl->height - 1;
-            return;
-        }
-    }
-
-    throw std::logic_error("Tried to free an invalid block");
-}

data/src/Graphics/ClipRectStack.hpp

@@ -1,93 +0,0 @@
-#ifndef GOSU_SRC_GRAPHICS_CLIPRECTSTACK_HPP
-#define GOSU_SRC_GRAPHICS_CLIPRECTSTACK_HPP
-
-#include "Common.hpp"
-#include <cassert>
-#include <vector>
-
-class Gosu::ClipRectStack
-{
-    std::vector<ClipRect> stack;
-    bool hasEffectiveRect; // is effectiveRect valid?
-    ClipRect effectiveRect;
-    
-    void updateEffectiveRect()
-    {
-        // Nothing to do, no clipping in place.
-        if (stack.empty())
-        {
-            hasEffectiveRect = false;
-            return;
-        }
-        
-        ClipRect result = { 0.0, 0.0, 1e10, 1e10 };
-        for (std::size_t i = 0, end = stack.size(); i < end; ++i)
-        {
-            const ClipRect& rect = stack[i];
-            int resultRight = std::min(result.x + result.width, rect.x + rect.width);
-            int resultBottom = std::min(result.y + result.height, rect.y + rect.height);
-            result.x = std::max(result.x, rect.x);
-            result.y = std::max(result.y, rect.y);
-            
-            if (result.x >= resultRight || result.y >= resultBottom)
-            {
-                // We have clipped the world away!
-                hasEffectiveRect = false;
-                return;
-            }
-            
-            result.width = resultRight - result.x;
-            result.height = resultBottom - result.y;
-        }
-        
-        // On the iPhone, we may have to multiply everything by 2 for Retina displays.
-        // TODO: Doesn't this affect Retina Macs as well?
-        // TODO: This should be handled by a global transform.
-        int fac = clipRectBaseFactor();
-        result.x *= fac, result.y *= fac, result.width *= fac, result.height *= fac;
-        
-        // Normal clipping.
-        effectiveRect = result;
-        hasEffectiveRect = true;
-    }
-    
-public:    
-    ClipRectStack()
-    : hasEffectiveRect(false)
-    {
-    }
-    
-    void clear()
-    {
-        stack.clear();
-        hasEffectiveRect = false;
-    }
-    
-    void beginClipping(double x, double y, double width, double height)
-    {
-        ClipRect rect = { x, y, width, height };
-        stack.push_back(rect);
-        updateEffectiveRect();
-    }
-    
-    void endClipping()
-    {
-        assert (!stack.empty());
-        stack.pop_back();
-        updateEffectiveRect();
-    }
-    
-    const ClipRect* maybeEffectiveRect() const
-    {
-        return hasEffectiveRect ? &effectiveRect : 0;
-    }
-    
-    bool clippedWorldAway() const
-    {
-        // When we have no effective rect but the stack is not empty, we have clipped
-        // the whole world away and don't need to render things.
-        return !hasEffectiveRect && !stack.empty();
-    }
-};
-
-#endif

data/src/Graphics/DrawOp.hpp

@@ -1,175 +0,0 @@
-#ifndef GOSU_SRC_DRAWOP_HPP
-#define GOSU_SRC_DRAWOP_HPP
-
-#include <Gosu/GraphicsBase.hpp>
-#include <Gosu/Color.hpp>
-#include "Common.hpp"
-#include "RenderState.hpp"
-#include "TexChunk.hpp"
-#include <cassert>
-
-namespace Gosu
-{
-    struct DrawOp
-    {
-        // For sorting before drawing the queue.
-        ZPos z;
-        
-        RenderState renderState;
-        // Only valid if renderState.texName != NO_TEXTURE
-        GLfloat top, left, bottom, right;
-        
-        // TODO: Merge with Gosu::ArrayVertex.
-        struct Vertex
-        {
-            float x, y;
-            Color c;
-            Vertex() {}
-            Vertex(float x, float y, Color c) : x(x), y(y), c(c) {}
-        };
-        Vertex vertices[4];
-        
-        // Number of vertices used, or: complement index of code block
-        int verticesOrBlockIndex;
-        
-        void perform(const DrawOp* next) const
-        {
-            // This should not be called on GL code ops.
-            assert (verticesOrBlockIndex >= 2);
-            assert (verticesOrBlockIndex <= 4);
-            
-            #ifdef GOSU_IS_OPENGLES
-            static const unsigned MAX_AUTOGROUP = 24;
-            
-            static int spriteCounter = 0;
-            static float spriteVertices[12 * MAX_AUTOGROUP];
-            static float spriteTexcoords[12 * MAX_AUTOGROUP];
-            static unsigned spriteColors[6 * MAX_AUTOGROUP];
-            
-            // iPhone specific setup
-            static bool isSetup = false;
-            if (!isSetup)
-            {
-                // Sets up pointers and enables states needed for using vertex arrays and textures
-                glVertexPointer(2, GL_FLOAT, 0, spriteVertices);
-                glEnableClientState(GL_VERTEX_ARRAY);
-                glTexCoordPointer(2, GL_FLOAT, 0, spriteTexcoords);
-                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-                // TODO: See if I can somehow change the format of the color pointer, or maybe change the internal color representation on iOS.
-                glColorPointer(4, GL_UNSIGNED_BYTE, 0, spriteColors);
-                glEnableClientState(GL_COLOR_ARRAY);
-                
-                isSetup = true;
-            }
-            
-            if (renderState.texture)
-            {
-                spriteTexcoords[spriteCounter*12 + 0] = left;
-                spriteTexcoords[spriteCounter*12 + 1] = top;
-                spriteTexcoords[spriteCounter*12 + 2] = right;
-                spriteTexcoords[spriteCounter*12 + 3] = top;
-                spriteTexcoords[spriteCounter*12 + 4] = left;
-                spriteTexcoords[spriteCounter*12 + 5] = bottom;
-                
-                spriteTexcoords[spriteCounter*12 + 6] = right;
-                spriteTexcoords[spriteCounter*12 + 7] = top;
-                spriteTexcoords[spriteCounter*12 + 8] = left;
-                spriteTexcoords[spriteCounter*12 + 9] = bottom;
-                spriteTexcoords[spriteCounter*12 + 10] = right;
-                spriteTexcoords[spriteCounter*12 + 11] = bottom;
-            }
-
-            for (int i = 0; i < 3; ++i)
-            {
-                spriteVertices[spriteCounter*12 + i*2] = vertices[i].x;
-                spriteVertices[spriteCounter*12 + i*2+1] = vertices[i].y;
-                spriteColors[spriteCounter*6 + i] = vertices[i].c.abgr();
-            }
-            for (int i = 0; i < 3; ++i)
-            {
-                spriteVertices[spriteCounter*12 + 6 + i*2] = vertices[i + 1].x;
-                spriteVertices[spriteCounter*12 + 6 + i*2+1] = vertices[i + 1].y;
-                spriteColors[spriteCounter*6 + 3 + i] = vertices[i + 1].c.abgr();
-            }
-            
-            ++spriteCounter;
-            if (spriteCounter == MAX_AUTOGROUP || next == 0 || !(next->renderState == renderState))
-            {
-                glDrawArrays(GL_TRIANGLES, 0, 6 * spriteCounter);
-                //if (spriteCounter > 1)
-                //    printf("grouped %d quads\n", spriteCounter);
-                spriteCounter = 0;
-            }
-            #else
-            if (verticesOrBlockIndex == 2)
-                glBegin(GL_LINES);
-            else if (verticesOrBlockIndex == 3)
-                glBegin(GL_TRIANGLES);
-            else // if (verticesOrBlockIndex == 4)
-                glBegin(GL_QUADS);
-            
-            for (unsigned i = 0; i < verticesOrBlockIndex; i++)
-            {
-                glColor4ubv(reinterpret_cast<const GLubyte*>(&vertices[i].c));
-                if (renderState.texture)
-                    switch (i)
-                    {
-                    case 0:
-                        glTexCoord2f(left, top);
-                        break;
-                    case 1:
-                        glTexCoord2f(right, top);
-                        break;
-                    case 2:
-                        glTexCoord2f(right, bottom);
-                        break;
-                    case 3:
-                        glTexCoord2f(left, bottom);
-                        break;
-                    }
-                glVertex2f(vertices[i].x, vertices[i].y);
-            }
-            
-            glEnd();
-            #endif
-        }
-        
-        void compileTo(VertexArrays& vas) const
-        {
-            // Copy vertex data and apply & forget about the transform.
-            // This is important because the pointed-to transform will be gone by the next
-            // frame anyway.
-            ArrayVertex result[4];
-            for (int i = 0; i < 4; ++i)
-            {
-                result[i].vertices[0] = vertices[i].x;
-                result[i].vertices[1] = vertices[i].y;
-                result[i].vertices[2] = 0;
-                result[i].color = vertices[i].c.abgr();
-                applyTransform(*renderState.transform, result[i].vertices[0], result[i].vertices[1]);
-            }
-            RenderState vaRenderState = renderState;
-            vaRenderState.transform = 0;
-            
-            result[0].texCoords[0] = left, result[0].texCoords[1] = top;
-            result[1].texCoords[0] = right, result[1].texCoords[1] = top;
-            result[2].texCoords[0] = right, result[2].texCoords[1] = bottom;
-            result[3].texCoords[0] = left, result[3].texCoords[1] = bottom;
-            
-            if (vas.empty() || !(vas.back().renderState == vaRenderState))
-            {
-                vas.push_back(VertexArray());
-                vas.back().renderState = vaRenderState;
-            }
-            
-            vas.back().vertices.insert(vas.back().vertices.end(), result, result + 4);
-        }
-        
-        bool operator<(const DrawOp& other) const
-        {
-            return z < other.z;
-        }
-    };
-}
-
-#endif