gosu 0.10.9.pre1 → 0.11.0

data/src/Text/TextWin.cpp

@@ -1,186 +0,0 @@
-#define _WIN32_WINNT 0x0500 
-#include <windows.h>
-
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/Text.hpp>
-#include <Gosu/Utility.hpp>
-#include "../WinUtility.hpp"
-#include <cstdlib>
-#include <cwchar>
-#include <algorithm>
-#include <stdexcept>
-#include <map>
-#include <set>
-
-std::wstring Gosu::defaultFontName()
-{
-    return L"Arial";
-}
-
-namespace Gosu
-{
-    std::wstring getNameFromTTFFile(const std::wstring& filename);
-
-    namespace
-    {
-        class WinBitmap
-        {
-            WinBitmap(const WinBitmap&);
-            WinBitmap& operator=(const WinBitmap&);
-            
-            HDC dc;
-            HBITMAP bitmap;
-            char* pixels;
-
-        public:
-            WinBitmap(unsigned width, unsigned height)
-            {
-                dc = Win::check(::CreateCompatibleDC(0),
-                    "creating a device context");
-
-                BITMAPCOREHEADER coreHeader;
-                coreHeader.bcSize     = sizeof coreHeader;
-                coreHeader.bcWidth    = width;
-                coreHeader.bcHeight   = height;
-                coreHeader.bcPlanes   = 1;
-                coreHeader.bcBitCount = 24;
-
-                bitmap = ::CreateDIBSection(dc,
-                    reinterpret_cast<BITMAPINFO*>(&coreHeader), DIB_RGB_COLORS,
-                    reinterpret_cast<VOID**>(&pixels), 0, 0);
-                if (bitmap == 0)
-                {
-                    ::DeleteDC(dc);
-                    Win::throwLastError("creating a bitmap");
-                }
-
-                ::SelectObject(dc, bitmap);
-
-                HBRUSH brush = ::CreateSolidBrush(0x000000);
-                RECT rc = { 0, 0, width, height };
-                ::FillRect(dc, &rc, brush);
-                ::DeleteObject(brush);
-            }
-
-            ~WinBitmap()
-            {
-                ::DeleteObject(bitmap);
-                ::SelectObject(dc, ::GetStockObject(SYSTEM_FONT));
-                ::DeleteDC(dc);
-            }
-
-            HDC context() const
-            {
-                return dc;
-            }
-
-            HBITMAP handle() const
-            {
-                return bitmap;
-            }
-
-            void selectFont(std::wstring fontName, unsigned fontHeight,
-                unsigned fontFlags) const
-            {
-                // TODO for ASYNC support:
-                // Use a lock on both maps.
-
-                // Note:
-                // The caching of opened fonts didn't really show improved text rendering
-                // performance on my test system.
-                // In case of trouble, it can be taken out without worrying too much.
-
-                static std::map<std::wstring, std::wstring> customFonts;
-                
-                if (fontName.find(L"/") != std::wstring::npos)
-                {
-                    if (customFonts.count(fontName) == 0)
-                    {
-                        AddFontResourceEx(fontName.c_str(), FR_PRIVATE, 0);
-                        fontName = customFonts[fontName] = getNameFromTTFFile(fontName);
-                    }
-                    else
-                        fontName = customFonts[fontName];
-                }
-                
-				static std::map<std::pair<std::wstring, unsigned>, HFONT> loadedFonts;
-                
-                HFONT font;
-				std::pair<std::wstring, unsigned> key =
-					std::make_pair(fontName, fontHeight | fontFlags << 16);
-                if (loadedFonts.count(key) == 0)
-                {
-                    LOGFONT logfont = { fontHeight, 0, 0, 0,
-                        fontFlags & ffBold ? FW_BOLD : FW_NORMAL,
-                        fontFlags & ffItalic ? TRUE : FALSE,
-                        fontFlags & ffUnderline ? TRUE : FALSE,
-                        FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
-                        CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
-                        DEFAULT_PITCH | FF_DONTCARE };
-                    
-                    // Don't rely on wcsncpy being in std::...
-                    using namespace std;
-                    wcsncpy(logfont.lfFaceName, fontName.c_str(), LF_FACESIZE);
-                    logfont.lfFaceName[LF_FACESIZE - 1] = 0;
-                    
-                    font = loadedFonts[key] = Win::check(::CreateFontIndirect(&logfont),
-                        "creating font object for " + narrow(fontName));
-                }
-                else
-                    font = loadedFonts[key];
-
-                ::SelectObject(dc, font);
-            }
-        };
-    }
-};
-
-unsigned Gosu::textWidth(const std::wstring& text,
-    const std::wstring& fontName, unsigned fontHeight, unsigned fontFlags)
-{
-    if (text.find_first_of(L"\r\n") != std::wstring::npos)
-        throw std::invalid_argument("the argument to textWidth cannot contain line breaks");
-    
-    WinBitmap helper(1, 1);
-    helper.selectFont(fontName, fontHeight, fontFlags);
-    
-    SIZE size;
-    if (!::GetTextExtentPoint32(helper.context(), text.c_str(), text.length(), &size))
-        Win::throwLastError("calculating the width of a text");
-    
-    return size.cx;
-}
-
-void Gosu::drawText(Bitmap& bitmap, const std::wstring& text, int x, int y,
-    Color c, const std::wstring& fontName, unsigned fontHeight,
-    unsigned fontFlags)
-{
-    if (text.find_first_of(L"\r\n") != std::wstring::npos)
-        throw std::invalid_argument("the argument to drawText cannot contain line breaks");
-    
-    unsigned width = textWidth(text, fontName, fontHeight, fontFlags);
-
-    WinBitmap helper(width, fontHeight);
-    helper.selectFont(fontName, fontHeight, fontFlags);
-
-    if (::SetTextColor(helper.context(), 0xffffff) == CLR_INVALID)
-        Win::throwLastError("setting the text color");
-
-    Win::check(::SetBkMode(helper.context(), TRANSPARENT),
-        "setting a bitmap's background mode to TRANSPARENT");
-
-    ::ExtTextOut(helper.context(), 0, 0, 0, 0, text.c_str(), text.length(), 0);
-    
-    for (unsigned relY = 0; relY < fontHeight; ++relY)
-        for (unsigned relX = 0; relX < width; ++relX)
-        {
-            Color pixel = c;
-            Color::Channel srcAlpha = GetPixel(helper.context(), relX, relY) & 0xff;
-            if (srcAlpha == 0)
-                continue;
-            pixel = multiply(c, Color(srcAlpha, 255, 255, 255));
-            if (pixel != 0 && x + relX >= 0 && x + relX < bitmap.width() &&
-                y + relY >= 0 && y + relY < bitmap.height())
-                bitmap.setPixel(x + relX, y + relY, pixel);
-        }
-}

