gosu 0.14.3 → 0.14.4.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efccd137ba65f5c34a9662df8619debc8cb06325adedb946efc117cdcac983cd
-  data.tar.gz: e02d6e0e09d07d447ec0bb49f1a7553ad69da2dfd7203550e02c41ed37a81acd
+  metadata.gz: ad14d18a7ade0c42aab29811719f40e6f6c8ada5f1aa2b8048b3f0306baaf138
+  data.tar.gz: 3937bfbc9006015e908c3ce0420ad0c3a2264d6181720bc3a924c0fbca624861
 SHA512:
-  metadata.gz: a53b4b8dfa5b1b68dbe0be6437b023c3a1dd4a2ca3ad6e3db2726d7c00ba287433ae314484e9f5b52932ebaeb95a2969115ed3c3294c05259221a2a7de1eb9b2
-  data.tar.gz: e57e71620ff07233b7ef50c2c43f764ab9b41177767f4c724a55b0479f1ee62fffe66e05d5e8f90d4d6ef21673a32886c6118cfa004a3297d0b1a38cd756f9ce
+  metadata.gz: a568075f265f527e288991b9da74b81fd1e52c308609d5aea42fdb5c4b5af1fac0f3a399d8ba7d35089f3fa070b52309997be923f94f5a991440683852837003
+  data.tar.gz: c075d9b23de4e3135953cedb3c27079f94e5c128697581418b8ab553e32172024961a36e75a2338a1c37c9f567923be774c0f709f8dc9babb0260cb82987b549

data/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 14
-#define GOSU_POINT_VERSION 3
+#define GOSU_POINT_VERSION 4
 
 namespace Gosu
 {

data/src/Log.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <cstdlib>
+#include <utility>
+
+namespace Gosu
+{
+    template<class... Args>
+    void log(const char* format, Args&&... args) 
+    {
+        using namespace std;
+        
+        if (getenv("GOSU_DEBUG")) {
+            fprintf(stderr, format, std::forward<Args>(args)...);
+            fprintf(stderr, "\n");
+        }
+    }
+}
+

data/src/RubyGosu.cxx

@@ -11701,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 >(3)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(4)));
   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/Texture.cpp

@@ -1,5 +1,6 @@
 #include "Texture.hpp"
 #include "TexChunk.hpp"
+#include "Log.hpp"
 #include <Gosu/Bitmap.hpp>
 #include <Gosu/Graphics.hpp>
 #include <Gosu/Platform.hpp>
