gosu 0.10.9.pre1 → 0.11.0

data/src/Audio/Audio.mm

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

data/src/Audio/AudioFile.hpp

@@ -1,53 +0,0 @@
-#ifndef GOSU_SRC_AUDIO_AUDIOFILE_HPP
-#define GOSU_SRC_AUDIO_AUDIOFILE_HPP
-
-#include <vector>
-#include <Gosu/Platform.hpp>
-#ifdef GOSU_IS_MAC
-#include <OpenAL/al.h>
-#else
-#include <AL/al.h>
-#endif
-
-namespace Gosu
-{
-    class AudioFile
-    {
-        AudioFile(const AudioFile&);
-        AudioFile& operator=(const AudioFile&);
-        
-        std::vector<char> decodedData_;
-        
-    public:
-        AudioFile() {}
-        virtual ~AudioFile() {}
-        virtual ALenum format() const = 0;
-        virtual ALuint sampleRate() const = 0;
-        virtual std::size_t readData(void* dest, std::size_t length) = 0;
-        virtual void rewind() = 0;
-        
-        const std::vector<char>& decodedData()
-        {
-            static const unsigned INCREMENT = 512*1024;
-            
-            if (!decodedData_.empty())
-                return decodedData_;
-            
-            for (;;)
-            {
-                decodedData_.resize(decodedData_.size() + INCREMENT);
-                int readBytes = readData(&decodedData_[decodedData_.size() - INCREMENT],
-                                    INCREMENT);
-                if (readBytes < INCREMENT)
-                {
-                    decodedData_.resize(decodedData_.size() - INCREMENT + readBytes);
-                    break;
-                }
-            }
-            
-            return decodedData_;
-        }
-    };
-}
-
-#endif

data/src/Audio/AudioToolboxFile.hpp

