gosu 0.9.1 → 0.9.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d8b4cb59cd150e013929d06574a638adc974ed
-  data.tar.gz: 50d21db20505f458779832fed214310ce34e93e8
+  metadata.gz: 1a1c34fd00bf80dda03420c2469ba363f09790e5
+  data.tar.gz: eb1a0080a88b5aae6a77731cf7f9b0d5a7ddc221
 SHA512:
-  metadata.gz: baba7811f1734093a264106c78ced29908d9427fd12074939d56ae564b7918dec836f52de90dedbe13573bdf5a09159282ffc4151a3784fd5a888c287332c532
-  data.tar.gz: 761a1bac7809eaf3fc6bd61e58af3521a221638fa783504f01a4fce89b4b62cb6508affaf63778aab885f9e879b08fb72f16ee0c6d48255ab45258880c192cfc
+  metadata.gz: c7ebb942e9dd669d8cfb8efd51a1f1e796b042067b88beee7d62a3997c550d1fe0794afd1c82026a5d1ce4a71970b5c67611fd1e24a062dd7b1cc8e451745af3
+  data.tar.gz: d227fec88ceb822dcd120923e338e49cee87897b0be3e21eeefa1d0355c050bb4c0ec53ef8867394b2c2e30535ff6a332ea1fc2fdca1b221660b527fd40de3c9

data/Gosu/Input.hpp

@@ -89,7 +89,7 @@ namespace Gosu
         Input(void* view, float updateInterval);
         void feedTouchEvent(int type, void* touches);
     #else
-        Input();
+        Input(void* window);
         bool feedSDLEvent(void* event);
     #endif
         

data/Gosu/Version.hpp

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

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
 
@@ -848,7 +844,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
@@ -1189,7 +1184,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. */
@@ -1206,18 +1201,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
@@ -1239,16 +1250,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
@@ -1256,7 +1290,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
@@ -3062,14 +3101,14 @@ SwigDirector_Window::~SwigDirector_Window() {
 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);
 }
 
 
@@ -3077,7 +3116,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)) {
@@ -3092,7 +3131,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)) {
@@ -3106,7 +3145,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);
 }
 
 
@@ -3127,7 +3166,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);
 }
 
 
@@ -3141,7 +3180,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);
 }
 
 
@@ -11095,8 +11134,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 >(9)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(1)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.9.1"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(2)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.9.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\nFreeImage, http://freeimage.sourceforge.net, FreeImage Public License\nlibogg & libvorbis, http://www.xiph.org, BSD License, 3-Clause Version, http://www.xiph.org/licenses/bsd\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);

data/rdoc/gosu.rb

@@ -676,28 +676,27 @@ module Gosu
   # Gosu application. Manages initialization of all of Gosu's core components
   # and provides timing functionality.
   #
-  # Note that all coordinates, even the mouse position, are in client
-  # coordinates relative to the window. This means that the mouse position
-  # can be negative or larger than the window size.
+  # Note that all coordinates, even the mouse position, are in client coordinates, relative to the window’s top left corner.
+  # This means that the mouse position can be negative or larger than the window size.
   #
-  # @note There should really only be one instance of this class at a time. This may or may not change later, but for right now, having two or more windows and loading samples or songs on both of them will result in an exception.
+  # @note There should really only be one instance of this class at a time. This may or may not change later.
   class Window
     ##
     # @return [String] the window's caption, usually dispalyed in the title bar.
     attr_accessor :caption
     
     ##
-    # @return [Fixnum] the mouse pointer's window-based X coordinate.
+    # @return [Float] the mouse pointer's window-based X coordinate.
     attr_accessor :mouse_x
     
     ##
-    # @return [Fixnum] the mouse pointer's window-based Y coordinate.
+    # @return [Float] the mouse pointer's window-based Y coordinate.
     attr_accessor :mouse_y
     
     ##
     # The currently active {TextInput}. If not nil, all keyboard input will be handled by this object.
     # 
-    # @return [TextInput?] the currently active text input.
+    # @return [TextInput?] the currently active text input, if any.
     attr_accessor :text_input
     
     ##

data/src/Input/Input.cpp

@@ -9,30 +9,38 @@
 
 namespace
 {
+    void cleanup();
+
     void requireSDLVideo()
     {
-        static bool initializedSDLVideo = false;
-        if (!initializedSDLVideo)
+        static bool initialized = false;
+        if (!initialized)
         {
-            SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER);
-            std::atexit(SDL_Quit);
-            initializedSDLVideo = true;
+            SDL_InitSubSystem(SDL_INIT_VIDEO);
+            initialized = true;
+            std::atexit(cleanup);
         }
     }
     
