gosu 0.14.0 → 0.14.3.pre1

data/src/DirectoriesWin.cpp

@@ -1,69 +1,69 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_WIN)
-
-#include "WinUtility.hpp"
-#include <Gosu/Directories.hpp>
-#include <Gosu/Utility.hpp>
-#include <cwchar>
-#include <stdexcept>
+#include <Gosu/Platform.hpp>
+#if defined(GOSU_IS_WIN)
+
+#include "WinUtility.hpp"
+#include <Gosu/Directories.hpp>
+#include <Gosu/Utility.hpp>
+#include <cwchar>
+#include <stdexcept>
 #include <shlobj.h>
-using namespace std;
-
-static string special_folder_path(int csidl)
-{
-    WCHAR buf[MAX_PATH + 2];
-    if (FAILED(SHGetFolderPathW(nullptr, csidl | CSIDL_FLAG_CREATE, nullptr, 0, buf))) {
-        throw runtime_error("Error getting special folder path");
-    }
-    size_t len = wcslen(buf);
-    if (buf[len - 1] != L'\\') {
-        buf[len] = L'\\';
-        buf[len + 1] = 0;
-    }
-    return Gosu::utf16_to_utf8(buf);
-}
-
-static string exe_filename()
-{
-    static string result;
-    if (result.empty()) {
-        WCHAR buffer[MAX_PATH * 2];
-        Gosu::winapi_check(GetModuleFileNameW(nullptr, buffer, MAX_PATH * 2),
-                           "getting the module filename");
-        result = Gosu::utf16_to_utf8(buffer);
-    }
-    return result;
-}
-
-void Gosu::use_resource_directory()
-{
-    SetCurrentDirectory(utf8_to_utf16(resource_prefix()).c_str());
-}
-
-string Gosu::resource_prefix()
-{
-    static string result;
-    if (result.empty()) {
-        result = exe_filename();
-        auto last_delim = result.find_last_of("\\/");
-        result.resize(last_delim == string::npos ? 0 : last_delim + 1);
-    }
-    return result;
-}
-
-string Gosu::shared_resource_prefix()
-{
-    return resource_prefix();
-}
-
-string Gosu::user_settings_prefix()
-{
-    return special_folder_path(CSIDL_APPDATA);
-}
-
-string Gosu::user_documents_prefix()
-{
-    return special_folder_path(CSIDL_PERSONAL);
-}
-
-#endif
+using namespace std;
+
+static string special_folder_path(int csidl)
+{
+    WCHAR buf[MAX_PATH + 2];
+    if (FAILED(SHGetFolderPathW(nullptr, csidl | CSIDL_FLAG_CREATE, nullptr, 0, buf))) {
+        throw runtime_error("Error getting special folder path");
+    }
+    size_t len = wcslen(buf);
+    if (buf[len - 1] != L'\\') {
+        buf[len] = L'\\';
+        buf[len + 1] = 0;
+    }
+    return Gosu::utf16_to_utf8(buf);
+}
+
+static string exe_filename()
+{
+    static string result;
+    if (result.empty()) {
+        WCHAR buffer[MAX_PATH * 2];
+        Gosu::winapi_check(GetModuleFileNameW(nullptr, buffer, MAX_PATH * 2),
+                           "getting the module filename");
+        result = Gosu::utf16_to_utf8(buffer);
+    }
+    return result;
+}
+
+void Gosu::use_resource_directory()
+{
+    SetCurrentDirectory(utf8_to_utf16(resource_prefix()).c_str());
+}
+
+string Gosu::resource_prefix()
+{
+    static string result;
+    if (result.empty()) {
+        result = exe_filename();
+        auto last_delim = result.find_last_of("\\/");
+        result.resize(last_delim == string::npos ? 0 : last_delim + 1);
+    }
+    return result;
+}
+
+string Gosu::shared_resource_prefix()
+{
+    return resource_prefix();
+}
+
+string Gosu::user_settings_prefix()
+{
+    return special_folder_path(CSIDL_APPDATA);
+}
+
+string Gosu::user_documents_prefix()
+{
+    return special_folder_path(CSIDL_PERSONAL);
+}
+
+#endif

