gosu 0.13.3 → 0.14.0.pre2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0.pre2
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -81,14 +81,10 @@ files:
 - src/FileUnix.cpp
 - src/FileWin.cpp
 - src/Font.cpp
-- src/FormattedString.cpp
-- src/FormattedString.hpp
-- src/GosuAppDelegate.cpp
-- src/GosuAppDelegate.h
 - src/GosuGLView.cpp
-- src/GosuGLView.h
+- src/GosuGLView.hpp
 - src/GosuViewController.cpp
-- src/GosuViewController.h
+- src/GosuViewController.hpp
 - src/Graphics.cpp
 - src/GraphicsImpl.hpp
 - src/IO.cpp
@@ -102,7 +98,11 @@ files:
 - src/MPEGFile.hpp
 - src/Macro.cpp
 - src/Macro.hpp
+- src/MarkupParser.cpp
+- src/MarkupParser.hpp
 - src/Math.cpp
+- src/OffScreenTarget.cpp
+- src/OffScreenTarget.hpp
 - src/OggFile.hpp
 - src/RenderState.hpp
 - src/Resolution.cpp
@@ -113,11 +113,9 @@ files:
 - src/TexChunk.cpp
 - src/TexChunk.hpp
 - src/Text.cpp
-- src/TextApple.cpp
+- src/TextBuilder.cpp
+- src/TextBuilder.hpp
 - src/TextInput.cpp
-- src/TextTTFWin.cpp
-- src/TextUnix.cpp
-- src/TextWin.cpp
 - src/Texture.cpp
 - src/Texture.hpp
 - src/TimingApple.cpp
@@ -125,6 +123,11 @@ files:
 - src/TimingWin.cpp
 - src/Transform.cpp
 - src/TransformStack.hpp
+- src/TrueTypeFont.cpp
+- src/TrueTypeFont.hpp
+- src/TrueTypeFontApple.cpp
+- src/TrueTypeFontUnix.cpp
+- src/TrueTypeFontWin.cpp
 - src/Utility.cpp
 - src/UtilityApple.cpp
 - src/UtilityWin.cpp
@@ -136,7 +139,11 @@ files:
 - src/WindowUIKit.cpp
 - src/stb_image.h
 - src/stb_image_write.h
+- src/stb_truetype.h
 - src/stb_vorbis.c
+- src/utf8proc.c
+- src/utf8proc.h
+- src/utf8proc_data.h
 homepage: https://www.libgosu.org/
 licenses:
 - MIT
@@ -153,15 +160,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 2D game development library.

data/src/FormattedString.cpp

