gosu 0.7.25 → 0.7.26

data/GosuImpl/TimingApple.cpp

@@ -0,0 +1,28 @@
+#include <Gosu/Timing.hpp>
+#include <unistd.h>
+
+void Gosu::sleep(unsigned milliseconds)
+{
+	usleep(milliseconds * 1000);
+}
+
+// Thanks to this blog for the unconvoluted code example:
+// http://shiftedbits.org/2008/10/01/mach_absolute_time-on-the-iphone/
+
+#include <boost/cstdint.hpp>
+#include <mach/mach_time.h>
+
+unsigned long Gosu::milliseconds()
+{
+    static boost::uint64_t firstTick = 0;
+    static mach_timebase_info_data_t info;
+    
+    if (firstTick == 0)
+    {
+        mach_timebase_info(&info);
+        firstTick = mach_absolute_time();
+    }
+
+    boost::uint64_t runtime = mach_absolute_time() - firstTick;
+	return runtime * info.numer / info.denom / 1000000.0;
+}

data/GosuImpl/UtilityTouch.mm

@@ -32,7 +32,8 @@ string Gosu::wstringToUTF8(const std::wstring& ws)
                                            length: ws.size() * sizeof(wchar_t)
                                            encoding:NSUTF32LittleEndianStringEncoding]);
     ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
-    return [str.obj() UTF8String];
+    const char* utf8 = [str.obj() UTF8String];
+    return utf8 ? utf8 : string();
 }
 wstring Gosu::widen(const string& s)
 {

data/GosuImpl/WindowMac.mm

@@ -335,7 +335,8 @@ std::wstring Gosu::Window::caption() const
         return L"";
     
     ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
-    return Gosu::utf8ToWstring([[pimpl->window.obj() title] UTF8String]);
+    const char* utf8 = [[pimpl->window.obj() title] UTF8String];
+    return utf8 ? Gosu::utf8ToWstring(utf8) : std::wstring();
 }
 
 void Gosu::Window::setCaption(const std::wstring& caption)

data/lib/gosu/patches.rb

@@ -25,7 +25,7 @@ class Gosu::Sample
   
   def initialize(*args)
     args.shift if args.first.is_a? Gosu::Window
-    new_initialize *args
+    new_initialize(*args)
   end
 end
 class Gosu::Song
@@ -33,7 +33,7 @@ class Gosu::Song
   
   def initialize(*args)
     args.shift if args.first.is_a? Gosu::Window
-    new_initialize *args
+    new_initialize(*args)
   end
 end
 
@@ -50,17 +50,17 @@ class Gosu::Color
     def value=; end
   end
   
-  NONE    = Gosu::Color::Constant.new(0x00000000)
-  BLACK   = Gosu::Color::Constant.new(0xff000000)
-  GRAY    = Gosu::Color::Constant.new(0xff808080)
-  WHITE   = Gosu::Color::Constant.new(0xffffffff)            
-  AQUA    = Gosu::Color::Constant.new(0xff00ffff)
-  RED     = Gosu::Color::Constant.new(0xffff0000)
-  GREEN   = Gosu::Color::Constant.new(0xff00ff00)
-  BLUE    = Gosu::Color::Constant.new(0xff0000ff)
-  YELLOW  = Gosu::Color::Constant.new(0xffffff00)
-  FUCHSIA = Gosu::Color::Constant.new(0xffff00ff)
-  CYAN    = Gosu::Color::Constant.new(0xff00ffff)
+  NONE    = Gosu::Color::Constant.argb(0x00000000)
+  BLACK   = Gosu::Color::Constant.argb(0xff000000)
+  GRAY    = Gosu::Color::Constant.argb(0xff808080)
+  WHITE   = Gosu::Color::Constant.argb(0xffffffff)            
+  AQUA    = Gosu::Color::Constant.argb(0xff00ffff)
+  RED     = Gosu::Color::Constant.argb(0xffff0000)
+  GREEN   = Gosu::Color::Constant.argb(0xff00ff00)
+  BLUE    = Gosu::Color::Constant.argb(0xff0000ff)
+  YELLOW  = Gosu::Color::Constant.argb(0xffffff00)
+  FUCHSIA = Gosu::Color::Constant.argb(0xffff00ff)
+  CYAN    = Gosu::Color::Constant.argb(0xff00ffff)
 end
 
 # Instance methods for button_id_to_char and char_to_button_id

data/linux/extconf.rb

@@ -14,7 +14,7 @@ puts
 
 # FIXME should reversely filter out files ending in Win, Mac, Touch, AL etc.
 SOURCE_FILES =