data/src/Graphics.cpp

@@ -265,7 +265,8 @@ void Gosu::Graphics::clip_to(double x, double y, double width, double height,
     current_queue().end_clipping();
 }
 
-Gosu::Image Gosu::Graphics::render(int width, int height, const function<void ()>& f)
+Gosu::Image Gosu::Graphics::render(int width, int height, const function<void ()>& f,
+                                   unsigned image_flags)
 {
     ensure_current_context();
     
@@ -285,7 +286,7 @@ Gosu::Image Gosu::Graphics::render(int width, int height, const function<void ()
 #endif
 
     // This is the actual render-to-texture step.
-    Image result = OffScreenTarget(width, height).render([&] {
+    Image result = OffScreenTarget(width, height, image_flags).render([&] {
         glClearColor(0, 0, 0, 0);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         queues.emplace_back(QM_RENDER_TO_TEXTURE);

data/src/InputUIKit.cpp

@@ -171,7 +171,8 @@ void Gosu::Input::set_text_input(TextInput* text_input)
     if (text_input) {
         pimpl->text_input = text_input;
         [pimpl->view becomeFirstResponder];
-    } else {
+    }
+    else {
         [pimpl->view resignFirstResponder];
         pimpl->text_input = nullptr;
     }

data/src/MarkupParser.cpp

@@ -139,7 +139,7 @@ bool Gosu::MarkupParser::parse_escape_entity()
 
 void Gosu::MarkupParser::add_current_substring()
 {
-    if (! substring.empty()) {
+    if (!substring.empty()) {
         add_composed_substring(utf8_to_composed_utc4(substring));
         substring.clear();
     }
@@ -152,7 +152,7 @@ void Gosu::MarkupParser::add_composed_substring(u32string&& substring)
     fstr.flags = flags();
     fstr.color = c.back();
 
-    if (! substrings.empty() && substrings.back().can_be_merged_with(fstr)) {
+    if (!substrings.empty() && substrings.back().can_be_merged_with(fstr)) {
         substrings.back().text.append(move(fstr.text));
     }
     else {
@@ -162,7 +162,7 @@ void Gosu::MarkupParser::add_composed_substring(u32string&& substring)
 
 void Gosu::MarkupParser::flush_to_consumer()
 {
-    if (! substrings.empty()) {
+    if (!substrings.empty()) {
         consumer(move(substrings));
         substrings.clear();
     }
@@ -221,7 +221,8 @@ void Gosu::MarkupParser::parse(const std::string& markup_string)
             add_current_substring();
             flush_to_consumer();
             word_state = ADDING_WHITESPACE;
-        } else if (!whitespace_except_newline && word_state == ADDING_WHITESPACE) {
+        }
+        else if (!whitespace_except_newline && word_state == ADDING_WHITESPACE) {
             // We are in word-parsing mode, and this is was the start of a word.
             add_current_substring();
             flush_to_consumer();

data/src/OffScreenTarget.cpp

@@ -28,7 +28,7 @@ using namespace std;
         GL_DEPTH_COMPONENT
 #endif
 
-Gosu::OffScreenTarget::OffScreenTarget(int width, int height)
+Gosu::OffScreenTarget::OffScreenTarget(int width, int height, unsigned image_flags)
 {
 #ifndef GOSU_IS_IPHONE
     if (!SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object")) {
@@ -37,7 +37,7 @@ Gosu::OffScreenTarget::OffScreenTarget(int width, int height)
 #endif
     
     // Create a new texture that will be our rendering target.
-    texture = make_shared<Texture>(width, height, false);
+    texture = make_shared<Texture>(width, height, image_flags & IF_RETRO);
     // Mark the full texture as blocked for our TexChunk.
     texture->block(0, 0, width, height);
     

data/src/OffScreenTarget.hpp

@@ -16,7 +16,7 @@ namespace Gosu
         OffScreenTarget& operator=(OffScreenTarget&& other) = delete;
         
     public:
-        OffScreenTarget(int width, int height);
+        OffScreenTarget(int width, int height, unsigned image_flags);
         ~OffScreenTarget();
         Gosu::Image render(const std::function<void ()>& f);
     };

data/src/Resolution.cpp

@@ -34,7 +34,7 @@ unsigned Gosu::screen_height(Window* window)
 static NSSize max_window_size(Gosu::Window* window)
 {
     // Keep in sync with SDL_cocoawindow.m.
-    auto style = NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskMiniaturizable;
+    auto style = NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask;
 
     auto index = window ? SDL_GetWindowDisplayIndex(Gosu::shared_window()) : 0;
     auto screen_frame = NSScreen.screens[index].visibleFrame;
@@ -63,7 +63,8 @@ static SIZE max_window_size(Gosu::Window* window)
     if (window == nullptr) {
         // Easy case: Return the work area of the primary monitor.
         SystemParametersInfo(SPI_GETWORKAREA, 0, &work_area, 0);
-    } else {
+    }
+    else {
         // Return the work area of the monitor the window is on.
         SDL_SysWMinfo wm_info;
         SDL_VERSION(&wm_info.version);

data/src/RubyGosu.cxx

@@ -2408,8 +2408,34 @@ namespace Gosu
         return new Gosu::Image(Gosu::Graphics::record(width, height, [] { rb_yield(Qnil); }));
     }
     
-    Gosu::Image* render(int width, int height) {
-        return new Gosu::Image(Gosu::Graphics::render(width, height, [] { rb_yield(Qnil); }));
+    Gosu::Image* render(int width, int height, VALUE options = 0) {
+        unsigned image_flags = 0;
+        
+        if (options) {
+            Check_Type(options, T_HASH);
+            
+            VALUE keys = rb_funcall(options, rb_intern("keys"), 0, NULL);
+            int keys_size = NUM2INT(rb_funcall(keys, rb_intern("size"), 0, NULL));
+            
+            for (int i = 0; i < keys_size; ++i) {
+                VALUE key = rb_ary_entry(keys, i);
+                const char* key_string = Gosu::cstr_from_symbol(key);
+                
+                VALUE value = rb_hash_aref(options, key);
+                if (!strcmp(key_string, "retro")) {
+                    if (RTEST(value)) image_flags |= Gosu::IF_RETRO;
+                }
+                else {
+                    static bool issued_warning = false;
+                    if (!issued_warning) {
+                        issued_warning = true;
+                        rb_warn("Unknown keyword argument: :%s", key_string);
+                    }
+                }
+            }
+        }
+        
+        return new Gosu::Image(Gosu::Graphics::render(width, height, [] { rb_yield(Qnil); }, image_flags));
     }
     
     // This method cannot be called "transform" because then it would be an ambiguous overload of
@@ -10890,6 +10916,7 @@ SWIGINTERN VALUE
 _wrap_render(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   int arg2 ;
+  VALUE arg3 = (VALUE) 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -10897,7 +10924,7 @@ _wrap_render(int argc, VALUE *argv, VALUE self) {
   Gosu::Image *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
+  if ((argc < 2) || (argc > 3)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
@@ -10910,15 +10937,18 @@ _wrap_render(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","Gosu::render", 2, argv[1] ));
   } 
   arg2 = static_cast< int >(val2);
+  if (argc > 2) {
+    arg3 = argv[2];
+  }
   {
     try {
-      result = (Gosu::Image *)Gosu::render(arg1,arg2);
+      result = (Gosu::Image *)Gosu::render(arg1,arg2,arg3);
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Gosu__Image, 0 |  0 );
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Gosu__Image, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -11671,7 +11701,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "LICENSES", SWIG_From_std_string(static_cast< std::string >(Gosu::LICENSES)));
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(14)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(0)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(3)));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);

data/src/SndFile.hpp

@@ -19,9 +19,8 @@ namespace Gosu
         Reader reader;
         Buffer buffer;
         
-        // Cannot use /DELAYLOAD with libsndfile.dll because it was compiled
-        // using arcane GNU tools of dark magic (or maybe it's the filename).
-        #ifdef GOSU_IS_WIN
+        // /DELAYLOAD doesn't work with libsndfile.dll (is this still true?); manually lazy-load it.
+    #ifdef GOSU_IS_WIN
         static HMODULE dll()
         {
             static HMODULE dll = LoadLibrary(L"libsndfile.dll");
@@ -29,7 +28,7 @@ namespace Gosu
             return dll;
         }
         
-        #define CREATE_STUB(NAME, RETURN, PARAMS, NAMES)                    \
+    #define CREATE_STUB(NAME, RETURN, PARAMS, NAMES)                        \
         static RETURN NAME PARAMS                                           \
         {                                                                   \
             typedef RETURN (__cdecl *NAME##_ptr) PARAMS;                    \
@@ -54,8 +53,8 @@ namespace Gosu
         CREATE_STUB(sf_strerror, const char*,
             (SNDFILE* sndfile),
             (sndfile))
-        #undef CREATE_STUB
-        #endif
+    #undef CREATE_STUB
+    #endif
         
         static sf_count_t get_filelen(SndFile* self)
         {
@@ -126,12 +125,12 @@ namespace Gosu
             info.format = 0;
             // TODO: Not sure if this is still necessary.
             // Can libsndfile open UTF-8 filenames on Windows?
-            #ifdef GOSU_IS_WIN
+        #ifdef GOSU_IS_WIN
             load_file(buffer, filename);
             file = sf_open_virtual(io_interface(), SFM_READ, &info, this);
-            #else
+        #else
             file = sf_open(filename.c_str(), SFM_READ, &info);
-            #endif
+        #endif
             if (!file) {
                 throw std::runtime_error(sf_strerror(nullptr));
             }

data/src/TextBuilder.cpp

@@ -7,7 +7,7 @@ using namespace std;
 
 Gosu::WordInfo::WordInfo(const string& font_name, double font_height, vector<FormattedString> parts)
 {
-    assert (! parts.empty());
+    assert (!parts.empty());
     
     auto* properties = utf8proc_get_property(parts.front().text.front());
 
@@ -21,7 +21,7 @@ Gosu::WordInfo::WordInfo(const string& font_name, double font_height, vector<For
     
     width = 0;
     for (const auto& part : parts) {
-        assert (is_end_of_line || ! part.text.empty());
+        assert (is_end_of_line || !part.text.empty());
         
         width += text_width(part.text, font_name, font_height, part.flags);
     }
@@ -42,7 +42,7 @@ void Gosu::TextBuilder::flush_current_line(EndOfLineReason reason)
     if (current_line.back().is_whitespace) current_line.pop_back();
     
     // Shouldn't happen because the first word on a line should never be whitespace.
-    assert (! current_line.empty());
+    assert (!current_line.empty());
     
     double words_width = 0, whitespace_width = 0;
     for (const auto& word : current_line) {

data/src/TrueTypeFont.cpp

@@ -199,12 +199,13 @@ double Gosu::TrueTypeFont::draw_text(const u32string &text, double height,
     return pimpl->draw_text(text, true, height, bitmap, x, y, c);
 }
 
-bool Gosu::TrueTypeFont::verify_font_name(const unsigned char* ttf_data, const string& font_name, unsigned font_flags)
+bool Gosu::TrueTypeFont::matches(const unsigned char* ttf_data,
+                                 const string& font_name, unsigned font_flags)
 {
-    // Gosu's FontFlags enum mostly uses the same values as the STBTT_ macros.
+    // Gosu::FontFlags uses the same values as the STBTT_ macros, except for this one.
     int flags = (font_flags == 0 ? STBTT_MACSTYLE_NONE : font_flags);
 
-    return stbtt_FindMatchingFont(ttf_data, font_name.c_str(), font_flags) >= 0 ||
+    return stbtt_FindMatchingFont(ttf_data, font_name.c_str(), flags) >= 0 ||
            stbtt_FindMatchingFont(ttf_data, font_name.c_str(), STBTT_MACSTYLE_DONTCARE) >= 0;
 }
 
@@ -248,7 +249,8 @@ Gosu::TrueTypeFont& Gosu::font_by_name(const string& font_name, unsigned font_fl
         if (font_name.find_first_of("./\\") != string::npos) {
             // A filename? Load it and add it to the stack.
             ttf_stack.push_back(ttf_data_from_file(font_name));
-        } else if (font_name != default_font_name()) {
+        }
+        else if (font_name != default_font_name()) {
             // A font name? Add it to the stack, both with font_flags and without.
             ttf_stack.push_back(ttf_data_by_name(font_name, 0));
             ttf_stack.push_back(ttf_data_by_name(font_name, font_flags));

data/src/TrueTypeFont.hpp

@@ -25,8 +25,8 @@ namespace Gosu
                          Bitmap* bitmap, double x, double y, Color c);
         
         //! Returns true if the supplied buffer seems to be a font of the given name.
-        static bool verify_font_name(const unsigned char* ttf_data, 
-                                     const std::string& font_name, unsigned font_flags);
+        static bool matches(const unsigned char* ttf_data,
+                            const std::string& font_name, unsigned font_flags);
     };
     
     TrueTypeFont& font_by_name(const std::string& font_name, unsigned font_flags);
@@ -36,6 +36,19 @@ namespace Gosu
     //! In case of failure, this method must not return nullptr, but raise an exception.
     //! Note that this method does not accept any font flags, and so it will always load the first
     //! font in a TTC font collection.
+    //!
+    //! This function does not yet support Gosu::FontFlags, and consequently, custom TTF fonts do
+    //! not support markup or bold/italic text right now.
+    //!
+    //! Options for the future:
+    //! 1. Use stbtt_FindMatchingFont. This will only work for TTC font collections, and we will
+    //!    have to patch stb_truetype to look for fonts only based on `int flags`, while ignoring
+    //!    the name of fonts inside a bundle (who wants to deal with strings, anyway).
+    //! 2. Maybe Gosu should accept filename patterns like "LibreBaskerville-*.ttf" as the font
+    //!    name and then replace the * with "Regular", "Bold", "Italic" etc.?
+    //! 3. As a last resort, Gosu could implement faux bold and faux italics. I think faux
+    //!    underlines are a must anyway, since no font provides a dedicated TTF file for that.
+    //! These options are not mutually exclusive.
     const unsigned char* ttf_data_from_file(const std::string& filename);
     
     //! This method loads a TODO
@@ -46,22 +59,4 @@ namespace Gosu
     //! This method has a different implementation on each platform.
     //! In case of failure, this method must not return nullptr, but raise an exception.
     const unsigned char* ttf_fallback_data();
-
-    // TODO still true? ↓
-    // These functions do not yet support Gosu::FontFlags. This is fine for system fonts like Arial,
-    // where the callers of these methods will typically load the correct file (e.g. ArialBold.ttf).
-    // However, games which ship with their own font files (which is a good idea) can't use bold or
-    // italic text using <b> or <i> markup because there is no way to associate one TTF file as the
-    // "bold variant" of another.
-    //
-    // Options for the future:
-    // 1. Use stbtt_FindMatchingFont. This will only work for TTC font collections, and we will
-    //    have to patch stb_truetype to look for fonts only based on `int flags`, while ignoring
-    //    the name of fonts inside a bundle (who wants to deal with strings, anyway).
-    // 2. Maybe Gosu should accept filename patterns like "LibreBaskerville-*.ttf" as the font
-    //    name and then replace the * with "Regular", "Bold", "Italic" etc.?
-    // 3. As a last resort, Gosu could implement faux bold and faux italics. I think faux
-    //    underlines are a must anyway, since no font provides a dedicated TTF file for that.
-    // These options are not mutually exclusive.
-    
 }