@@ -1,237 +0,0 @@
-#include "FormattedString.hpp"
-#include <Gosu/Utility.hpp>
-#include <cwchar>
-#include <cwctype>
-using namespace std;
-
-static unsigned flags(int b, int u, int i)
-{
-    unsigned flags = 0;
-    if (b > 0) flags |= Gosu::FF_BOLD;
-    if (u > 0) flags |= Gosu::FF_UNDERLINE;
-    if (i > 0) flags |= Gosu::FF_ITALIC;
-    return flags;
-}
-
-bool Gosu::FormattedString::FormattedChar::same_style_as(const FormattedChar& other) const
-{
-    return wc && other.wc && color == other.color && flags == other.flags;
-}
-
-Gosu::FormattedString::FormattedString()
-{
-}
-
-Gosu::FormattedString::FormattedString(const wchar_t* html, unsigned base_flags)
-{
-    // Remove \r characters if existent. Avoid a copy if we don't need one.
-    wstring unixified;
-    // We have to explicitly qualify wcschr to avoid an ambiguity on macOS.
-    if (std::wcschr(html, L'\r')) {
-        unixified.resize(wcslen(html));
-        unsigned pos = 0;
-        while (*html) {
-            if (*html != '\r') {
-                unixified[pos++] = *html;
-            }
-            ++html;
-        }
-        unixified.resize(pos);
-        html = unixified.c_str();
-    }
-    
-    size_t len = wcslen(html);
-    
-    // Just skip all this if there are entities or formatting tags in the string.
-    if (wcscspn(html, L"<&") == len) {
-        simple_string = html;
-        simple_flags = base_flags;
-        return;
-    }
-    
-    unsigned pos = 0;
-    int b = (base_flags & FF_BOLD) ? 1 : 0,
-    u = (base_flags & FF_UNDERLINE) ? 1 : 0,
-    i = (base_flags & FF_ITALIC) ? 1 : 0;
-    vector<Color> c;
-    c.push_back(0xffffffff);
-    while (pos < len) {
-        if (!wcsncmp(html + pos, L"<b>", 3)) {
-            b += 1;
-            pos += 3;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"</b>", 4)) {
-            b -= 1;
-            pos += 4;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"<u>", 3)) {
-            u += 1;
-            pos += 3;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"</u>", 4)) {
-            u -= 1;
-            pos += 4;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"<i>", 3)) {
-            i += 1;
-            pos += 3;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"</i>", 4)) {
-            i -= 1;
-            pos += 4;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"<c=", 3) && len >= pos + 10 && html[pos + 9] == L'>') {
-            unsigned rgb = static_cast<uint32_t>(wcstoul(html + pos + 3, 0, 16));
-            c.push_back(0xff000000 | rgb);
-            pos += 10;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"<c=", 3) && len >= pos + 12 && html[pos + 11] == L'>') {
-            unsigned argb = static_cast<uint32_t>(wcstoul(html + pos + 3, 0, 16));
-            c.push_back(argb);
-            pos += 12;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"</c>", 4)) {
-            if (c.size() > 1) {
-                c.pop_back();
-            }
-            pos += 4;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"&lt;", 4)) {
-            FormattedChar fc = { L'<', c.back(), flags(b, u, i) };
-            characters.push_back(fc);
-            pos += 4;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"&gt;", 4)) {
-            FormattedChar fc = { L'>', c.back(), flags(b, u, i) };
-            characters.push_back(fc);
-            pos += 4;
-            continue;
-        }
-        if (!wcsncmp(html + pos, L"&amp;", 5)) {
-            FormattedChar fc = { L'&', c.back(), flags(b, u, i) };
-            characters.push_back(fc);
-            pos += 5;
-            continue;
-        }
-        if (html[pos] == L'&' && html[pos + 1]) {
-            int end_of_entity = pos + 1;
-            while (html[end_of_entity] != L';') {
-                if (!iswalnum(static_cast<wint_t>(html[end_of_entity]))) {
-                    goto normal_character;
-                }
-                end_of_entity += 1;
-                if (end_of_entity >= len) {
-                    goto normal_character;
-                }
-            }
-            wstring entity(html + pos + 1, html + end_of_entity);
-            FormattedChar fc = { 0, c.back(), 0, wstring_to_utf8(entity) };
-            if (!is_entity(fc.entity)) {
-                goto normal_character;
-            }
-            characters.push_back(fc);
-            pos = end_of_entity + 1;
-            continue;
-        }
-
-    normal_character:
-        FormattedChar fc = { html[pos], c.back(), flags(b, u, i) };
-        characters.push_back(fc);
-        pos += 1;
-    }
-}
-
-wstring Gosu::FormattedString::unformat() const
-{
-    if (characters.empty()) return simple_string;
-    
-    wstring result(characters.size(), 0);
-    for (int i = 0; i < characters.size(); ++i) {
-        result[i] = characters[i].wc;
-    }
-    return result;
-}
-
-const char* Gosu::FormattedString::entity_at(unsigned index) const
-{
-    if (characters.empty()) return nullptr;
-    if (characters[index].wc != 0) return nullptr;
-    if (characters[index].entity.empty()) return nullptr;
-    
-    return characters[index].entity.c_str();
-}
-
-wchar_t Gosu::FormattedString::char_at(unsigned index) const
-{
-    return characters.empty() ? simple_string[index] : characters[index].wc;
-}
-
-unsigned Gosu::FormattedString::flags_at(unsigned index) const
-{
-    return characters.empty() ? simple_flags : characters[index].flags;
-}
-
-Gosu::Color Gosu::FormattedString::color_at(unsigned index) const
-{
-    return characters.empty() ? Color::WHITE : characters[index].color;
-}
-
-size_t Gosu::FormattedString::length() const
-{
-    return characters.empty() ? simple_string.length() : characters.size();
-}
-
-Gosu::FormattedString Gosu::FormattedString::range(size_t begin, size_t end) const
-{
-    FormattedString result;
-    if (characters.empty()) {
-        result.simple_string.assign(simple_string.begin() + begin,
-                                    simple_string.begin() + end);
-        result.simple_flags = simple_flags;
-    }
-    else {
-        result.characters.assign(characters.begin() + begin,
-                                 characters.begin() + end);
-    }
-    return result;
-}
-
-vector<Gosu::FormattedString> Gosu::FormattedString::split_lines() const
-{
-    vector<FormattedString> result;
-    unsigned begin = 0;
-    for (unsigned cur = 0; cur < length(); ++cur) {
-        if (char_at(cur) == L'\n') {
-            result.push_back(range(begin, cur));
-            begin = cur + 1;
-        }
-    }
-    result.push_back(range(begin, length()));
-    return result;
-}
-
-vector<Gosu::FormattedString> Gosu::FormattedString::split_parts() const
-{
-    if (characters.empty()) return vector<FormattedString>(1, *this);
-    
-    vector<FormattedString> result;
-    unsigned begin = 0;
-    for (unsigned cur = 1; cur < length(); ++cur) {
-        if (!characters[begin].same_style_as(characters[cur])) {
-            result.push_back(range(begin, cur));
-            begin = cur;
-        }
-    }
-    result.push_back(range(begin, length()));
-    return result;
-}