-    %w(Math.cpp Utility.cpp IO.cpp FileUnix.cpp InputX.cpp TextInputX.cpp TimingUnix.cpp WindowX.cpp
+    %w(Math.cpp Utility.cpp IO.cpp FileUnix.cpp InputX.cpp TextInputX.cpp TimingApple.cpp WindowX.cpp
 	     Graphics/Bitmap.cpp Graphics/BitmapUtils.cpp Graphics/Color.cpp
 	     Graphics/TexChunk.cpp Graphics/Graphics.cpp Graphics/Image.cpp
 	     Graphics/BlockAllocator.cpp
@@ -38,7 +38,7 @@ sdl_config = with_config("sdl-config", "sdl-config")
 pango_config = "pkg-config pangoft2" # FIXME should probably use with_config
 
 $INCFLAGS << " -I../ -I../GosuImpl `#{sdl_config} --cflags` `#{pango_config} --cflags`"
-$LDFLAGS << " `#{pango_config} --libs` -lX11"
+$LDFLAGS << " `#{sdl_config} --libs` `#{pango_config} --libs` -lX11"
 have_header('SDL_mixer.h') if have_library('SDL_mixer', 'Mix_OpenAudio')
 have_header('SDL_ttf.h') if have_library('SDL_ttf', 'TTF_RenderUTF8_Blended')
 have_header('gl.h') if have_library('GL', 'glMatrixMode')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 7
-  - 25
-  version: 0.7.25
+  - 26
+  version: 0.7.26
 platform: ruby
 authors: 
 - Julian Raschke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2011-01-09 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -31,31 +31,6 @@ extra_rdoc_files: []
 files: 
 - COPYING.txt
 - README.txt
-- lib/gosu.rb
-- lib/gosu/patches.rb
-- lib/gosu/swig_patches.rb
-- examples/ChipmunkIntegration.rb
-- examples/CptnRuby.rb
-- examples/MoreChipmunkAndRMagick.rb
-- examples/OpenGLIntegration.rb
-- examples/RMagickIntegration.rb
-- examples/TextInput.rb
-- examples/Tutorial.rb
-- examples/media/Beep.wav
-- examples/media/CptnRuby Gem.png
-- examples/media/CptnRuby Map.txt
-- examples/media/CptnRuby Tileset.png
-- examples/media/CptnRuby.png
-- examples/media/Cursor.png
-- examples/media/Earth.png
-- examples/media/Explosion.wav
-- examples/media/LargeStar.png
-- examples/media/Sky.jpg
-- examples/media/Smoke.png
-- examples/media/Soldier.png
-- examples/media/Space.png
-- examples/media/Star.png
-- examples/media/Starfighter.bmp
 - Gosu/Async.hpp
 - Gosu/Audio.hpp
 - Gosu/AutoLink.hpp
@@ -84,6 +59,31 @@ files:
 - Gosu/Version.hpp
 - Gosu/Window.hpp
 - Gosu/WinUtility.hpp
+- lib/gosu.rb
+- lib/gosu/patches.rb
+- lib/gosu/swig_patches.rb
+- examples/ChipmunkIntegration.rb
+- examples/CptnRuby.rb
+- examples/MoreChipmunkAndRMagick.rb
+- examples/OpenGLIntegration.rb
+- examples/RMagickIntegration.rb
+- examples/TextInput.rb
+- examples/Tutorial.rb
+- examples/media/Beep.wav
+- examples/media/CptnRuby Gem.png
+- examples/media/CptnRuby Map.txt
+- examples/media/CptnRuby Tileset.png
+- examples/media/CptnRuby.png
+- examples/media/Cursor.png
+- examples/media/Earth.png
+- examples/media/Explosion.wav
+- examples/media/LargeStar.png
+- examples/media/Sky.jpg
+- examples/media/Smoke.png
+- examples/media/Soldier.png
+- examples/media/Space.png
+- examples/media/Star.png
+- examples/media/Starfighter.bmp
 - GosuImpl/Async.cpp
 - GosuImpl/Audio/ALChannelManagement.hpp
 - GosuImpl/Audio/AudioFile.hpp
@@ -157,6 +157,7 @@ files:
 - GosuImpl/TextInputMac.mm
 - GosuImpl/TextInputWin.cpp
 - GosuImpl/TextInputX.cpp
+- GosuImpl/TimingApple.cpp
 - GosuImpl/TimingUnix.cpp
 - GosuImpl/TimingWin.cpp
 - GosuImpl/Utility.cpp
@@ -199,16 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- g++
-- pkg-config
-- libgl
-- X11 includes and libraries
-- pangoft2
-- SDL_mixer
-- |-
-  (Packages for Debian/Ubuntu:
-   g++ pkg-config ruby-dev xorg-dev libsdl-mixer1.2-dev libgl1-mesa-dev libpango1.0-dev
-  )
+- See http://code.google.com/p/gosu/wiki/GettingStartedOnLinux
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: