gosu 1.1.0.pre1 → 1.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c79a5d22ee53e69f48bcd2c1ffb20bf35672ee30d6f08890a9c3037a39fe24
-  data.tar.gz: 6a5e06a31f1a7ad257be143a37a1163b324e7124cb56a97154c9eba9fb0686d8
+  metadata.gz: 70dc24184a235da8dc66f4bac07da231b87ab9f4a7469d06331ba048da6bc5b6
+  data.tar.gz: 0fab031220b2912e66d29e53e1c4dbee51823e042b75927e31415bca59056ac3
 SHA512:
-  metadata.gz: 7db1b37245a24e569bbc623ec025a3e2d13fd61c7a011272e30cca9d4cf6970a2326ec159ee839236fc246ed177702c3de6942e46ba9297c50e51078f61cb564
-  data.tar.gz: 0a75ca1ddf6de40050638cc33e8c41acdd68808b1c3942aaecff2219aaf44e8148398bdd27991d5f5d4e1757b8fec651f59c7b9bba82b140dffdcda7df5ab632
+  metadata.gz: 59567c7edd20676430b16a27f260fb64f6309d992215cf5f3e22cf8311d39a263945836b040ebd46cb9ee4e0e9a430a0cc1f84d35fc8b3ea8f1ca4b79b170bb6
+  data.tar.gz: 31afdb7a4465c4c59002a2a044202b43803db915c9ae6940fb87606b51e9907707591db591d6baa60c1aadf89104a045a12bfdeb81e7c80bed76dfb9d8284709

data/lib/gosu/swig_patches.rb

@@ -3,16 +3,20 @@
 # compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  alias_method :initialize_with_options_hash, :initialize
+  alias_method :initialize_with_bitmask, :initialize
 
-  def initialize width, height, *args
-    if args.empty? or args.first.is_a? Hash
-      options = args.first || {}
+  def initialize(width, height, *args)
+    $gosu_gl_blocks = nil
+
+    if args.first.is_a? Hash
+      flags = 0
+      flags |= 1 if args.first[:fullscreen]
+      flags |= 2 if args.first[:resizable]
+      flags |= 4 if args.first[:borderless]
+      initialize_with_bitmask(width, height, flags, args.first[:update_interval] || 16.666666)
     else
-      options = { fullscreen: args[0], update_interval: args[1] }
+      initialize_with_bitmask(width, height, args[0] ? 1 : 0, args[1] || 16.666666)
     end
-    $gosu_gl_blocks = nil
-    initialize_with_options_hash width, height, options
   end
 
   %w(update draw needs_redraw? needs_cursor?

data/src/RubyGosu.cxx

@@ -3218,45 +3218,6 @@ SWIGINTERN void Gosu_TextInput_set_selection_start(Gosu::TextInput *self,VALUE s
         std::string prefix = StringValueCStr(rb_prefix);
         self->set_selection_start(std::min(prefix.length(), self->text().length()));
     }
-SWIGINTERN Gosu::Window *new_Gosu_Window(VALUE self,int width,int height,VALUE options=0){
-        unsigned flags = 0;
-        double update_interval = 16.666666;
-
-        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, "fullscreen")) {
-                    if (RTEST(value)) flags |= Gosu::WF_FULLSCREEN;
-                }
-                else if (!strcmp(key_string, "resizable")) {
-                    if (RTEST(value)) flags |= Gosu::WF_RESIZABLE;
-                }
-                else if (!strcmp(key_string, "borderless")) {
-                    if (RTEST(value)) flags |= Gosu::WF_BORDERLESS;
-                }
-                else if (!strcmp(key_string, "update_interval")) {
-                    update_interval = NUM2DBL(value);
-                }
-                else {
-                    static bool issued_warning = false;
-                    if (!issued_warning) {
-                        issued_warning = true;
-                        rb_warn("Unknown keyword argument: :%s", key_string);
-                    }
-                }
-            }
-        }
-
-        return new Gosu::Window(width, height, flags, update_interval);
-    }
 SWIGINTERN void Gosu_Window_set_width(Gosu::Window *self,unsigned int width){
         self->resize(width, self->height(), self->fullscreen());
     }
@@ -3339,6 +3300,12 @@ std::string SwigDirector_TextInput::filter(std::string text) const {
 }
 
 
+SwigDirector_Window::SwigDirector_Window(VALUE self,int width,int height,unsigned int window_flags,double update_interval): Gosu::Window(width, height, window_flags, update_interval), Swig::Director(self) {
+  
+}
+
+
+
 SwigDirector_Window::~SwigDirector_Window() {
 }
 
@@ -9213,6 +9180,89 @@ fail:
 
 static swig_class SwigClassWindow;
 