data/src/FormattedString.hpp

@@ -1,47 +0,0 @@
-#pragma once
-
-#include "GraphicsImpl.hpp"
-#include <Gosu/Color.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <vector>
-
-namespace Gosu
-{
-    class FormattedString
-    {
-        struct FormattedChar
-        {
-            wchar_t wc;
-            Color color;
-            unsigned flags;
-            std::string entity;
-            
-            bool same_style_as(const FormattedChar& other) const;
-        };
-        
-        // If characters.empty(), use these for the whole string.
-        std::wstring simple_string;
-        unsigned simple_flags;
-        // If not characters.empty(), ignore above fields and use this.
-        std::vector<FormattedChar> characters;
-        
-    public:
-        FormattedString();
-        FormattedString(const wchar_t* html, unsigned base_flags);
-        
-        std::wstring unformat() const;
-        
-        const char* entity_at(unsigned index) const;
-        wchar_t char_at(unsigned index) const;
-        unsigned flags_at(unsigned index) const;
-        Color color_at(unsigned index) const;
-        
-        std::size_t length() const;
-        
-        FormattedString range(std::size_t begin, std::size_t end) const;
-        
-        std::vector<FormattedString> split_lines() const;
-        std::vector<FormattedString> split_parts() const;
-    };
-}
-

data/src/GosuAppDelegate.cpp

@@ -1,30 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_IPHONE)
-
-#import "GosuAppDelegate.h"
-#import <Gosu/Gosu.hpp>
-
-Gosu::Window& window_instance();
-
-@implementation GosuAppDelegate
-
-- (BOOL)application:(UIApplication*)application
-    didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
-{
-    self.window = (__bridge UIWindow*) window_instance().UIWindow();
-    [self.window makeKeyAndVisible];
-    
-    return YES;
-}
-
-@end
-
-int main(int argc, char* argv[])
-{
-    @autoreleasepool {
-        Gosu::use_resource_directory();
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([GosuAppDelegate class]));
-    }
-}
-
-#endif

data/src/GosuAppDelegate.h

@@ -1,8 +0,0 @@
-#import <UIKit/UIKit.h>
-
-
-@interface GosuAppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (nonatomic, strong) UIWindow *window;
-
-@end

data/src/GosuGLView.h

@@ -1,8 +0,0 @@
-#import <UIKit/UIKit.h>
-
-
-@interface GosuGLView : UIView
-
-- (void)redrawGL:(void (^)())code;
-
-@end

data/src/TextApple.cpp