@@ -1,207 +0,0 @@
-#ifndef GOSU_SRC_AUDIO_AUDIOFILE_MAC_HPP
-#define GOSU_SRC_AUDIO_AUDIOFILE_MAC_HPP
-
-#include "AudioFile.hpp"
-#include <AudioToolbox/AudioToolbox.h>
-#include <AudioToolbox/AudioConverter.h>
-#include <AudioToolbox/ExtendedAudioFile.h>
-#include <OpenAL/al.h>
-#include <Gosu/IO.hpp>
-#include <Gosu/Utility.hpp>
-#include <Gosu/Platform.hpp>
-#include "../AppleUtility.hpp"
-#include <algorithm>
-#include <vector>
-#include <arpa/inet.h>
-#import <Foundation/Foundation.h>
-
-namespace Gosu
-{
-    class AudioToolboxFile : public AudioFile
-    {
-        Gosu::Buffer buffer_;
-        AudioFileID fileID_;
-        ExtAudioFileRef file_;
-        SInt64 position_;
-        SInt64 seekOffset_;
-        
-        ALenum format_;
-        ALuint sampleRate_;
-        UInt32 bytesPerFrame_;
-        bool bigEndian_;
-        
-        static OSStatus AudioFile_ReadProc(void* inClientData, SInt64 inPosition,
-            UInt32 requestCount, void* buffer, UInt32* actualCount)
-        {
-            const Resource& res = *static_cast<Resource*>(inClientData);
-            *actualCount = std::min<UInt32>(requestCount, res.size() - inPosition);
-            res.read(inPosition, *actualCount, buffer);
-            return noErr;
-        }
-        
-        static SInt64 AudioFile_GetSizeProc(void* inClientData)
-        {
-            const Resource& res = *static_cast<Resource*>(inClientData);
-            return res.size();
-        }
-        
-        void initSeekOffset()
-        {
-            AudioConverterRef acRef;
-            UInt32 acrSize = sizeof acRef;
-            CHECK_OS(ExtAudioFileGetProperty(file_, kExtAudioFileProperty_AudioConverter,
-                &acrSize, &acRef));
-            
-            AudioConverterPrimeInfo primeInfo;
-            UInt32 piSize = sizeof primeInfo;
-            OSStatus result = AudioConverterGetProperty(acRef, kAudioConverterPrimeInfo,
-                &piSize, &primeInfo);
-            if (result != kAudioConverterErr_PropertyNotSupported)
-            {
-                CHECK_OS(result);
-                seekOffset_ = primeInfo.leadingFrames;
-            }
-        }
-        
-        void initClientFormatBasedOn(const AudioStreamBasicDescription& base)
-        {
-            AudioStreamBasicDescription clientData = { 0 };
-            sampleRate_ = clientData.mSampleRate = 22050;
-            clientData.mFormatID = kAudioFormatLinearPCM;
-            clientData.mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked;
-            clientData.mBitsPerChannel = 16;
-            clientData.mChannelsPerFrame = base.mChannelsPerFrame;
-            clientData.mFramesPerPacket = 1;
-            clientData.mBytesPerPacket =
-                clientData.mBytesPerFrame =
-                    clientData.mChannelsPerFrame * clientData.mBitsPerChannel / 8;
-            CHECK_OS(ExtAudioFileSetProperty(file_,
-                kExtAudioFileProperty_ClientDataFormat,
-                sizeof clientData, &clientData));
-            
-            initSeekOffset();
-                
-            format_ = clientData.mChannelsPerFrame == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
-        }
-        
-        void init()
-        {
-            // Streaming starts at beginning
-            position_ = 0;
-            
-            // Unless overridden later, assume that the index into seek() is 0-based
-            seekOffset_ = 0;
-            
-            AudioStreamBasicDescription desc;
-            UInt32 sizeOfProperty = sizeof desc;
-            CHECK_OS(ExtAudioFileGetProperty(file_, kExtAudioFileProperty_FileDataFormat,
-                &sizeOfProperty, &desc));
-
-            // Sample rate for OpenAL
-            sampleRate_ = desc.mSampleRate;
-            
-            // Sanity checks
-            if (desc.mFormatFlags & kAudioFormatFlagIsNonInterleaved)
-                throw std::runtime_error("Non-interleaved formats are unsupported");
-            
-            // Easy formats
-            format_ = 0;
-            if (desc.mChannelsPerFrame == 1)
-            {
-                /*if (desc.mBitsPerChannel == 8)
-                    format_ = AL_FORMAT_MONO8;
-                else*/ if (desc.mBitsPerChannel == 16)
-                    format_ = AL_FORMAT_MONO16;
-            }
-            else if (desc.mChannelsPerFrame == 2)
-            {
-                /*if (desc.mBitsPerChannel == 8)
-                    format_ = AL_FORMAT_STEREO8;
-                else */if (desc.mBitsPerChannel == 16)
-                    format_ = AL_FORMAT_STEREO16;
-            }
-            
-            if (format_ == 0 ||
-                    // If format not native for OpenAL, set client data format
-                    // to enable conversion
-                    desc.mFormatFlags & kAudioFormatFlagIsBigEndian ||
-                    desc.mFormatFlags & kAudioFormatFlagIsFloat ||
-                    !(desc.mFormatFlags & kAudioFormatFlagIsSignedInteger)) {
-                initClientFormatBasedOn(desc);
-            }
-            else {
-                // Just set the old format as the client format so
-                // ExtAudioFileSeek will work for us.
-                CHECK_OS(ExtAudioFileSetProperty(file_,
-                    kExtAudioFileProperty_ClientDataFormat,
-                    sizeof desc, &desc));
-            }
-        }
-        
-    public:
-        AudioToolboxFile(const std::wstring& filename)
-        {
-            NSString *utf8Filename = [NSString stringWithUTF8String:wstringToUTF8(filename).c_str()];
-            NSURL *URL = [NSURL fileURLWithPath:utf8Filename];
-            CHECK_OS(ExtAudioFileOpenURL((__bridge CFURLRef)URL, &file_));
-            
-            fileID_ = 0;
-            
-            init();
-        }
-        
-        AudioToolboxFile(Gosu::Reader reader)
-        {
-            buffer_.resize(reader.resource().size() - reader.position());
-            reader.read(buffer_.data(), buffer_.size());
-            
-            // TODO: This fails on iOS with MP3 files.
-            // TODO: ^ Is the comment above still true on non-ancient iOS versions?
-            
-            void* clientData = &buffer_;
-            CHECK_OS(AudioFileOpenWithCallbacks(clientData, AudioFile_ReadProc, 0,
-                                                AudioFile_GetSizeProc, 0, 0, &fileID_));
-            CHECK_OS(ExtAudioFileWrapAudioFileID(fileID_, false, &file_));
-            
-            init();
-        }
-        
-        ~AudioToolboxFile()
-        {
-            ExtAudioFileDispose(file_);
-        
-            if (fileID_) {
-                AudioFileClose(fileID_);
-            }
-        }
-        
-        ALenum format() const
-        {
-            return format_;
-        }
-        
-        ALuint sampleRate() const
-        {
-            return sampleRate_;
-        }
-        
-        void rewind()
-        {
-            CHECK_OS(ExtAudioFileSeek(file_, 0 + seekOffset_));
-        }
-        
-        std::size_t readData(void* dest, size_t length)
-        {
-            AudioBufferList abl;
-            abl.mNumberBuffers = 1;
-            abl.mBuffers[0].mNumberChannels = 1;
-            abl.mBuffers[0].mDataByteSize = length;
-            abl.mBuffers[0].mData = dest;
-            UInt32 numFrames = 0xffffffff; // give us as many frames as possible given our buffer
-            CHECK_OS(ExtAudioFileRead(file_, &numFrames, &abl));
-            return abl.mBuffers[0].mDataByteSize;
-        }
-    };
-}
-
-#endif