data/src/UIKit/GosuAppDelegate.mm

@@ -1,24 +0,0 @@
-#import "GosuAppDelegate.h"
-#import <Gosu/Gosu.hpp>
-
-
-@implementation GosuAppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    self.window = (__bridge UIWindow *)windowInstance().UIWindow();
-    [self.window makeKeyAndVisible];
-    
-    return YES;
-}
-
-@end
-
-
-int main(int argc, char *argv[])
-{
-    @autoreleasepool {
-        Gosu::useResourceDirectory();
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([GosuAppDelegate class]));
-    }
-}

data/src/UIKit/GosuViewController.mm

@@ -1,211 +0,0 @@
-#import "GosuViewController.h"
-#import "GosuGLView.h"
-#import "../Graphics/Common.hpp"
-#import <Gosu/Gosu.hpp>
-
-#import <OpenAL/alc.h>
-#import <AudioToolbox/AudioSession.h>
-
-
-namespace Gosu
-{
-    namespace FPS
-    {
-        void registerFrame();
-    }
-    
-    ALCcontext *sharedContext();
-}
-
-
-// TODO: This has been written on iOS 3.x.
-// Is this still the best way to handle interruptions?
-static void handleAudioInterruption(void *unused, UInt32 inInterruptionState)
-{
-    if (inInterruptionState == kAudioSessionBeginInterruption) {
-        alcMakeContextCurrent(NULL);
-    }
-    else if (inInterruptionState == kAudioSessionEndInterruption) {
-        alcMakeContextCurrent(Gosu::sharedContext());
-    }
-}
-
-
-@implementation GosuViewController
-{
-    BOOL _paused;
-    BOOL _musicPaused;
-    id _timerOrDisplayLink;
-}
-
-#pragma mark - UIViewController
-
-- (void)loadView
-{
-    self.view = [[GosuGLView alloc] initWithFrame:[UIScreen mainScreen].bounds];
-}
-
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (BOOL)shouldAutorotate
-{
-    return YES;
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
-}
-
-- (NSUInteger)supportedInterfaceOrientations
-{
-    return UIInterfaceOrientationMaskLandscape;
-}
-
-- (GosuGLView *)GLView
-{
-    return (GosuGLView *)self.view;
-}
-
-- (Gosu::Window &)gosuWindowReference
-{
-    NSAssert(self.gosuWindow,
-             @"gosuWindow needs to be set before showing GosuViewController");
-    
-    return *(Gosu::Window *)self.gosuWindow;
-}
-
-#pragma mark - Notifications (handle pausing)
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    AudioSessionInitialize(NULL, NULL, handleAudioInterruption, NULL);
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
-}
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-- (void)applicationDidBecomeActive:(NSNotification *)notification
-{
-    if (_musicPaused) {
-        if (Gosu::Song::currentSong())
-            Gosu::Song::currentSong()->play();
-        _musicPaused = NO;
-    }
-    _paused = NO;
-}
-
-- (void)applicationWillResignActive:(NSNotification *)notification
-{
-    if (Gosu::Song::currentSong()) {
-        Gosu::Song::currentSong()->pause();
-        _musicPaused = YES;
-    }
-    _paused = YES;
-    
-    self.gosuWindowReference.loseFocus();
-}
-
-- (void)applicationWillEnterForeground:(NSNotification *)notification
-{
-    [self setupTimerOrDisplayLink];
-}
-
-- (void)applicationDidEnterBackground:(NSNotification *)notification
-{
-    [_timerOrDisplayLink invalidate];
-    _timerOrDisplayLink = nil;
-}
-
-#pragma mark - Redraw & update "loop"
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    
-    [self setupTimerOrDisplayLink];
-    
-    [UIApplication sharedApplication].statusBarHidden = YES;
-}
-
-- (void)setupTimerOrDisplayLink
-{
-    if (_timerOrDisplayLink)
-        return;
-    
-    NSInteger targetFPS = round(1000.0 / self.gosuWindowReference.updateInterval());
-    
-    if (60 % targetFPS != 0) {
-        NSTimeInterval interval = self.gosuWindowReference.updateInterval() / 1000.0;
-        NSTimer *timer = [NSTimer scheduledTimerWithTimeInterval:interval target:self selector:@selector(updateAndDraw:) userInfo:nil repeats:YES];
-        
-        _timerOrDisplayLink = timer;
-    }
-    else {
-        CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateAndDraw:)];
-        displayLink.frameInterval = 60 / targetFPS;
-        [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
-        
-        _timerOrDisplayLink = displayLink;
-    }
-}
-
-- (void)updateAndDraw:(id)sender
-{
-    Gosu::Window& window = self.gosuWindowReference;
-    
-    window.input().update();
-    
-    if (!_paused) {
-        window.update();
-    }
-    
-    if (window.needsRedraw()) {
-        [self.GLView redrawGL:^{
-            if (window.graphics().begin()) {
-                window.draw();
-                window.graphics().end();
-                
-                Gosu::FPS::registerFrame();
-            }
-        }];
-    }
-    
-    Gosu::Song::update();
-}
-
-#pragma mark - Touch forwarding
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    self.gosuWindowReference.input().feedTouchEvent(0, (__bridge void *)touches);
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    self.gosuWindowReference.input().feedTouchEvent(1, (__bridge void *)touches);
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    self.gosuWindowReference.input().feedTouchEvent(2, (__bridge void *)touches);
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    self.gosuWindowReference.input().feedTouchEvent(3, (__bridge void *)touches);
-}
-
-@end

