gosu 0.9.2 → 0.10.0

data/src/Bitmap/BitmapUtils.cpp

@@ -1,76 +0,0 @@
-#include <Gosu/Graphics.hpp>
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Platform.hpp>
-
-Gosu::Reader Gosu::loadFromPNG(Bitmap& bitmap, Reader reader)
-{
-    loadImageFile(bitmap, reader);
-    reader.setPosition(reader.resource().size());
-    return reader;
-}
-
-Gosu::Reader Gosu::loadFromBMP(Bitmap& bitmap, Reader reader)
-{
-    return loadFromPNG(bitmap, reader);
-}
-
-Gosu::Writer Gosu::saveToPNG(const Bitmap& bitmap, Writer writer)
-{
-    saveImageFile(bitmap, writer);
-    return writer.resource().backWriter();
-}
-
-// The iPhone still uses BitmapBMP.cpp because UIImage apparently lacks BMP export.
-#ifndef GOSU_IS_IPHONE
-Gosu::Writer Gosu::saveToBMP(const Bitmap& bitmap, Writer writer)
-{
-    saveImageFile(bitmap, writer, L"bmp");
-    return writer.resource().backWriter();
-}
-#endif
-
-void Gosu::applyBorderFlags(Bitmap& dest, const Bitmap& source,
-    unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-    unsigned imageFlags)
-{
-    dest.resize(srcWidth + 2, srcHeight + 2);
-
-    // The borders are made "harder" by duplicating the original bitmap's
-    // borders.
-
-    // Top.
-    if (imageFlags & ifTileableTop)
-        dest.insert(source, 1, 0, srcX, srcY, srcWidth, 1);
-    // Bottom.
-    if (imageFlags & ifTileableBottom)
-        dest.insert(source, 1, dest.height() - 1,
-            srcX, srcY + srcHeight - 1, srcWidth, 1);
-    // Left.
-    if (imageFlags & ifTileableLeft)
-        dest.insert(source, 0, 1, srcX, srcY, 1, srcHeight);
-    // Right.
-    if (imageFlags & ifTileableRight)
-        dest.insert(source, dest.width() - 1, 1, 
-            srcX + srcWidth - 1, srcY, 1, srcHeight);
-
-    // Top left.
-    if ((imageFlags & ifTileableTop) && (imageFlags & ifTileableLeft))
-        dest.setPixel(0, 0,
-            source.getPixel(srcX, srcY));
-    // Top right.
-    if ((imageFlags & ifTileableTop) && (imageFlags & ifTileableRight))
-        dest.setPixel(dest.width() - 1, 0,
-            source.getPixel(srcX + srcWidth - 1, srcY));
-    // Bottom left.
-    if ((imageFlags & ifTileableBottom) && (imageFlags & ifTileableLeft))
-        dest.setPixel(0, dest.height() - 1,
-            source.getPixel(srcX, srcY + srcHeight - 1));
-    // Bottom right.
-    if ((imageFlags & ifTileableBottom) && (imageFlags & ifTileableRight))
-        dest.setPixel(dest.width() - 1, dest.height() - 1,
-            source.getPixel(srcX + srcWidth - 1, srcY + srcHeight - 1));
-
-    // Now put the final image into the prepared borders.
-    dest.insert(source, 1, 1, srcX, srcY, srcWidth, srcHeight);
-}

data/src/DirectoriesMac.mm

@@ -1,38 +0,0 @@
-#import <Gosu/Directories.hpp>
-#import "MacUtility.hpp"
-#import <Gosu/Utility.hpp>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSPathUtilities.h>
-
-std::wstring Gosu::resourcePrefix()
-{
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
-        NSBundle* bundle = [NSBundle mainBundle];
-        if (bundle == nil)
-            return L"";
-        NSString* str = [bundle resourcePath];
-        result = Gosu::widen([str fileSystemRepresentation]) + L"/";
-    }
-    return result;
-}
-
-std::wstring Gosu::sharedResourcePrefix()
-{
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
-        NSBundle* bundle = [NSBundle mainBundle];
-        if (bundle == nil)
-            return L"";
-        NSString* str = [bundle bundlePath];
-        str = [str stringByDeletingLastPathComponent];
-        result = Gosu::widen([str fileSystemRepresentation]) + L"/";
-    }
-    return result;
-}

data/src/DirectoriesTouch.mm

@@ -1,38 +0,0 @@
-#import <Gosu/Directories.hpp>
-#import <Gosu/Utility.hpp>
-#import "MacUtility.hpp"
-#import <Foundation/Foundation.h>
-
-std::wstring Gosu::userSettingsPrefix()
-{
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
-        NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-        NSString* documentsDirectory = [paths objectAtIndex: 0];
-        result = utf8ToWstring([documentsDirectory UTF8String]) + L"/";
-    }
-    return result;
-}
-
-std::wstring Gosu::userDocsPrefix()
-{
-    return userSettingsPrefix();
-}
-
-std::wstring Gosu::resourcePrefix()
-{
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
-        result = utf8ToWstring([[[NSBundle mainBundle] resourcePath] UTF8String]) + L"/";
-    }
-    return result;
-}
-
-std::wstring Gosu::sharedResourcePrefix()
-{
-    return resourcePrefix();
-}

data/src/GosuView.hpp

@@ -1,15 +0,0 @@
-#import <UIKit/UIKit.h>
-#import <OpenGLES/EAGL.h>
-#import <OpenGLES/ES1/gl.h>
-#import <OpenGLES/ES1/glext.h>
-
-// UIViewController subclass that creates a GosuView and helps it manage rotation.
-
-@interface GosuViewController : UIViewController
-@end
-
-// UIView subclass that contains a CAEAGLLayer.
-
-@interface GosuView : UIView
-- (void)drawView;
-@end

data/src/GosuView.mm

@@ -1,208 +0,0 @@
-#import <QuartzCore/QuartzCore.h>
-#import <OpenGLES/EAGLDrawable.h>
-#import <UIKit/UIKit.h>
-
-#import <Gosu/Graphics.hpp>
-#import <Gosu/Window.hpp>
-#import "Common.hpp"
-#import "GosuView.hpp"
-
-Gosu::Window& windowInstance();
-
-namespace Gosu
-{
-    namespace FPS
-    {
-        void registerFrame();
-    }
-}
-
-int Gosu::clipRectBaseFactor()
-{
-    static int result = 0;
-    if (result == 0)
-    {
-        if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
-            result = [UIScreen mainScreen].scale;
-        else
-            result = 1;
-    }
-    return result;
-}
-
-// A controller to allow for autorotation.
-@implementation GosuViewController
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)loadView
-{
-    self.view = [[GosuView alloc] init];
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
-}
-
-- (NSUInteger)supportedInterfaceOrientations
-{
-    return UIInterfaceOrientationMaskLandscape;
-}
-
-- (BOOL)shouldAutorotate
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning
-{
-    windowInstance().releaseMemory();
-}
-@end
-
-// A class extension to declare private methods
-@interface GosuView ()
-@property (nonatomic, strong) EAGLContext *context;
-@end
-
-@implementation GosuView
-{
-    // The pixel dimensions of the backbuffer
-    GLint backingWidth;
-    GLint backingHeight;
-
-    // OpenGL names for the renderbuffer and framebuffers used to render to this view
-    GLuint viewRenderbuffer, viewFramebuffer;
-
-    NSMutableSet* currentTouches;
-    Gosu::Touches* currentTouchesVector;
-}
-    
-+ (Class)layerClass
-{
-    return [CAEAGLLayer class];
-}
-
-- (id)init
-{
-    if ((self = [super initWithFrame: [[UIScreen mainScreen] bounds]])) {
-        CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
-        
-        eaglLayer.opaque = YES;
-        /*eaglLayer.drawableProperties = dictionaryWithObjectsAndKeys:
-                                        [NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking,
-                                        kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];*/
-        
-        self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
-        
-        if (!self.context || ![EAGLContext setCurrentContext:self.context]) {
-            [self release];
-            return nil;
-        }
-    }
-    return self;
-}
-
-- (void)drawView
-{
-    if (not windowInstance().needsRedraw())
-        return;
-    
-    Gosu::FPS::registerFrame();
-    
-    [EAGLContext setCurrentContext:self.context];
-    glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
-    glViewport(0, 0, backingWidth, backingHeight);
-    
-    if (windowInstance().graphics().begin()) {
-        windowInstance().draw();
-        windowInstance().graphics().end();
-    }
-    
-    glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
-    [self.context presentRenderbuffer:GL_RENDERBUFFER_OES];
-}
-
-- (void)layoutSubviews
-{
-    [EAGLContext setCurrentContext:self.context];
-    [self destroyFramebuffer];
-    if ([self respondsToSelector:@selector(contentScaleFactor)])
-        self.contentScaleFactor = Gosu::clipRectBaseFactor();
-    [self createFramebuffer];
-    [self drawView];
-}
-
-- (BOOL)createFramebuffer
-{
-    glGenFramebuffersOES(1, &viewFramebuffer);
-    glGenRenderbuffersOES(1, &viewRenderbuffer);
-    
-    glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
-    glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
-    [self.context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.layer];
-    glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, viewRenderbuffer);
-    
-    glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth);
-    glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight);
-    
-    if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
-        NSLog(@"failed to make complete framebuffer object %x", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-        return NO;
-    }
-    
-    return YES;
-}
-
-- (void)destroyFramebuffer
-{
-    glDeleteFramebuffersOES(1, &viewFramebuffer);
-    viewFramebuffer = 0;
-    glDeleteRenderbuffersOES(1, &viewRenderbuffer);
-    viewRenderbuffer = 0;
-}
-
-- (void)dealloc
-{
-    delete currentTouchesVector;
-    [currentTouches release];
-    [EAGLContext setCurrentContext:nil];
-    [self.context release];
-    [super dealloc];
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    windowInstance().input().feedTouchEvent(0, touches);
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    windowInstance().input().feedTouchEvent(1, touches);
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    windowInstance().input().feedTouchEvent(2, touches);
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    // TODO: Should be differentiated on the Gosu side.
-    [self touchesEnded:touches withEvent:event];
-}
-
-- (BOOL)isMultipleTouchEnabled
-{
-    return YES;
-}
-
-- (BOOL)isExclusiveTouch
-{
-    return YES;
-}
-
-@end