+SWIGINTERN VALUE
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+_wrap_Window_allocate(VALUE self)
+#else
+_wrap_Window_allocate(int argc, VALUE *argv, VALUE self)
+#endif
+{
+  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_Gosu__Window);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+  rb_obj_call_init(vresult, argc, argv);
+#endif
+  return vresult;
+}
+
+
+SWIGINTERN VALUE
+_wrap_new_Window(int argc, VALUE *argv, VALUE self) {
+  VALUE arg1 = (VALUE) 0 ;
+  int arg2 ;
+  int arg3 ;
+  unsigned int arg4 = (unsigned int) Gosu::WF_WINDOWED ;
+  double arg5 = (double) 16.666666 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  unsigned int val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
+  const char *classname SWIGUNUSED = "Gosu::Window";
+  Gosu::Window *result = 0 ;
+  
+  if ((argc < 2) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  arg1 = self;
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","Window", 2, argv[0] ));
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","Window", 3, argv[1] ));
+  } 
+  arg3 = static_cast< int >(val3);
+  if (argc > 2) {
+    ecode4 = SWIG_AsVal_unsigned_SS_int(argv[2], &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "unsigned int","Window", 4, argv[2] ));
+    } 
+    arg4 = static_cast< unsigned int >(val4);
+  }
+  if (argc > 3) {
+    ecode5 = SWIG_AsVal_double(argv[3], &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), Ruby_Format_TypeError( "", "double","Window", 5, argv[3] ));
+    } 
+    arg5 = static_cast< double >(val5);
+  }
+  {
+    try {
+      if ( strcmp(rb_obj_classname(self), classname) != 0 ) {
+        /* subclassed */
+        result = (Gosu::Window *)new SwigDirector_Window(arg1,arg2,arg3,arg4,arg5); 
+      } else {
+        result = (Gosu::Window *)new Gosu::Window(arg2,arg3,arg4,arg5); 
+      }
+      
+      DATA_PTR(self) = result;
+      SWIG_RubyAddTracking(result, self);
+    }
+    catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  return self;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN void
 free_Gosu_Window(void *self) {
     Gosu::Window *arg1 = (Gosu::Window *)self;
@@ -10210,67 +10260,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-_wrap_Window_allocate(VALUE self)
-#else
-_wrap_Window_allocate(int argc, VALUE *argv, VALUE self)
-#endif
-{
-  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_Gosu__Window);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-  rb_obj_call_init(vresult, argc, argv);
-#endif
-  return vresult;
-}
-
-
-SWIGINTERN VALUE
-_wrap_new_Window(int argc, VALUE *argv, VALUE self) {
-  VALUE arg1 = (VALUE) 0 ;
-  int arg2 ;
-  int arg3 ;
-  VALUE arg4 = (VALUE) 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  const char *classname SWIGUNUSED = "Gosu::Window";
-  Gosu::Window *result = 0 ;
-  
-  if ((argc < 2) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  arg1 = self;
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","Window", 2, argv[0] ));
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(argv[1], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","Window", 3, argv[1] ));
-  } 
-  arg3 = static_cast< int >(val3);
-  if (argc > 2) {
-    arg4 = argv[2];
-  }
-  {
-    try {
-      result = (Gosu::Window *)new_Gosu_Window(arg1,arg2,arg3,arg4);
-      DATA_PTR(self) = result;
-      SWIG_RubyAddTracking(result, self);
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  return self;
-fail:
-  return Qnil;
-}
-
-
 SWIGINTERN VALUE
 _wrap_Window_widthe___(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;

data/src/RubyGosu.h

@@ -28,6 +28,7 @@ public:
 class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 
 public:
+    SwigDirector_Window(VALUE self,int width,int height,unsigned int window_flags=Gosu::WF_WINDOWED,double update_interval=16.666666);
     virtual ~SwigDirector_Window();
     virtual void show();
     virtual bool tick();

data/src/TrueTypeFontWin.cpp

@@ -32,8 +32,8 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     LOGFONT logfont = {
         0, 0, 0, 0,
         (font_flags & Gosu::FF_BOLD) ? FW_BOLD : FW_NORMAL,
-        (font_flags & Gosu::FF_ITALIC) ? 1 : 0,
-        (font_flags & Gosu::FF_UNDERLINE) ? 1 : 0,
+        static_cast<BYTE>((font_flags & Gosu::FF_ITALIC) ? TRUE : FALSE),
+        static_cast<BYTE>((font_flags & Gosu::FF_UNDERLINE) ? TRUE : FALSE),
         0 /* no strikethrough */,
         ANSI_CHARSET, OUT_OUTLINE_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
         DEFAULT_PITCH

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre1
+  version: 1.1.0.pre2
 platform: ruby
 authors:
 - Julian Raschke