gosu 0.9.2 → 0.10.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -36,13 +36,17 @@ files:
 - lib/gosu.rb
 - ext/gosu/gosu_wrap.h
 - ext/gosu/gosu_wrap.cxx
-- src/X11vroot.h
+- src/stb_image.h
+- src/stb_image_write.h
+- src/UIKit/GosuAppDelegate.h
+- src/UIKit/GosuGLView.h
+- src/UIKit/GosuViewController.h
+- src/AppleUtility.hpp
 - src/Audio/ALChannelManagement.hpp
 - src/Audio/AudioFile.hpp
 - src/Audio/AudioToolboxFile.hpp
 - src/Audio/OggFile.hpp
 - src/Audio/SndFile.hpp
-- src/GosuView.hpp
 - src/Graphics/BlockAllocator.hpp
 - src/Graphics/ClipRectStack.hpp
 - src/Graphics/Common.hpp
@@ -55,17 +59,11 @@ files:
 - src/Graphics/Texture.hpp
 - src/Graphics/TransformStack.hpp
 - src/Iconv.hpp
-- src/Input/AccelerometerReader.hpp
-- src/MacUtility.hpp
-- src/Sockets/Socket.hpp
 - src/Text/FormattedString.hpp
-- src/Audio/AudioOpenAL.cpp
+- src/stb_vorbis.c
+- src/Audio/Audio.cpp
 - src/Bitmap/Bitmap.cpp
-- src/Bitmap/BitmapBMP.cpp
-- src/Bitmap/BitmapColorKey.cpp
-- src/Bitmap/BitmapFreeImage.cpp
-- src/Bitmap/BitmapGDIplus.cpp
-- src/Bitmap/BitmapUtils.cpp
+- src/Bitmap/BitmapIO.cpp
 - src/DirectoriesUnix.cpp
 - src/DirectoriesWin.cpp
 - src/FileUnix.cpp
@@ -85,10 +83,6 @@ files:
 - src/Inspection.cpp
 - src/IO.cpp
 - src/Math.cpp
-- src/Sockets/CommSocket.cpp
-- src/Sockets/ListenerSocket.cpp
-- src/Sockets/MessageSocket.cpp
-- src/Sockets/Socket.cpp
 - src/Text/Font.cpp
 - src/Text/Text.cpp
 - src/Text/TextMac.cpp
@@ -103,18 +97,17 @@ files:
 - src/Window.cpp
 - src/WinMain.cpp
 - src/WinUtility.cpp
-- src/Audio/AudioOpenAL.mm
-- src/Bitmap/BitmapApple.mm
-- src/DirectoriesMac.mm
-- src/DirectoriesTouch.mm
-- src/GosuView.mm
+- src/Audio/Audio.mm
+- src/DirectoriesApple.mm
 - src/Graphics/ResolutionApple.mm
-- src/Input/AccelerometerReader.mm
-- src/Input/InputTouch.mm
+- src/Input/InputUIKit.mm
 - src/Input/TextInputMac.mm
 - src/Text/TextApple.mm
+- src/UIKit/GosuAppDelegate.mm
+- src/UIKit/GosuGLView.mm
+- src/UIKit/GosuViewController.mm
 - src/UtilityApple.mm
-- src/WindowTouch.mm
+- src/WindowUIKit.mm
 - Gosu/Audio.hpp
 - Gosu/AutoLink.hpp
 - Gosu/Bitmap.hpp
@@ -133,7 +126,6 @@ files:
 - Gosu/IO.hpp
 - Gosu/Math.hpp
 - Gosu/Platform.hpp
-- Gosu/Sockets.hpp
 - Gosu/Text.hpp
 - Gosu/TextInput.hpp
 - Gosu/Timing.hpp

data/Gosu/Sockets.hpp