data/src/Input/AccelerometerReader.hpp

@@ -1,10 +0,0 @@
-#include <UIKit/UIKit.h>
-
-typedef UIAccelerationValue Acceleration[3];
-
-@interface AccelerometerReader : NSObject <UIAccelerometerDelegate> {
-    Acceleration acceleration;
-}
--(AccelerometerReader*)initWithUpdateInterval:(float)updateInterval;
--(const Acceleration&)acceleration;
-@end

data/src/Input/AccelerometerReader.mm

@@ -1,31 +0,0 @@
-// Thanks for inspiration to Phil Cooper-King.
-// This is adapted from his MIT-licensed Gosu fork
-// on GitHub.
-
-#import "AccelerometerReader.hpp"
-
-@implementation AccelerometerReader
-- (AccelerometerReader*)initWithUpdateInterval: (float)updateInterval
-{
-    if (self = [super init])
-    {
-        [[UIAccelerometer sharedAccelerometer] setUpdateInterval: updateInterval];
-        [[UIAccelerometer sharedAccelerometer] setDelegate:self];
-        acceleration[0] = acceleration[1] = acceleration[2] = 0.0f;
-    }
-    return self;
-}
-
-- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)uiAccel
-{
-    float factor = 0.3f;
-    acceleration[0] = (uiAccel.x * factor) + (acceleration[0] * (1 - factor));
-    acceleration[1] = (uiAccel.y * factor) + (acceleration[1] * (1 - factor));
-    acceleration[2] = (uiAccel.z * factor) + (acceleration[2] * (1 - factor));
-}
-
-- (const Acceleration&)acceleration
-{
-    return acceleration;
-}
-@end

data/src/Sockets/CommSocket.cpp

