gosu 0.10.1.2 → 0.10.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb3a09de604515fbe77c22ef529000d209a944f
-  data.tar.gz: e9f3ecbcfa5a2feadc9bbc94b90040e28327b58d
+  metadata.gz: ecfdbb08ed4f62285efa92a4e6531cd11adae83f
+  data.tar.gz: 8c7633022fb1c04feacd970b3aa347c3e2130eb5
 SHA512:
-  metadata.gz: b01c0d3a59982e155d032ddd09bb9ce3582072f1cb4a208a3fa2b769a4c55e634f02f57217d139f171932a03a3968d71abba37389e73864b62ed46a7dc80801f
-  data.tar.gz: e2bbd8efe6e877c7d94e6db147a015c9de154a1337ad706a0e6f6a0c00347c682452f44e05fbc5fc2ac91b01e65d0ced4416ee927b02d3f81cedc5180d18f749
+  metadata.gz: 2c13a96ad5c4e0b58ff964208c7a7cd12ee92bb93a4cdb214641ab93877bbfec080c0923364ef115cab7335eb718655d00c5c4210d59b65d6762926bd161bba8
+  data.tar.gz: c24c6d0429534be9927d1a1bbbd39031bb18b0d23914dd3af8e702571b20746ff57ba416dd2fd644a22d117e8efb481ce4f8d9a8cc45db24c059fa7c93e6074c

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 10
-#define GOSU_POINT_VERSION 1
-#define GOSU_VERSION "0.10.1"
+#define GOSU_POINT_VERSION 2
+#define GOSU_VERSION "0.10.2.pre1"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/Gosu/Window.hpp

@@ -65,10 +65,20 @@ namespace Gosu
         void setCaption(const std::wstring& caption);
         
         double updateInterval() const;
-
+        
         //! Enters a modal loop where the Window is visible on screen and
         //! receives calls to draw, update etc.
-        void show();
+        virtual void show();
+        
+        //! Performs a single mainloop step.
+        //! This method is only useful if you want to integrate Gosu with
+        //! another library that has its own main loop.
+        //! This method implicitly shows the window if it was hidden before, and
+        //! returns false when the window has been closed.
+        //! If you discard the return value and keep calling tick(), the window will be shown again,
+        //! or keep being shown.
+        virtual bool tick();
+        
         //! Closes the window if it is currently shown.
         void close();
 

data/ext/gosu/gosu_wrap.cxx

@@ -8,10 +8,6 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
-// This file was afterwards patched using the following instructions:
-// http://sourceforge.net/tracker/index.php?func=detail&aid=2034216&group_id=1645&atid=101645
-// (Many thanks to Kevin Burge for that.)
-
 #define SWIGRUBY
 #define SWIG_DIRECTORS
 
@@ -874,7 +870,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 
 #include <ruby.h>
-#include <map>
 
 /* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
  * breaks using rb_intern as an lvalue, as SWIG does.  We work around this
@@ -1215,7 +1210,7 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. 
 */
-static std::map<void*, VALUE> swig_ruby_trackings;
+static VALUE swig_ruby_trackings = Qnil;
 
 /* Global variable that stores a reference to the ruby
    hash table delete function. */
@@ -1232,18 +1227,34 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
      This is done to allow multiple DSOs to share the same
      tracking table.
   */
+  ID trackings_id = rb_intern( "@__trackings__" );
   VALUE verbose = rb_gv_get("VERBOSE");
   rb_gv_set("VERBOSE", Qfalse);
+  swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id );
   rb_gv_set("VERBOSE", verbose);
 
   /* No, it hasn't.  Create one ourselves */ 
-  swig_ruby_trackings.clear();
+  if ( swig_ruby_trackings == Qnil )
+    {
+      swig_ruby_trackings = rb_hash_new();
+      rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
+    }
 
   /* Now store a reference to the hash table delete function
      so that we only have to look it up once.*/
   swig_ruby_hash_delete = rb_intern("delete");
 }
 
+/* Get a Ruby number to reference a pointer */
+SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
+  /* We cast the pointer to an unsigned long
+     and then store a reference to it using
+     a Ruby number object. */
+
+  /* Convert the pointer to a Ruby number */
+  return SWIG2NUM(ptr);
+}
+
 /* Get a Ruby number to reference an object */
 SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
   /* We cast the object to an unsigned long
@@ -1265,16 +1276,39 @@ SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) {
 
 /* Add a Tracking from a C/C++ struct to a Ruby object */
 SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
+  /* In a Ruby hash table we store the pointer and
+     the associated Ruby object.  The trick here is
+     that we cannot store the Ruby object directly - if
+     we do then it cannot be garbage collected.  So
+     instead we typecast it as a unsigned long and
+     convert it to a Ruby number object.*/
+
+  /* Get a reference to the pointer as a Ruby number */
+  VALUE key = SWIG_RubyPtrToReference(ptr);
+
+  /* Get a reference to the Ruby object as a Ruby number */
+  VALUE value = SWIG_RubyObjectToReference(object);
+
   /* Store the mapping to the global hash table. */
-  swig_ruby_trackings[ptr] = object;
+  rb_hash_aset(swig_ruby_trackings, key, value);
 }
 
 /* Get the Ruby object that owns the specified C/C++ struct */
 SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
-  if (swig_ruby_trackings.count(ptr) == 0)
+  /* Get a reference to the pointer as a Ruby number */
+  VALUE key = SWIG_RubyPtrToReference(ptr);
+
+  /* Now lookup the value stored in the global hash table */
+  VALUE value = rb_hash_aref(swig_ruby_trackings, key);
+	
+  if (value == Qnil) {
+    /* No object exists - return nil. */
     return Qnil;
-  else
-    return swig_ruby_trackings[ptr];
+  }
+  else {
+    /* Convert this value to Ruby object */
+    return SWIG_RubyReferenceToObject(value);
+  }
 }
 
 /* Remove a Tracking from a C/C++ struct to a Ruby object.  It
@@ -1282,7 +1316,12 @@ SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
    since the same memory address may be reused later to create
    a new object. */
 SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
-  swig_ruby_trackings.erase(ptr);
+  /* Get a reference to the pointer as a Ruby number */
+  VALUE key = SWIG_RubyPtrToReference(ptr);
+
+  /* Delete the object from the hash table by calling Ruby's
+     do this we need to call the Hash.delete method.*/
+  rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key);
 }
 
 /* This is a helper method that unlinks a Ruby object from its
@@ -2236,20 +2275,6 @@ namespace Gosu {
 #define RUBY_18_19(r18, r19) r18
 #endif
 
-namespace GosusDarkSide
-{
-    // TODO: Find a way for this to fit into Gosu's design.
-    // This can point to a function that wants to be called every
-    // frame, e.g. rb_thread_schedule.
-    typedef void (*HookOfHorror)();
-    extern HookOfHorror oncePerTick;
-    
-    void yieldToOtherRubyThreads()
-    {
-        rb_thread_schedule();
-    }
-}
-
 namespace
 {
     void callRubyBlock(VALUE block) {
@@ -3069,17 +3094,39 @@ SwigDirector_Window::SwigDirector_Window(VALUE self, unsigned int width, unsigne
 SwigDirector_Window::~SwigDirector_Window() {
 }
 
+void SwigDirector_Window::show() {
+  VALUE result;
+  
+  result = rb_funcall(swig_get_self(), rb_intern("show"), 0, NULL);
+}
+
+
+bool SwigDirector_Window::tick() {
+  bool c_result ;
+  VALUE result;
+  
+  result = rb_funcall(swig_get_self(), rb_intern("tick"), 0, NULL);
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
 void SwigDirector_Window::update() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("update"), 0, NULL);
 }
 
 
 void SwigDirector_Window::draw() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_draw_2"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("draw"), 0, NULL);
 }
 
 
@@ -3087,7 +3134,7 @@ bool SwigDirector_Window::needsRedraw() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_redraw?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("needs_redraw?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3102,7 +3149,7 @@ bool SwigDirector_Window::needsCursor() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_cursor?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("needs_cursor?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3116,7 +3163,7 @@ bool SwigDirector_Window::needsCursor() const {
 void SwigDirector_Window::loseFocus() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_lose_focus"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("lose_focus"), 0, NULL);
 }
 
 
@@ -3137,7 +3184,7 @@ void SwigDirector_Window::buttonDown(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("protected_button_down"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("button_down"), 1,obj0);
 }
 
 
@@ -3151,7 +3198,7 @@ void SwigDirector_Window::buttonUp(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("protected_button_up"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("button_up"), 1,obj0);
 }
 
 
@@ -8813,6 +8860,8 @@ _wrap_Window_show(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
   
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
@@ -8822,12 +8871,23 @@ _wrap_Window_show(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Window *","show", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Window * >(argp1);
-  {
-    try {
-      (arg1)->show();
-    } catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
+  director = dynamic_cast<Swig::Director *>(arg1);
+  upcall = (director && (director->swig_get_self() == self));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->Gosu::Window::show();
+        } else {
+          (arg1)->show();
+        }
+      } catch (const std::exception& e) {
+        SWIG_exception(SWIG_RuntimeError, e.what());
+      }
     }
+  } catch (Swig::DirectorException& e) {
+    rb_exc_raise(e.getError());
+    SWIG_fail;
   }
   return Qnil;
 fail:
@@ -8835,6 +8895,49 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Window_tick(int argc, VALUE *argv, VALUE self) {
+  Gosu::Window *arg1 = (Gosu::Window *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Window, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Window *","tick", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Window * >(argp1);
+  director = dynamic_cast<Swig::Director *>(arg1);
+  upcall = (director && (director->swig_get_self() == self));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)(arg1)->Gosu::Window::tick();
+        } else {
+          result = (bool)(arg1)->tick();
+        }
+      } catch (const std::exception& e) {
+        SWIG_exception(SWIG_RuntimeError, e.what());
+      }
+    }
+  } catch (Swig::DirectorException& e) {
+    rb_exc_raise(e.getError());
+    SWIG_fail;
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_Window_close(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
@@ -11105,8 +11208,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   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 >(10)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(1)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.1"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(2)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.2.pre1"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("This software uses the following third-party libraries:\n\nGosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\nSDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\nlibsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\nOpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
@@ -11470,12 +11573,6 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "Gp3Button13", SWIG_From_int(static_cast< int >(Gosu::gp3Button13)));
   rb_define_const(mGosu, "Gp3Button14", SWIG_From_int(static_cast< int >(Gosu::gp3Button14)));
   rb_define_const(mGosu, "Gp3Button15", SWIG_From_int(static_cast< int >(Gosu::gp3Button15)));
-  
-  GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
-  // While we are at it, call srand() - otherwise unavailable to Ruby people
-  std::srand(static_cast<unsigned int>(std::time(0)));
-  std::rand(); // and flush the first value
-  
   rb_define_module_function(mGosu, "disown_TextInput", VALUEFUNC(_wrap_disown_TextInput), -1);
   
   SwigClassTextInput.klass = rb_define_class_under(mGosu, "TextInput", rb_cObject);
@@ -11506,6 +11603,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_method(SwigClassWindow.klass, "caption=", VALUEFUNC(_wrap_Window_captione___), -1);
   rb_define_method(SwigClassWindow.klass, "update_interval", VALUEFUNC(_wrap_Window_update_interval), -1);
   rb_define_method(SwigClassWindow.klass, "show", VALUEFUNC(_wrap_Window_show), -1);
+  rb_define_method(SwigClassWindow.klass, "tick", VALUEFUNC(_wrap_Window_tick), -1);
   rb_define_method(SwigClassWindow.klass, "close", VALUEFUNC(_wrap_Window_close), -1);
   rb_define_method(SwigClassWindow.klass, "update", VALUEFUNC(_wrap_Window_update), -1);
   rb_define_method(SwigClassWindow.klass, "draw", VALUEFUNC(_wrap_Window_draw), -1);

data/ext/gosu/gosu_wrap.h

@@ -30,6 +30,8 @@ class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 public:
     SwigDirector_Window(VALUE self, unsigned int width, unsigned int height, bool fullscreen = false, double updateInterval = 16.666666);
     virtual ~SwigDirector_Window();
+    virtual void show();
+    virtual bool tick();
     virtual void update();
     virtual void draw();
     virtual bool needsRedraw() const;

data/lib/gosu/patches.rb

@@ -90,6 +90,7 @@ end
 class Gosu::Window
   # Backwards compatibility:
   # Class methods that have been turned into module methods.
+  
   def self.button_id_to_char(id)
     Gosu.button_id_to_char(id)
   end
@@ -99,7 +100,8 @@ class Gosu::Window
   end
   
   # Backwards compatibility:
-  # Instance methods taht have been turned into module methods.
+  # Instance methods that have been turned into module methods.
+  
   %w(draw_line draw_triangle draw_quad
      flush gl clip_to record
      transform translate rotate scale
@@ -108,6 +110,16 @@ class Gosu::Window
       Gosu.send method, *args, &block
     end
   end
+  
+  # Call Thread.pass every tick, which may or may not be necessary for friendly co-existence with
+  # Ruby's Thread class.
+  
+  alias _tick tick
+  
+  def tick
+    Thread.pass
+    _tick
+  end
 end
 
 # Release OpenAL resources during Ruby's shutdown, not Gosu's.

data/src/Window.cpp

@@ -167,55 +167,50 @@ double Gosu::Window::updateInterval() const
     return pimpl->updateInterval;
 }
 
-namespace GosusDarkSide
+void Gosu::Window::show()
 {
-    // TODO: Find a way for this to fit into Gosu's design.
-    // This can point to a function that wants to be called every
-    // frame, e.g. rb_thread_schedule.
-    typedef void (*HookOfHorror)();
-    HookOfHorror oncePerTick = 0;
+    unsigned long timeBeforeTick = milliseconds();
+    
+    while (tick()) {
+        // Sleep to keep this loop from eating 100% CPU.
+        unsigned long tickTime = milliseconds() - timeBeforeTick;
+        if (tickTime < updateInterval())
+            sleep(updateInterval() - tickTime);
+        
+        timeBeforeTick = milliseconds();
+    }
 }
 
-void Gosu::Window::show()
+bool Gosu::Window::tick()
 {
-    while (true) {
-        unsigned long startTime = milliseconds();
-        
-        SDL_Event e;
-        while (SDL_PollEvent(&e)) {
-            if (e.type == SDL_QUIT)
-                return;
-            else
-                input().feedSDLEvent(&e);
-		}
-        
-        Song::update();
-        
-        input().update();
-        
-        update();
-        
-        SDL_ShowCursor(needsCursor());
-        
-        if (needsRedraw()) {
-            ensureCurrentContext();
-            if (graphics().begin()) {
-                draw();
-                graphics().end();
-                FPS::registerFrame();
-            }
-            
-            SDL_GL_SwapWindow(sharedWindow());
-            
-            if (GosusDarkSide::oncePerTick) GosusDarkSide::oncePerTick();
+    SDL_Event e;
+    while (SDL_PollEvent(&e)) {
+        if (e.type == SDL_QUIT)
+            return false;
+        else
+            input().feedSDLEvent(&e);
+    }
+    
+    Song::update();
+    
+    input().update();
+    
+    update();
+    
+    SDL_ShowCursor(needsCursor());
+    
+    if (needsRedraw()) {
+        ensureCurrentContext();
+        if (graphics().begin()) {
+            draw();
+            graphics().end();
+            FPS::registerFrame();
         }
         
-        // Sleep to keep this loop from eating 100% CPU.
-        unsigned long frameTime = milliseconds() - startTime;
-        if (frameTime < pimpl->updateInterval) {
-            sleep(pimpl->updateInterval - frameTime);
-        }
+        SDL_GL_SwapWindow(sharedWindow());
     }
+    
+    return true;
 }
 
 void Gosu::Window::close()

data/src/WindowUIKit.mm

@@ -113,6 +113,11 @@ void Gosu::Window::show()
 {
 }
 
+bool Gosu::Window::tick()
+{
+    return true;
+}
+
 void Gosu::Window::close()
 {
     throw std::logic_error("Cannot close windows manually on iOS");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.10.1.2
+  version: 0.10.2.pre1
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -155,9 +155,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14