+    void cleanup()
+    {
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    }
+
     std::tr1::array<bool, Gosu::numButtons> buttonStates = { { false } };
 }
 
 struct Gosu::Input::Impl
 {
     Input& input;
+    SDL_Window* window;
     TextInput* textInput;
     double mouseX, mouseY;
     double mouseFactorX, mouseFactorY;
     double mouseOffsetX, mouseOffsetY;
     
-    Impl(Input& input)
-    : input(input), textInput(NULL)
+    Impl(Input& input, SDL_Window* window)
+    : input(input), window(window), textInput(NULL)
     {
         mouseFactorX = mouseFactorY = 1;
         mouseOffsetX = mouseOffsetY = 0;
@@ -40,9 +48,16 @@ struct Gosu::Input::Impl
     
     void updateMousePosition()
     {
+    #if SDL_VERSION_ATLEAST(2, 0, 4)
+        int x, y, windowX, windowY;
+        SDL_GetWindowPosition(window, &windowX, &windowY);
+        SDL_GetGlobalMouseState(&x, &y);
+        mouseX = x - windowX, mouseY = y - windowY;
+    #else
         int x, y;
         SDL_GetMouseState(&x, &y);
         mouseX = x, mouseY = y;
+    #endif
     }
     
     void enqueueEvent(int id, bool down)
@@ -70,6 +85,8 @@ struct Gosu::Input::Impl
     
     void initializeGamepads()
     {
+        SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
+
         int numGamepads = std::min<int>(Gosu::numGamepads, SDL_NumJoysticks());
         
         for (int i = 0; i < numGamepads; ++i) {
@@ -95,6 +112,8 @@ struct Gosu::Input::Impl
         joysticks.clear();
         std::for_each(gameControllers.begin(), gameControllers.end(), &SDL_GameControllerClose);
         gameControllers.clear();
+        
+        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
     }
     
     typedef std::tr1::array<bool, gpNumPerGamepad> GamepadBuffer;
@@ -236,8 +255,8 @@ private:
     }
 };
 
-Gosu::Input::Input()
-: pimpl(new Impl(*this))
+Gosu::Input::Input(void* window)
+: pimpl(new Impl(*this, (SDL_Window*)window))
 {
     requireSDLVideo();
     
@@ -359,8 +378,7 @@ double Gosu::Input::mouseY() const
 
 void Gosu::Input::setMousePosition(double x, double y)
 {
-    // TODO - Input needs SDL Window handle to pass into this
-    SDL_WarpMouseInWindow(NULL,
+    SDL_WarpMouseInWindow(pimpl->window,
         (x - pimpl->mouseOffsetX) / pimpl->mouseFactorX,
         (y - pimpl->mouseOffsetY) / pimpl->mouseFactorY);
 }

data/src/TimingWin.cpp

@@ -4,29 +4,11 @@
 
 void Gosu::sleep(unsigned milliseconds)
 {
-    ::Sleep(milliseconds);
-}
-
-namespace
-{
-    void resetTGT()
-    {
-        ::timeEndPeriod(1);
-    }
+    Sleep(milliseconds);
 }
 
 unsigned long Gosu::milliseconds()
 {
-		static unsigned long start = 0;
-
-    if (!start)
-    {
-        if (::timeBeginPeriod(1) != TIMERR_NOERROR)
-            std::atexit(resetTGT);
-				start = ::timeGetTime();
-    }
-    // Truncate to 2^30, C++ users shouldn't mind and Ruby users will
-    // have a happy GC on 32-bit systems.
-    // No, don't ask why this is an unsigned long then :)
-    return (::timeGetTime() - start) & 0x1fffffff;
+    static unsigned long start = (timeBeginPeriod(1), timeGetTime());
+    return timeGetTime() - start;
 }

data/src/Window.cpp

@@ -19,7 +19,9 @@ namespace Gosu
         const char *error = SDL_GetError();
         throw std::runtime_error(operation + ": " + (error ? error : "(unknown error)"));
     }
-    
+
+    void cleanup();
+
     SDL_Window* sharedWindow()
     {
         static SDL_Window *window = 0;
@@ -27,9 +29,9 @@ namespace Gosu
         {
             if (SDL_Init(SDL_INIT_VIDEO) < 0)
                 throwSDLError("Could not initialize SDL Video");
-            
-            atexit(SDL_Quit);
-            
+
+            std::atexit(cleanup);
+
             Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN;
             
             #if SDL_VERSION_ATLEAST(2, 0, 1)
@@ -65,6 +67,13 @@ namespace Gosu
     {
         SDL_GL_MakeCurrent(sharedWindow(), sharedGLContext());
     }
+
+    void cleanup()
+    {
+        SDL_GL_DeleteContext(sharedGLContext());
+        SDL_DestroyWindow(sharedWindow());
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    }
 }
 
 struct Gosu::Window::Impl
@@ -78,7 +87,6 @@ struct Gosu::Window::Impl
 Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double updateInterval)
 : pimpl(new Impl)
 {
-    
     int actualWidth = width;
     int actualHeight = height;
     double scaleFactor = 1.0;
@@ -131,7 +139,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     
     pimpl->graphics.reset(new Graphics(actualWidth, actualHeight, fullscreen));
     pimpl->graphics->setResolution(width, height, blackBarWidth, blackBarHeight);
-    pimpl->input.reset(new Input());
+    pimpl->input.reset(new Input(sharedWindow()));
     pimpl->input->setMouseFactors(1 / scaleFactor, 1 / scaleFactor, blackBarWidth, blackBarHeight);
     input().onButtonDown = std::tr1::bind(&Window::buttonDown, this, _1);
     input().onButtonUp = std::tr1::bind(&Window::buttonUp, this, _1);
@@ -208,6 +216,8 @@ void Gosu::Window::show()
             sleep(pimpl->updateInterval - frameTime);
         }
     }
+
+    SDL_HideWindow(sharedWindow());
 }
 
 void Gosu::Window::close()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2.pre1
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -162,9 +162,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