@@ -1,305 +0,0 @@
-#include <Gosu/Sockets.hpp>
-#include <Gosu/TR1.hpp>
-#include "Socket.hpp"
-#include <cassert>
-#include <cstring>
-#include <stdexcept>
-#include <vector>
-
-struct Gosu::CommSocket::Impl
-{
-    Socket socket;
-    CommMode mode;
-
-    typedef std::vector<char> Buffer;
-    Buffer inbox, outbox;
-
-    void appendBuffer(const char* buffer, std::size_t size,
-        std::tr1::function<void (const void*, std::size_t)>& event)
-    {
-        switch (mode)
-        {
-            case cmRaw:
-            {
-                // Raw = simple! Yay.
-                if (event)
-                    event(buffer, size);
-
-                break;
-            }
-
-            case cmManaged:
-            {
-                // Append new data to inbox.
-                inbox.insert(inbox.end(), buffer, buffer + size);
-
-                for (;;) // IMPR.
-                {
-                    const size_t sizeSize = 4;
-
-                    // Not even enough bytes there to determine the size of the
-                    // incoming message.
-                    if (inbox.size() < sizeSize)
-                        break;
-
-                    // Message size is already here, convert it.
-                    std::tr1::uint32_t msgSize = *reinterpret_cast<std::tr1::uint32_t*>(&inbox[0]);
-                    msgSize = ntohl(msgSize);
-
-                    // Can't really handle zero-size messages. IMPR?!
-                    if (msgSize == 0)
-                        throw std::logic_error("Cannot handle empty messages");
-
-                    // Has the current message arrived completely?
-                    if (inbox.size() < sizeSize + msgSize)
-                        break;
-
-                    // Current message is here: Call event...
-                    if (event)
-                        event(&inbox[sizeSize], msgSize);
-
-                    // ...and delete it from the inbox.
-                    inbox.erase(inbox.begin(),
-                        inbox.begin() + sizeSize + msgSize);
-                }
-
-                break;
-            }
-        }
-    }
-};
-
-Gosu::CommSocket::CommSocket(CommMode mode, SocketAddress targetAddress,
-    SocketPort targetPort)
-: pimpl(new Impl)
-{
-    pimpl->mode = mode;
-
-    sockaddr_in addr;
-    std::memset(&addr, 0, sizeof addr);
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl(targetAddress);
-    addr.sin_port = htons(targetPort);
-
-    pimpl->socket.setHandle(socketCheck(::socket(AF_INET, SOCK_STREAM, 0)));
-    pimpl->socket.setBlocking(true);
-    socketCheck(::connect(pimpl->socket.handle(), reinterpret_cast<sockaddr*>(&addr),
-        sizeof addr));
-    pimpl->socket.setBlocking(false);
-}
-
-Gosu::CommSocket::CommSocket(CommMode mode, Socket& socket)
-: pimpl(new Impl)
-{
-    pimpl->mode = mode;
-
-    pimpl->socket.swap(socket);
-    pimpl->socket.setBlocking(false);
-}
-
-Gosu::CommSocket::~CommSocket()
-{
-}
-
-Gosu::SocketAddress Gosu::CommSocket::address() const
-{
-    return pimpl->socket.address();
-}
-
-Gosu::SocketPort Gosu::CommSocket::port() const
-{
-    return pimpl->socket.port();
-}
-
-Gosu::SocketAddress Gosu::CommSocket::remoteAddress() const
-{
-    assert(connected());
-
-    sockaddr_in addr;
-    int size = sizeof addr;
-    socketCheck(::getpeername(pimpl->socket.handle(),
-        reinterpret_cast<sockaddr*>(&addr),
-        reinterpret_cast<socklen_t*>(&size)));
-
-    return ntohl(addr.sin_addr.s_addr);
-}
-
-Gosu::SocketPort Gosu::CommSocket::remotePort() const
-{
-    assert(connected());
-
-    sockaddr_in addr;
-    int size = sizeof addr;
-    socketCheck(::getpeername(pimpl->socket.handle(),
-        reinterpret_cast<sockaddr*>(&addr),
-        reinterpret_cast<socklen_t*>(&size)));
-    return ntohs(addr.sin_port);
-}
-
-Gosu::CommMode Gosu::CommSocket::mode() const
-{
-    return pimpl->mode;
-}
-
-bool Gosu::CommSocket::connected() const
-{
-    return pimpl->socket.handle() != INVALID_SOCKET;
-}
-
-void Gosu::CommSocket::disconnect()
-{
-    pimpl->socket.setHandle(INVALID_SOCKET);
-    // IMPR: Mmmmh. A full-blown sockets library should probably try to send
-    // the remaining contents of the outbox. This is annoying to implement,
-    // though...
-    pimpl->outbox.clear();
-    if (onDisconnection)
-        onDisconnection();
-}
-
-bool Gosu::CommSocket::keepAlive() const
-{
-    int buf;
-    int size = sizeof buf;
-    socketCheck(::getsockopt(pimpl->socket.handle(), SOL_SOCKET, SO_KEEPALIVE,
-        reinterpret_cast<char*>(&buf),
-        reinterpret_cast<socklen_t*>(&size)));
-    return buf != 0;
-}
-
-void Gosu::CommSocket::setKeepAlive(bool value)
-{
-    int buf = value;
-    socketCheck(::setsockopt(pimpl->socket.handle(), SOL_SOCKET, SO_KEEPALIVE,
-        reinterpret_cast<char*>(&buf), sizeof buf));
-}
-
-void Gosu::CommSocket::update()
-{
-    sendPendingData();
-
-    if (!connected())
-        return;
-
-    for (;;)
-    {
-        char buffer[1024];
-        int received = ::recv(pimpl->socket.handle(), buffer, sizeof buffer, 0);
-
-        if (received > 0 && received <= static_cast<int>(sizeof buffer))
-        {
-            // Data arrived and fit into the buffer.
-            pimpl->appendBuffer(buffer, received, onReceive);
-        }
-        else if (received == 0)
-        {
-            // The other side has gracefully closed the connection.
-            disconnect();
-            return;
-        }
-        else if (received == SOCKET_ERROR)
-        {
-            switch (lastSocketError())
-            {
-                // Arriving data didn't fit into the buffer.
-                case GOSU_SOCK_ERR(EMSGSIZE):
-                    pimpl->appendBuffer(buffer, sizeof buffer, onReceive);
-                    break;
-
-                // There simply was no data.
-                case GOSU_SOCK_ERR(EWOULDBLOCK):
-                    return;
-
-                // Connection was reset or is invalid.
-                case GOSU_SOCK_ERR(ENETDOWN):
-                case GOSU_SOCK_ERR(ENOTCONN):
-                case GOSU_SOCK_ERR(ENETRESET):
-                case GOSU_SOCK_ERR(ECONNABORTED):
-                case GOSU_SOCK_ERR(ETIMEDOUT):
-                case GOSU_SOCK_ERR(ECONNRESET):
-				#ifndef GOSU_IS_WIN
-				// UNIX specific, rare error
-                case GOSU_SOCK_ERR(EPIPE):
-				#endif
-                    disconnect();
-                    return;
-
-                // Everything else is unexpected.
-                default:
-                    throwLastSocketError();
-            }
-        }
-        else assert(false);
-    }
-}
-
-void Gosu::CommSocket::send(const void* buffer, std::size_t size)
-{
-    if (!connected())
-        return;
-
-    // In managed mode, also send the length of the buffer.
-    if (mode() == cmManaged)
-    {
-        std::tr1::uint32_t netSize = htonl(size);
-        const char* charBuf = reinterpret_cast<const char*>(&netSize);
-        pimpl->outbox.insert(pimpl->outbox.end(), charBuf,
-            charBuf + sizeof netSize);
-    }
-
-    const char* charBuf = reinterpret_cast<const char*>(buffer);
-    pimpl->outbox.insert(pimpl->outbox.end(), charBuf, charBuf + size);
-}
-
-void Gosu::CommSocket::sendPendingData()
-{
-    if (pendingBytes() == 0 || !connected())
-        return;
-
-    int sent = ::send(pimpl->socket.handle(), &pimpl->outbox.front(),
-        pendingBytes(), 0);
-
-    if (sent >= 0)
-    {
-        // Remove sent data from the outbox.
-        if (sent >= static_cast<int>(pendingBytes()))
-            pimpl->outbox.clear();
-        else
-            pimpl->outbox.erase(pimpl->outbox.begin(),
-                pimpl->outbox.begin() + sent);
-    }
-    else
-    {
-        switch (lastSocketError())
-        {
-            // These error codes basically mean "try again later".
-            case GOSU_SOCK_ERR(ENOBUFS):
-            case GOSU_SOCK_ERR(EWOULDBLOCK):
-            case GOSU_SOCK_ERR(EHOSTUNREACH):
-                break;
-
-            // And these tell us we're disconnected.
-            case GOSU_SOCK_ERR(ENETDOWN):
-            case GOSU_SOCK_ERR(ENETRESET):
-            case GOSU_SOCK_ERR(ENOTCONN):
-            case GOSU_SOCK_ERR(ECONNABORTED):
-            case GOSU_SOCK_ERR(ECONNRESET):
-            case GOSU_SOCK_ERR(ETIMEDOUT):
-			#ifndef GOSU_IS_WIN
-			// UNIX-specific, rare error
-            case GOSU_SOCK_ERR(EPIPE):
-			#endif
-                disconnect();
-                break;
-
-            // Everything else is unexpected.
-            default:
-                throwLastSocketError();
-        }
-    }
-}
-
-std::size_t Gosu::CommSocket::pendingBytes() const
-{
-    return pimpl->outbox.size();
-}