data/src/UtilityApple.mm

@@ -1,63 +0,0 @@
-#include <Gosu/Utility.hpp>
-#include <Gosu/Platform.hpp>
-#include "AppleUtility.hpp"
-#import <Foundation/Foundation.h>
-#include <stdexcept>
-#include <vector>
-using namespace std;
-
-#ifdef GOSU_IS_IPHONE // (but could also be used for OS X)
-wstring Gosu::utf8ToWstring(const string& s)
-{
-    if (s.empty()) {
-        return wstring();
-    }
-    
-    NSString *str = [NSString stringWithUTF8String:s.c_str()];
-    vector<wchar_t> buffer(s.size());
-    NSUInteger usedBufferCount;
-    if (![str getBytes:&buffer[0]
-             maxLength:buffer.size() * sizeof(wchar_t)
-            usedLength:&usedBufferCount
-              encoding:NSUTF32LittleEndianStringEncoding
-               options:0
-                 range:NSMakeRange(0, str.length)
-            remainingRange:NULL]) {
-        throw std::runtime_error("String " + s + " could not be converted to Unicode");
-    }
-    return wstring(&buffer[0], &buffer[0] + usedBufferCount / sizeof(wchar_t));
-}
-
-string Gosu::wstringToUTF8(const std::wstring& ws)
-{
-    if (ws.empty()) {
-        return string();
-    }
-
-    @autoreleasepool {
-        NSString *str = [[NSString alloc] initWithBytes:ws.data()
-                                                 length:ws.size() * sizeof(wchar_t)
-                                               encoding:NSUTF32LittleEndianStringEncoding];
-        return str.UTF8String ?: string();
-    }
-}
-
-wstring Gosu::widen(const string& s)
-{
-    return utf8ToWstring(s);
-}
-
-string Gosu::narrow(const std::wstring& ws)
-{
-    return wstringToUTF8(ws);
-}
-#endif
-
-string Gosu::language()
-{
-    @autoreleasepool {
-        // Cannot use accessor syntax here without breaking compilation with OS X 10.7/Xcode 4.6.3.
-        NSString *language = [[NSLocale preferredLanguages] objectAtIndex:0];
-        return language.UTF8String ?: "en";
-    }
-}