data/src/Bitmap/Bitmap.cpp

@@ -1,183 +0,0 @@
-#include <Gosu/Bitmap.hpp>
-#include <cassert>
-#include <algorithm>
-#include <vector>
-
-void Gosu::Bitmap::swap(Bitmap& other)
-{
-    std::swap(pixels, other.pixels);
-    std::swap(w, other.w);
-    std::swap(h, other.h);
-}
-
-void Gosu::Bitmap::resize(unsigned width, unsigned height, Color c)
-{
-    if (width == w && height == h)
-        return;
-
-    Bitmap temp(width, height, c);
-    temp.insert(*this, 0, 0);
-    swap(temp);
-}
-
-void Gosu::Bitmap::fill(Color c)
-{
-    std::fill(pixels.begin(), pixels.end(), c);
-}
-
-void Gosu::Bitmap::replace(Color what, Color with)
-{
-    std::replace(pixels.begin(), pixels.end(), what, with);
-}
-
-void Gosu::Bitmap::insert(const Bitmap& source, int x, int y)
-{
-    insert(source, x, y, 0, 0, source.width(), source.height());
-}
-
-void Gosu::Bitmap::insert(const Bitmap& source, int x, int y, unsigned srcX,
-    unsigned srcY, unsigned srcWidth, unsigned srcHeight)
-{
-    // TODO: This should use memcpy if possible (x == 0 && srcWidth == this->width())
-
-    if (x < 0)
-    {
-        unsigned clipLeft = -x;
-
-        if (clipLeft >= srcWidth)
-            return;
-
-        srcX += clipLeft;
-        srcWidth -= clipLeft;
-        x = 0;
-    }
-
-    if (y < 0)
-    {
-        unsigned clipTop = -y;
-
-        if (clipTop >= srcHeight)
-            return;
-
-        srcY += clipTop;
-        srcHeight -= clipTop;
-        y = 0;
-    }
-
-    if (x + srcWidth > w)
-    {
-        if (static_cast<unsigned>(x) >= w)
-            return;
-
-        srcWidth = w - x;
-    }
-
-    if (y + srcHeight > h)
-    {
-        if (static_cast<unsigned>(y) >= h)
-            return;
-
-        srcHeight = h - y;
-    }
-
-    for (unsigned relY = 0; relY < srcHeight; ++relY)
-        for (unsigned relX = 0; relX < srcWidth; ++relX)
-            setPixel(x + relX, y + relY,
-                source.getPixel(srcX + relX, srcY + relY));
-}
-
-void Gosu::applyColorKey(Bitmap& bitmap, Color key)
-{
-    std::vector<Color> surroundingColors;
-    surroundingColors.reserve(4);
-
-    for (unsigned y = 0; y < bitmap.height(); ++y)
-        for (unsigned x = 0; x < bitmap.width(); ++x)
-            if (bitmap.getPixel(x, y) == key)
-            {
-                surroundingColors.clear();
-                if (x > 0 && bitmap.getPixel(x - 1, y) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x - 1, y));
-                if (x < bitmap.width() - 1 && bitmap.getPixel(x + 1, y) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x + 1, y));
-                if (y > 0 && bitmap.getPixel(x, y - 1) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x, y - 1));
-                if (y < bitmap.height() - 1 && bitmap.getPixel(x, y + 1) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x, y + 1));
-
-                if (surroundingColors.empty())
-                {
-                    bitmap.setPixel(x, y, Color::NONE);
-                    continue;
-                }
-
-                unsigned red = 0, green = 0, blue = 0;
-                for (unsigned i = 0; i < surroundingColors.size(); ++i)
-                {
-                    red += surroundingColors[i].red();
-                    green += surroundingColors[i].green();
-                    blue += surroundingColors[i].blue();
-                }
-                bitmap.setPixel(x, y, Color(0, red / surroundingColors.size(),
-                    green / surroundingColors.size(), blue / surroundingColors.size()));
-            }
-}
-
-void Gosu::unapplyColorKey(Bitmap& bitmap, Color color)
-{
-    Color* p = bitmap.data();
-    for (int i = bitmap.width() * bitmap.height(); i > 0; --i, ++p)
-        if (p->alpha() == 0)
-            *p = color;
-        else
-            p->setAlpha(255);
-}
-
-void Gosu::applyBorderFlags(Bitmap& dest, const Bitmap& source,
-    unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-    unsigned imageFlags)
-{
-    // Backwards compatibility: This used to be 'bool tileable'.
-    if (imageFlags == 1)
-        imageFlags = ifTileable;
-
-    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/Bitmap/BitmapIO.cpp

@@ -1,176 +0,0 @@
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Utility.hpp>
-
-#include <cstring>
-#include <stdexcept>
-
-#define STB_IMAGE_IMPLEMENTATION
-#define STBI_NO_STDIO
-#define STBI_NO_LINEAR
-
-// Work around this bug:
-// https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
-#ifdef GOSU_IS_X
-#define STBI_NO_SIMD
-#endif
-
-#include "../stb_image.h"
-
-namespace
-{
-    int readCallback(void* user, char* data, int size)
-    {
-        Gosu::Reader* reader = static_cast<Gosu::Reader*>(user);
-        std::size_t remaining = reader->resource().size() - reader->position();
-        std::size_t actualSize = (size < remaining ? size : remaining);
-        reader->read(data, actualSize);
-        return actualSize;
-    }
-
-    void skipCallback(void* user, int n)
-    {
-        Gosu::Reader* reader = static_cast<Gosu::Reader*>(user);
-        reader->setPosition(reader->position() + n);
-    }
-
-    int eofCallback(void* user)
-    {
-        Gosu::Reader* reader = static_cast<Gosu::Reader*>(user);
-        return reader->position() == reader->resource().size();
-    }
-
-    bool isBMP(Gosu::Reader reader)
-    {
-        std::size_t remaining = reader.resource().size() - reader.position();
-        if (remaining < 2)
-            return false;
-        char magicBytes[2];
-        reader.read(magicBytes, sizeof magicBytes);
-        reader.seek(sizeof magicBytes);
-        return magicBytes[0] == 'B' && magicBytes[1] == 'M';
-    }
-}
-
-void Gosu::loadImageFile(Gosu::Bitmap& bitmap, const std::wstring& filename)
-{
-    Buffer buffer;
-    loadFile(buffer, filename);
-    loadImageFile(bitmap, buffer.frontReader());
-}
-
-void Gosu::loadImageFile(Gosu::Bitmap& bitmap, Reader input)
-{
-    bool needsColorKey = isBMP(input);
-    
-    stbi_io_callbacks callbacks;
-    callbacks.read = readCallback;
-    callbacks.skip = skipCallback;
-    callbacks.eof = eofCallback;
-    int x, y, n;
-    stbi_uc* bytes = stbi_load_from_callbacks(&callbacks, &input, &x, &y, &n, STBI_rgb_alpha);
-
-    if (bytes == 0) {
-        // TODO - stbi_failure_reason is not thread safe. Everything here should be wrapped in a mutex.
-        throw std::runtime_error("Cannot load image: " + std::string(stbi_failure_reason()));
-    }
-
-    bitmap.resize(x, y);
-    std::memcpy(bitmap.data(), bytes, x * y * sizeof(Gosu::Color));
-
-    stbi_image_free(bytes);
-    
-    if (needsColorKey)
-        applyColorKey(bitmap, Gosu::Color::FUCHSIA);
-}
-
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "../stb_image_write.h"
-
-// TODO: Move into proper internal header
-namespace Gosu { bool isExtension(const wchar_t* str, const wchar_t* ext); }
-
-void Gosu::saveImageFile(const Gosu::Bitmap& bitmap, const std::wstring& filename)
-{
-    int ok;
-    std::string utf8 = Gosu::wstringToUTF8(filename);
-    
-    if (isExtension(filename.c_str(), L"bmp"))
-    {
-        ok = stbi_write_bmp(utf8.c_str(), bitmap.width(), bitmap.height(), 4, bitmap.data());
-    }
-    else if (isExtension(filename.c_str(), L"tga"))
-    {
-        ok = stbi_write_tga(utf8.c_str(), bitmap.width(), bitmap.height(), 4, bitmap.data());
-    }
-    else
-    {
-        ok = stbi_write_png(utf8.c_str(), bitmap.width(), bitmap.height(), 4, bitmap.data(), 0);
-    }
-    
-    if (ok == 0)
-        throw std::runtime_error("Could not save image data to file: " + utf8);
-}
-
-namespace
-{
-    void stbiWriteToWriter(void *context, void *data, int size)
-    {
-        Gosu::Writer *writer = reinterpret_cast<Gosu::Writer*>(context);
-        writer->write(data, size);
-    }
-}
-
-void Gosu::saveImageFile(const Gosu::Bitmap& bitmap, Gosu::Writer writer,
-    const std::wstring& formatHint)
-{
-    int ok;
-    
-    if (isExtension(formatHint.c_str(), L"bmp"))
-    {
-        ok = stbi_write_bmp_to_func(stbiWriteToWriter, &writer,
-                                    bitmap.width(), bitmap.height(), 4, bitmap.data());
-    }
-    else if (isExtension(formatHint.c_str(), L"tga"))
-    {
-        stbi_write_tga_with_rle = 0;
-        ok = stbi_write_tga_to_func(stbiWriteToWriter, &writer,
-                                    bitmap.width(), bitmap.height(), 4, bitmap.data());
-    }
-    else
-    {
-        ok = stbi_write_png_to_func(stbiWriteToWriter, &writer,
-                                    bitmap.width(), bitmap.height(), 4, bitmap.data(), 0);
-    }
-    
-    if (ok == 0)
-        throw std::runtime_error("Could not save image data to memory (format hint = '" +
-                                 Gosu::wstringToUTF8(formatHint) + "'");
-}
-
-// Deprecated methods.
-
-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, L".png");
-    return writer.resource().backWriter();
-}
-
-Gosu::Writer Gosu::saveToBMP(const Bitmap& bitmap, Writer writer)
-{
-    saveImageFile(bitmap, writer, L".bmp");
-    return writer.resource().backWriter();
-}