@@ -1,156 +0,0 @@
-//! \file Sockets.hpp
-//! Interface of the three socket classes, MessageSocket, CommSocket and ListenerSocket.
-
-#ifndef GOSU_SOCKETS_HPP
-#define GOSU_SOCKETS_HPP
-
-#include <Gosu/TR1.hpp>
-#include <cstddef>
-#include <string>
-#include <Gosu/Platform.hpp>
-
-namespace Gosu
-{
-    //! Addresses are returned from and given to Gosu functions in host byte order.
-    typedef std::tr1::uint32_t SocketAddress;
-
-    //! Ports are returned from and given to Gosu functions in host byte order.
-    typedef std::tr1::uint16_t SocketPort;
-    
-    //! Constant that can be used as a placeholder for an arbitrary port, e.g. when
-    //! starting to listen.
-    const SocketPort anyPort = 0;
-    
-    //! Tries to convert a dotted IP4 string into an address suitable for
-    //! socket functions. If the string supplied is not such a string, it
-    //! tries to look up the host via DNS. If both methods fail, zero is
-    //! returned.
-    SocketAddress stringToAddress(const std::string& s);
-    //! Converts an address into a dotted IP4 string.
-    std::string addressToString(SocketAddress address);
-
-    //! Wraps an UDP socket. Message sockets can send data to and receive
-    //! data from arbitrary addresses. Also, message sockets send messages
-    //! (packets) which are limited in size and can arrive in any order, or
-    //! not at all.
-    class MessageSocket
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
-        MessageSocket(const MessageSocket&) = delete;
-        MessageSocket& operator=(const MessageSocket&) = delete;
-        MessageSocket(MessageSocket&&) = delete;
-        MessageSocket& operator=(MessageSocket&&) = delete;
-#endif
-
-    public:
-        //! Opens a message socket for listening at the specified port.
-        //! Gosu::anyPort may be passed to have the message socket use
-        //! a random free port.
-        explicit MessageSocket(SocketPort port);
-        ~MessageSocket();
-
-        //! Returns the local address of the socket.
-        SocketAddress address() const;
-        //! Returns the local port of the socket.
-        SocketPort port() const;
-        //! Returns the maximum size, in bytes, of a packet that can be sent
-        //! from this socket.
-        std::size_t maxMessageSize() const;
-
-        //! Collects all the packets that were sent to this socket and
-        //! calls onReceive for each of them.
-        void update();
-
-        //! Sends something to the given port of the computer identified
-        //! by the address.
-        void send(SocketAddress address, SocketPort port,
-            const void* buffer, std::size_t size);
-        /*void broadcast(SocketPort port, const void* buffer,
-            std::size_t size);*/
-
-        //! If assigned, will be called by update for every packet received.
-        std::tr1::function<void (SocketAddress, SocketPort, const void*,
-            std::size_t)> onReceive;
-    };
-    
-    //! Defines the way in which data is collected until the onReceive event
-    //! is called for CommSockets.
-    enum CommMode
-    {
-        cmRaw,
-        //cmLines,
-        cmManaged
-    };
-    
-    class Socket;
-    
-    //! Wraps a TCP socket that is used for one part of bi-directional
-    //! communication.
-    class CommSocket
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
-        CommSocket(const CommSocket&) = delete;
-        CommSocket& operator=(const CommSocket&) = delete;
-        CommSocket(CommSocket&&) = delete;
-        CommSocket& operator=(CommSocket&&) = delete;
-#endif
-
-    public:
-        CommSocket(CommMode mode, SocketAddress targetAddress,
-            SocketPort targetPort);
-        CommSocket(CommMode mode, Socket& socket);
-        ~CommSocket();
-
-        SocketAddress address() const;
-        SocketPort port() const;
-        SocketAddress remoteAddress() const;
-        SocketPort remotePort() const;
-        CommMode mode() const;
-
-        bool connected() const;
-        void disconnect();
-        bool keepAlive() const;
-        void setKeepAlive(bool value);
-
-        void update();
-        void send(const void* buffer, std::size_t size);
-        void sendPendingData();
-        std::size_t pendingBytes() const;
-
-        std::tr1::function<void (const void*, std::size_t)> onReceive;
-        std::tr1::function<void ()> onDisconnection;
-    };
-    
-    //! Wraps a TCP socket that waits on a specific port and can create
-    //! CommSocket instances via its onConnection event.
-    class ListenerSocket
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
-        ListenerSocket(const ListenerSocket&) = delete;
-        ListenerSocket& operator=(const ListenerSocket&) = delete;
-        ListenerSocket(ListenerSocket&&) = delete;
-        ListenerSocket& operator=(ListenerSocket&&) = delete;
-#endif
-
-    public:
-        ListenerSocket(SocketPort port);
-        ~ListenerSocket();
-
-        SocketAddress address() const;
-        SocketPort port() const;
-
-        void update();
-
-        //! This signal is fired by update() whenever someone connects
-        //! to the port which is currently listened on.
-        std::tr1::function<void (Socket&)> onConnection;
-    };
-}
-
-#endif