@@ -14,6 +15,8 @@ namespace Gosu
 Gosu::Texture::Texture(unsigned width, unsigned height, bool retro)
 : allocator_(width, height), retro_(retro)
 {
+    log("Allocating a new texture of size %dx%d (retro=%d)", width, height, (int) retro); 
+
     ensure_current_context();
     
     // Create texture name.

data/src/TrueTypeFont.cpp

@@ -244,7 +244,7 @@ Gosu::TrueTypeFont& Gosu::font_by_name(const string& font_name, unsigned font_fl
         vector<const unsigned char*> ttf_stack;
         ttf_stack.push_back(ttf_fallback_data());
         ttf_stack.push_back(ttf_data_by_name(default_font_name(), 0));
-        ttf_stack.push_back(ttf_data_by_name(default_font_name(), font_flags));
+        if (font_flags != 0) ttf_stack.push_back(ttf_data_by_name(default_font_name(), font_flags));
         
         if (font_name.find_first_of("./\\") != string::npos) {
             // A filename? Load it and add it to the stack.
@@ -253,7 +253,7 @@ Gosu::TrueTypeFont& Gosu::font_by_name(const string& font_name, unsigned font_fl
         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));
+            if (font_flags != 0) ttf_stack.push_back(ttf_data_by_name(font_name, font_flags));
         }
         
         font_ptr = &font_with_stack(move(ttf_stack));

data/src/TrueTypeFontUnix.cpp

@@ -2,9 +2,11 @@
 #if defined(GOSU_IS_X)
 
 #include "TrueTypeFont.hpp"
+#include "Log.hpp"
 
 #include <Gosu/IO.hpp>
 #include <Gosu/Text.hpp>
+#include <Gosu/Utility.hpp>
 
 #include <fontconfig/fontconfig.h>
 
@@ -19,18 +21,22 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     auto& ttf_ptr = ttf_file_cache[make_pair(font_name, font_flags)];
     if (ttf_ptr) return ttf_ptr;
 
+    log("Trying to find a font named '%s', flags=%x", font_name.c_str(), font_flags);
+
     static FcConfig* config = FcInitLoadConfigAndFonts();
     if (config) {
-        // Find "outline fonts" (so no bitmap fonts).
-        // Our search pattern does not include weight or slant so that we can compromise on these.
-        FcPattern* pattern = FcPatternBuild(nullptr, FC_OUTLINE, FcTypeBool, FcTrue, nullptr);
-        // If a font name was given, add it to the pattern.
-        if (!font_name.empty()) {
-            FcPatternBuild(pattern, FC_FAMILY, FcTypeString, font_name.c_str(), nullptr);
-        }
+        FcPattern* pattern;
+            // Our search pattern does not include weight or slant so that we can compromise on these.
+            pattern = FcPatternBuild(nullptr,
+                                     FC_FAMILY, FcTypeString, font_name.empty() ? "sans-serif" : font_name.c_str(),
+                                     FC_OUTLINE, FcTypeBool, FcTrue, // exclude bitmap fonts
+                                     nullptr);
+
         FcObjectSet* props = FcObjectSetBuild(FC_FILE, FC_WEIGHT, FC_SLANT, nullptr);
 
         if (FcFontSet* fonts = FcFontList(config, pattern, props)) {
+            log("Looking for the best candidate among %d matching fonts", (int) fonts->nfont);
+            
             // Among all matching fonts, find the variant that is the best fit for our font_flags.
             string best_filename;
             int best_diff;
@@ -45,26 +51,32 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
                 // Lower is better, so find the font with the lowest diff.
                 int diff = 0;
                 if (font_flags & Gosu::FF_BOLD) {
-                    diff += abs(weight - 200);
+                    diff += abs(weight - FC_WEIGHT_BOLD);
                 }
                 else {
-                    diff += abs(weight - 80);
+                    diff += abs(weight - FC_WEIGHT_REGULAR);
                 }
                 if (font_flags & Gosu::FF_ITALIC) {
-                    diff += abs(slant - 100);
+                    diff += abs(slant - FC_SLANT_ITALIC);
                 }
                 else {
-                    diff += abs(slant - 0);
+                    diff += abs(slant - FC_SLANT_ROMAN);
+                }
+                
+                // Penalize OTF fonts since we are not really good at handling these.
+                FcChar8 *file;
+                FcPatternGetString(fonts->fonts[i], FC_FILE, 0, &file);
+                if (has_extension(reinterpret_cast<char*>(file), ".otf")) {
+                    diff += 10000;
                 }
                 
                 if (best_filename.empty() || diff < best_diff) {
-                    FcChar8 *file;
-                    FcPatternGetString(fonts->fonts[i], FC_FILE, 0, &file);
                     best_filename = reinterpret_cast<char*>(file);
                     best_diff = diff;
                 }
             }
             if (!best_filename.empty()) {
+                log("Loading best candidate '%s'", best_filename.c_str());
                 ttf_ptr = ttf_data_from_file(best_filename.c_str());
             }
             
@@ -78,22 +90,57 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     return ttf_ptr;
 }
 
+static const unsigned char* ttf_data_of_default_sans_serif_font()
+{
+    const unsigned char* ttf_ptr = nullptr;
+
+    // At this point, we already have an open FcConfig, and can pass nullptr to these functions.
+    FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>("sans-serif"));
+    FcConfigSubstitute(nullptr, pattern, FcMatchPattern); 
+    FcDefaultSubstitute(pattern); 
+    FcResult match_result;
+    pattern = FcFontMatch(nullptr, pattern, &match_result);
+    if (match_result == FcResultMatch) {
+        FcChar8* filename;
+        if (FcPatternGetString(pattern, FC_FILE, 0, &filename) == FcResultMatch) {
+            Gosu::log("Found the default sans-serif font: '%s'", filename);
+            ttf_ptr = Gosu::ttf_data_from_file(reinterpret_cast<char*>(filename));
+        }
+    }
+    FcPatternDestroy(pattern);
+
+    return ttf_ptr;
+}
+
 const unsigned char* Gosu::ttf_fallback_data()
 {
-    // Prefer Unifont as a fallback because it covers a lot of Unicode.
+    // Prefer Arial Unicode MS as a fallback because it covers a lot of Unicode in a single file.
+    // This is also the fallback font on Windows and macOS.
+    static const unsigned char* arial_unicode = ttf_data_by_name("Arial Unicode MS", 0);
+    if (arial_unicode) return arial_unicode;
+
+    // DejaVu has at least some Unicode coverage (though no CJK).
+    static const unsigned char* deja_vu = ttf_data_by_name("DejaVu", 0);
+    if (deja_vu) return deja_vu;
+
+    // Unifont has pretty good Unicode coverage, but looks extremely ugly.
     static const unsigned char* unifont = ttf_data_by_name("Unifont", 0);
     if (unifont) return unifont;
     
-    // Otherwise, just use any font that font-config gives us.
-    static const unsigned char* any_font = ttf_data_by_name("", 0);
-    if (any_font) return any_font;
+    // If none of the fonts above work, try to use the default sans-serif font.
+    static const unsigned char* default_font = ttf_data_of_default_sans_serif_font();
+    if (default_font) return default_font;
 
+    // If nothing else works, try to load a file from this hardcoded path.
     return ttf_data_from_file("/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf");
 }
 
 string Gosu::default_font_name()
 {
+    // Liberation Sans was designed to have the same metrics as Arial, which is the default
+    // font on macOS and Windows.
     return "Liberation Sans";
 }
 
 #endif
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4.pre2
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -95,6 +95,7 @@ files:
 - src/Inspection.cpp
 - src/LargeImageData.cpp
 - src/LargeImageData.hpp
+- src/Log.hpp
 - src/MPEGFile.hpp
 - src/Macro.cpp
 - src/Macro.hpp
@@ -162,9 +163,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.6