@@ -1,212 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_MAC)
-
-#include <Gosu/Text.hpp>
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/Math.hpp>
-#include <Gosu/Utility.hpp>
-#include <cmath>
-#include <map>
-
-#if defined(GOSU_IS_IPHONE)
-#import <CoreGraphics/CoreGraphics.h>
-#import <UIKit/UIKit.h>
-typedef UIFont AppleFont;
-#else
-#import <AppKit/AppKit.h>
-typedef NSFont AppleFont;
-#endif
-
-using namespace std;
-
-// If a font is a filename, loads the font and returns its family name that can be used
-// like any system font. Otherwise, just returns the family name.
-static string normalize_font(const string& font_name)
-{
-#ifdef GOSU_IS_IPHONE
-    // On iOS, we have no support for loading font files yet. However, if you register your fonts
-    // via your app's Info.plist, you should be able to reference them by name.
-    return font_name;
-#else
-    static map<string, string> family_of_files;
-    
-    // Not a path name: It is already a family name.
-    if (font_name.find("/") == font_name.npos) {
-        return font_name;
-    }
-    
-    // Already activated font & extracted family name.
-    if (family_of_files.count(font_name) > 0) {
-        return family_of_files[font_name];
-    }
-    
-    NSURL* url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:font_name.c_str()]
-                            isDirectory:NO];
-    if (url == nullptr) {
-        return family_of_files[font_name] = Gosu::default_font_name();
-    }
-    CFURLRef url_ref = (__bridge CFURLRef) url;
-    
-    NSArray* descriptors = CFBridgingRelease(CTFontManagerCreateFontDescriptorsFromURL(url_ref));
-    if (descriptors.count < 1 ||
-            !CTFontManagerRegisterFontsForURL(url_ref, kCTFontManagerScopeProcess, nullptr)) {
-        return family_of_files[font_name] = Gosu::default_font_name();
-    }
-
-    CTFontDescriptorRef ref = (__bridge CTFontDescriptorRef) descriptors[0];
-    CFTypeRef family_name_ref = CTFontDescriptorCopyAttribute(ref, kCTFontFamilyNameAttribute);
-    NSString* family_name = CFBridgingRelease(family_name_ref);
-    return family_of_files[font_name] = family_name.UTF8String ?: "";
-#endif
-}
-
-static AppleFont* get_font(string font_name, unsigned font_flags, double height)
-{
-    font_name = normalize_font(font_name);
-
-    static map<pair<string, pair<unsigned, double>>, AppleFont*> used_fonts;
-    
-    auto key = make_pair(font_name, make_pair(font_flags, height));
-    
-    AppleFont* result = used_fonts[key];
-    if (!result) {
-        NSString* name = [NSString stringWithUTF8String:font_name.c_str()];
-    #ifdef GOSU_IS_IPHONE
-        result = [AppleFont fontWithName:name size:height];
-    #else
-        NSFontDescriptor* desc =
-            [[NSFontDescriptor fontDescriptorWithFontAttributes:nil] fontDescriptorWithFamily:name];
-        result = [NSFont fontWithDescriptor:desc size:height];
-        if (result && (font_flags & Gosu::FF_BOLD)) {
-            result =
-                [[NSFontManager sharedFontManager] convertFont:result toHaveTrait:NSFontBoldTrait];
-        }
-        if (result && (font_flags & Gosu::FF_ITALIC)) {
-            result = [[NSFontManager sharedFontManager] convertFont:result
-                                                        toHaveTrait:NSFontItalicTrait];
-        }
-    #endif
-        if (result == nullptr) {
-            if (font_name != Gosu::default_font_name()) {
-                result = get_font(Gosu::default_font_name(), 0, height);
-            }
-            else {
-                throw runtime_error("Cannot load default font");
-            }
-        }
-        used_fonts[key] = result;
-    }
-    return result;
-}
-
-string Gosu::default_font_name()
-{
-    return "Arial";
-}
-
-#ifndef GOSU_IS_IPHONE
-static NSDictionary* attribute_dictionary(NSFont* font, unsigned font_flags)
-{
-    auto underline_style =
-        (font_flags & Gosu::FF_UNDERLINE) ? NSUnderlineStyleSingle : NSUnderlineStyleNone;
-    return @{
-        NSFontAttributeName: font,
-        NSForegroundColorAttributeName: [NSColor whiteColor],
-        NSUnderlineStyleAttributeName: @(underline_style)
-    };
-}
-#endif
-
-unsigned Gosu::text_width(const string& text, const string& font_name,
-                          unsigned font_height, unsigned font_flags)
-{
-    if (text.find_first_of("\r\n") != text.npos) {
-        throw invalid_argument("text_width cannot handle line breaks");
-    }
-    
-    AppleFont* font = get_font(font_name, font_flags, font_height);
-    
-    // This will, of course, compute a too large size; font_height is in pixels,
-    // the method expects point.
-    NSString* string = [NSString stringWithUTF8String:text.c_str()];
-#ifndef GOSU_IS_IPHONE
-    NSDictionary* attributes = attribute_dictionary(font, font_flags);
-    NSSize size = [string sizeWithAttributes:attributes];
-#else
-    CGSize size = [string sizeWithFont:font];
-#endif
-    
-    // Now adjust the scaling...
-    return ceil(size.width / size.height * font_height);
-}
-
-void Gosu::draw_text(Bitmap& bitmap, const string& text, int x, int y, Color c,
-                     const string& font_name, unsigned font_height, unsigned font_flags)
-{
-    if (text.find_first_of("\r\n") != text.npos) {
-        throw invalid_argument("the argument to draw_text cannot contain line breaks");
-    }
-    
-    AppleFont* font = get_font(font_name, font_flags, font_height);
-    NSString* string = [NSString stringWithUTF8String:text.c_str()];
-
-#ifndef GOSU_IS_IPHONE
-    NSDictionary* attributes = attribute_dictionary(font, font_flags);
-    NSSize size = [string sizeWithAttributes:attributes];
-#else
-    CGSize size = [string sizeWithFont:font];
-#endif
-    
-    unsigned width = static_cast<unsigned>(round(size.width / size.height * font_height));
-
-    // Get the width and height of the image
-    Bitmap bmp(width, font_height, 0x00ffffff);
-    
-    // Use a temporary context to draw the CGImage to the buffer.
-    CGColorSpaceRef color_space = CGColorSpaceCreateDeviceRGB();
-    CGContextRef context = CGBitmapContextCreate(bmp.data(), bmp.width(), bmp.height(), 8,
-        bmp.width() * 4, color_space, kCGImageAlphaPremultipliedLast);
-    CGColorSpaceRelease(color_space);
-#ifdef GOSU_IS_IPHONE
-    CGFloat color[] = { 1.f, 1.f, 1.f, 0.f };
-    CGContextSetStrokeColor(context, color);
-    CGContextSetFillColor(context, color);
-#endif
-    
-    // Use new font with proper size this time.
-    font = get_font(font_name, font_flags, font_height * font_height / size.height);
-
-#ifdef GOSU_IS_IPHONE
-    CGContextTranslateCTM(context, 0, font_height);
-    CGContextScaleCTM(context, 1, -1);
-    UIGraphicsPushContext(context);
-    [string drawAtPoint:CGPointZero withFont:font];
-    UIGraphicsPopContext();
-#else
-    NSPoint NSPointZero = { 0, 0 };
-    attributes = attribute_dictionary(font, font_flags);
-    
-    [NSGraphicsContext saveGraphicsState];
-    [NSGraphicsContext
-        setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:(void*)context
-                                                                     flipped:false]];
-    [string drawAtPoint:NSPointZero withAttributes:attributes];
-    [NSGraphicsContext restoreGraphicsState];
-#endif
-    CGContextRelease(context);
-
-    int effective_width = Gosu::clamp<int>(width, 0, bitmap.width() - x);
-    int effective_height = Gosu::clamp<int>(font_height, 0, bitmap.height() - y);
-    
-    // Now copy the set pixels back.
-    for (int rel_y = 0; rel_y < effective_height; ++rel_y) {
-        for (int rel_x = 0; rel_x < effective_width; ++rel_x) {
-            c.set_alpha(bmp.get_pixel(rel_x, rel_y).alpha());
-            if (c.alpha()) {
-                bitmap.set_pixel(x + rel_x, y + rel_y, c);
-            }
-        }
-    }
-}
-
-#endif