data/src/Audio/AudioOpenAL.mm

@@ -1 +0,0 @@
-#include "AudioOpenAL.cpp"

data/src/Bitmap/BitmapApple.mm

@@ -1,226 +0,0 @@
-#include <Gosu/Graphics.hpp>
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/Utility.hpp>
-
-#include "../MacUtility.hpp"
-#include <stdexcept>
-
-#ifdef GOSU_IS_IPHONE
-#import <UIKit/UIKit.h>
-#else
-#import <AppKit/AppKit.h>
-#import <AppKit/NSStringDrawing.h>
-#endif
-
-namespace
-{
-    void CGImageToBitmap(CGImageRef imageRef, Gosu::Bitmap& bitmap)
-    {
-        static Gosu::CFRef<CGColorSpaceRef> colorSpace(CGColorSpaceCreateDeviceRGB());
-        
-        // Use a temporary context to draw the CGImage into the bitmap.
-        bitmap.resize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
-        Gosu::CFRef<CGContextRef> context(CGBitmapContextCreate(bitmap.data(), bitmap.width(), bitmap.height(),
-                                        8, bitmap.width() * 4, colorSpace.obj(), kCGImageAlphaPremultipliedLast));
-        CGContextDrawImage(context.obj(), CGRectMake(0.0, 0.0, bitmap.width(), bitmap.height()), imageRef);
-    }
-    
-    void unmultiplyAlpha(Gosu::Bitmap& bitmap)
-    {
-        int pixels = bitmap.width() * bitmap.height();
-        for (unsigned char* ptr = reinterpret_cast<unsigned char*>(bitmap.data()); pixels--; ptr += 4)
-        {
-            // Avoid division-by-zero weirdness
-            if (!ptr[3])
-                continue;
-            ptr[0] = ptr[0] * 255 / ptr[3];
-            ptr[1] = ptr[1] * 255 / ptr[3];
-            ptr[2] = ptr[2] * 255 / ptr[3];
-        }
-    }
-    
-    #ifdef GOSU_IS_IPHONE
-    #define APPLE_IMAGE UIImage
-    void appleImageToBitmap(UIImage* image, Gosu::Bitmap& bitmap)
-    {
-        CGImageToBitmap([image CGImage], bitmap);
-    }
-    #else
-    #define APPLE_IMAGE NSImage
-    void appleImageToBitmap(NSImage* image, Gosu::Bitmap& bitmap)
-    {
-        // If we have CGImageForProposedRect (10.6+), use it. This is important because the code below
-        // started to break in 10.6:
-        http://stackoverflow.com/questions/2239785/nsimage-color-shift-on-snow-leopard
-
-        if ([image respondsToSelector:@selector(CGImageForProposedRect:context:hints:)])
-        {
-            CGImageToBitmap((CGImageRef)[image CGImageForProposedRect:NULL context:nil hints:nil], bitmap);
-            unmultiplyAlpha(bitmap);
-        }
-        
-        // Otherwise, take the slow route using -drawInRect:fromRect:operation:fraction:
-        // TODO: Support vector graphics (we rely on NSBitmapImageRep right now for pixelsWide/pixelsHigh)
-        
-        id anyRep = [image bestRepresentationForDevice:nil];
-        if (![anyRep isKindOfClass:[NSBitmapImageRep class]])
-            throw std::logic_error("Cannot read vector graphics files");
-        NSBitmapImageRep* rep = (NSBitmapImageRep*)anyRep;
-        
-        bitmap.resize([rep pixelsWide], [rep pixelsHigh]);
-        
-        // Use a temporary context to draw the NSImage to the buffer. For that, construct a color
-        // space that does not alter the colors while drawing from the NSImage to the CGBitmapContext.
-        static Gosu::CFRef<CGColorSpaceRef> colorSpace(CGColorSpaceCreateDeviceRGB());
-        
-        // We do NOT want premultiplied alpha (yet?) in Gosu. However, with kCGImageAlphaLast, this
-        // call mysteriously fails.
-        Gosu::CFRef<CGContextRef> context(CGBitmapContextCreate(bitmap.data(), bitmap.width(), bitmap.height(),
-                                    8, bitmap.width() * 4,
-                                    colorSpace.obj(), kCGImageAlphaPremultipliedLast));
-        
-        [NSGraphicsContext saveGraphicsState];
-        [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:context.obj() flipped:NO]];
-        [image drawInRect:NSMakeRect(0, 0, bitmap.width(), bitmap.height()) fromRect:NSZeroRect
-            operation:NSCompositeCopy fraction:1.0];
-        [NSGraphicsContext restoreGraphicsState];
-        unmultiplyAlpha(bitmap);
-    }
-    #endif
-}
-
-// TODO: Move into proper internal header
-namespace Gosu { bool isExtension(const wchar_t* str, const wchar_t* ext); }
-
-void Gosu::loadImageFile(Bitmap& bitmap, const std::wstring& filename)
-{
-    ObjRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-    ObjRef<APPLE_IMAGE> image;
-    ObjRef<NSString> filenameRef([[NSString alloc] initWithUTF8String: wstringToUTF8(filename).c_str()]);
-    
-#ifdef GOSU_IS_IPHONE
-    if ([UIScreen mainScreen].scale > 1) {
-#endif
-        // Prevent app from automatically appending @2x to full filenames by loading into an NSData object first
-        NSData *data = [NSData dataWithContentsOfFile:filenameRef.obj()];
-        image.reset([[APPLE_IMAGE alloc] initWithData:data]);
-#ifdef GOSU_IS_IPHONE
-    }
-    else {
-        image.reset([[APPLE_IMAGE alloc] initWithContentsOfFile:filenameRef.obj()]);
-    }
-#endif
-    
-    if (! image.get())
-        throw std::runtime_error("Cannot load image file " + wstringToUTF8(filename));
-    
-    appleImageToBitmap(image.obj(), bitmap);
-    if (isExtension(filename.c_str(), L".bmp"))
-        applyColorKey(bitmap, Color::FUCHSIA);
-}
-
-void Gosu::loadImageFile(Bitmap& bitmap, Reader reader)
-{
-    char signature[2];
-    reader.read(signature, 2);
-    reader.seek(-2);
-    
-    ObjRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-    
-    std::size_t length = reader.resource().size() - reader.position();
-    ObjRef<NSMutableData> buffer([[NSMutableData alloc] initWithLength: length]);
-    reader.read([buffer.get() mutableBytes], length);
-    
-    ObjRef<APPLE_IMAGE> image([[APPLE_IMAGE alloc] initWithData: buffer.get()]);
-    if (!image.get())
-        throw std::runtime_error("Cannot load image file from stream");
-    
-    appleImageToBitmap(image.obj(), bitmap);
-    if (signature[0] == 'B' && signature[1] == 'M')
-        applyColorKey(bitmap, Color::FUCHSIA);
-}
-
-void Gosu::saveImageFile(const Bitmap& bitmap, const std::wstring& filename)
-{
-    Buffer buffer;
-    saveImageFile(bitmap, buffer.backWriter(), filename);
-    saveFile(buffer, filename);
-}
-
-#ifndef GOSU_IS_IPHONE
-void Gosu::saveImageFile(const Bitmap& originalBitmap, Writer writer, const std::wstring& formatHint)
-{
-    NSBitmapImageFileType fileType;
-    if (isExtension(formatHint.c_str(), L"png"))
-        fileType = NSPNGFileType;
-    else if (isExtension(formatHint.c_str(), L"bmp"))
-        fileType = NSBMPFileType;
-    else if (isExtension(formatHint.c_str(), L"gif"))
-        fileType = NSGIFFileType;
-    else if (isExtension(formatHint.c_str(), L"jpg") || isExtension(formatHint.c_str(), L"jpeg"))
-        fileType = NSJPEGFileType;
-    else if (isExtension(formatHint.c_str(), L"tif") || isExtension(formatHint.c_str(), L"tiff"))
-        fileType = NSTIFFFileType;
-    else
-        throw std::runtime_error("Unsupported image format for writing: " + wstringToUTF8(formatHint));
-    
-    Bitmap copyOfBitmap;
-    const Bitmap& bitmap = (fileType == NSBMPFileType) ? copyOfBitmap : originalBitmap;
-    if (fileType == NSBMPFileType)
-    {
-        copyOfBitmap = originalBitmap;
-        unapplyColorKey(copyOfBitmap, Color::FUCHSIA);
-    }
-
-    unsigned char* plane = (unsigned char*)bitmap.data();
-    ObjRef<NSBitmapImageRep> rep([[NSBitmapImageRep alloc]
-        initWithBitmapDataPlanes:&plane pixelsWide:bitmap.width() pixelsHigh:bitmap.height()
-        bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO
-        colorSpaceName:NSDeviceRGBColorSpace // Nobody really seems to know which one to use
-        bitmapFormat:NSAlphaNonpremultipliedBitmapFormat bytesPerRow:bitmap.width() * 4 bitsPerPixel:32]);
-
-    ObjRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-    NSData* data = [rep.obj() representationUsingType:fileType properties:nil];
-    writer.write([data bytes], [data length]);
-}
-#else
-void Gosu::saveImageFile(const Bitmap& bmp, Writer writer, const std::wstring& formatHint)
-{    
-    if (isExtension(formatHint.c_str(), L"bmp"))
-    {
-        Bitmap bitmap = bmp;
-        unapplyColorKey(bitmap, Color::FUCHSIA);
-        Gosu::saveToBMP(bitmap, writer);
-        return;
-    }
-    
-    ObjRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-    
-    CGDataProviderRef dataProvider =
-        CGDataProviderCreateWithData(0, bmp.data(), bmp.width() * bmp.height() * 4, 0);
-    
-    static CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB();
-    
-    CGImageRef imageRef =
-        CGImageCreate(bmp.width(), bmp.height(), 8, 32, bmp.width() * 4, colorspace,
-                      kCGImageAlphaLast, dataProvider, 0, false, kCGRenderingIntentDefault);
-    
-    ObjRef<UIImage> image([[UIImage alloc] initWithCGImage: imageRef]);
-    
-    NSData* data;
-    if (isExtension(formatHint.c_str(), L"jpeg") || isExtension(formatHint.c_str(), L"jpg"))
-        data = UIImageJPEGRepresentation(image.get(), 0.0);
-    else if (isExtension(formatHint.c_str(), L"png"))
-        data = UIImagePNGRepresentation(image.get());
-    else
-        throw std::runtime_error("Unsupported image format for writing: " + wstringToUTF8(formatHint));
-    writer.write([data bytes], [data length]);
-    image.reset();
-    
-    CGImageRelease(imageRef);
-    
-    CGDataProviderRelease(dataProvider);
-}
-#endif