gosu 0.7.26.1 → 0.7.27

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2230,6 +2230,7 @@ static VALUE mGosu;
 #include <Gosu/Graphics.hpp>
 #include <Gosu/Image.hpp>
 #include <Gosu/ImageData.hpp>
+#include <Gosu/Inspection.hpp>
 #include <Gosu/Input.hpp>
 #include <Gosu/IO.hpp>
 #include <Gosu/Math.hpp>
@@ -7332,6 +7333,28 @@ free_Gosu_Image(Gosu::Image *arg1) {
     delete arg1;
 }
 
+SWIGINTERN VALUE
+_wrap_fps(int argc, VALUE *argv, VALUE self) {
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (int)Gosu::fps();
+    } catch(const std::runtime_error& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 swig_class SwigClassSampleInstance;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -10958,8 +10981,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 >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(26)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.26.1"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(27)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.27"));
   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);
@@ -11082,6 +11105,7 @@ SWIGEXPORT void Init_gosu(void) {
   SwigClassImage.mark = 0;
   SwigClassImage.destroy = (void (*)(void *)) free_Gosu_Image;
   SwigClassImage.trackObjects = 1;
+  rb_define_module_function(mGosu, "fps", VALUEFUNC(_wrap_fps), -1);
   
   SwigClassSampleInstance.klass = rb_define_class_under(mGosu, "SampleInstance", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_Gosu__SampleInstance, (void *) &SwigClassSampleInstance);
@@ -11113,8 +11137,6 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_TypeClientData(SWIGTYPE_p_Gosu__Song, (void *) &SwigClassSong);
   rb_define_alloc_func(SwigClassSong.klass, _wrap_Song_allocate);
   rb_define_method(SwigClassSong.klass, "initialize", VALUEFUNC(_wrap_new_Song), -1);
-  rb_define_const(SwigClassSong.klass, "StStream", SWIG_From_int(static_cast< int >(Gosu::Song::stStream)));
-  rb_define_const(SwigClassSong.klass, "StModule", SWIG_From_int(static_cast< int >(Gosu::Song::stModule)));
   rb_define_singleton_method(SwigClassSong.klass, "current_song", VALUEFUNC(_wrap_Song_current_song), -1);
   rb_define_method(SwigClassSong.klass, "play", VALUEFUNC(_wrap_Song_play), -1);
   rb_define_method(SwigClassSong.klass, "pause", VALUEFUNC(_wrap_Song_pause), -1);

data/GosuImpl/WindowMac.mm

@@ -13,7 +13,13 @@
 #import <boost/bind.hpp>
 #import <vector>
 
-namespace Gosu {
+namespace Gosu
+{
+    namespace FPS
+    {
+        void registerFrame();
+    }
+    
     NSRect screenRect = [[[NSScreen screens] objectAtIndex: 0] frame];
     
     unsigned screenWidth()
@@ -506,9 +512,9 @@ void Gosu::Window::Impl::doTick(Window& window)
     window.input().update();
     window.update();
 
-    if (window.needsRedraw() and
-        window.graphics().begin())
+    if (window.needsRedraw() and window.graphics().begin())
     {
+        FPS::registerFrame();
         window.draw();
         window.graphics().end();
         [window.pimpl->context.obj() flushBuffer];

data/GosuImpl/WindowTouch.mm

@@ -10,7 +10,8 @@
 #import <UIKit/UIKit.h>
 #import <OpenGLES/EAGL.h>
 
-namespace Gosu {
+namespace Gosu
+{
     CGRect screenRect = [[UIScreen mainScreen] bounds];
     
     unsigned screenWidth()

data/GosuImpl/WindowWin.cpp

@@ -19,7 +19,10 @@
 
 namespace Gosu
 {
-    HWND __Gosu_HWND_for_FMOD = 0;
+    namespace FPS
+    {
+        void registerFrame();
+    }
 
     unsigned screenWidth()
     {
@@ -217,7 +220,6 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
         CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0,
         Win::instance(), 0);
     Win::check(pimpl->handle);
-    __Gosu_HWND_for_FMOD = pimpl->handle;
 
 	pimpl->hdc = GetDC(handle());
     Win::check(pimpl->hdc);
@@ -293,7 +295,6 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
 Gosu::Window::~Window()
 {
     wglMakeCurrent(0, 0);
-    __Gosu_HWND_for_FMOD = 0;
 }
 
 std::wstring Gosu::Window::caption() const
@@ -363,7 +364,10 @@ void Gosu::Window::show()
 					SendMessage(handle(), WM_SETCURSOR, reinterpret_cast<WPARAM>(handle()), HTCLIENT);
 			    update();
                 if (needsRedraw())
+                {
       				::InvalidateRect(handle(), 0, FALSE);
+                    FPS::registerFrame();
+                }
 				// There probably should be a proper "oncePerTick" handler
 				// system in the future. Right now, this is necessary to give
 				// timeslices to Ruby's green threads in Ruby/Gosu.

data/GosuImpl/WindowX.cpp

@@ -61,6 +61,11 @@ namespace
 
 namespace Gosu
 {
+    namespace FPS
+    {
+        void registerFrame();
+    }
+
     unsigned screenWidth()
     {
         scoped_resource<Display> display(XOpenDisplay(NULL), XCloseDisplay);
@@ -169,6 +174,7 @@ struct Gosu::Window::Impl
 
         if (window->needsRedraw() && window->graphics().begin(Colors::black))
         {
+            FPS::registerFrame();
             window->draw();
             window->graphics().end();
             glXSwapBuffers(display, this->window);

data/linux/extconf.rb

@@ -17,12 +17,12 @@ SOURCE_FILES =
     %w(Math.cpp Utility.cpp IO.cpp FileUnix.cpp InputX.cpp TextInputX.cpp TimingUnix.cpp WindowX.cpp
 	     Graphics/Bitmap.cpp Graphics/BitmapUtils.cpp Graphics/Color.cpp
 	     Graphics/TexChunk.cpp Graphics/Graphics.cpp Graphics/Image.cpp
-	     Graphics/BlockAllocator.cpp
+	     Graphics/BlockAllocator.cpp Inspection.cpp
 	     Graphics/Texture.cpp Graphics/LargeImageData.cpp
 	     Graphics/BitmapPNG.cpp Graphics/Font.cpp Graphics/BitmapBMP.cpp
 	     Graphics/TextUnix.cpp Graphics/Text.cpp Graphics/Transform.cpp
 	     Graphics/BitmapColorKey.cpp DirectoriesUnix.cpp
-	     Audio/AudioSDL.cpp RubyGosu_wrap.cxx)
+	     Audio/AudioAudiere.cpp RubyGosu_wrap.cxx)
 
 require 'mkmf'
 
@@ -35,11 +35,11 @@ SOURCE_FILES.each { |file| `cp ../GosuImpl/#{file} #{File.basename(file)}` }
 `ln -s ../linux/gosu.so ../lib/gosu.so`
 
 sdl_config = with_config("sdl-config", "sdl-config")
+audiere_config = with_config("audiere-config", "audiere-config")
 pango_config = "pkg-config pangoft2" # FIXME should probably use with_config
 
-$INCFLAGS << " -I../ -I../GosuImpl `#{sdl_config} --cflags` `#{pango_config} --cflags`"
-$LDFLAGS << " `#{sdl_config} --libs` `#{pango_config} --libs` -lX11"
-have_header('SDL_mixer.h') if have_library('SDL_mixer', 'Mix_OpenAudio')
+$INCFLAGS << " -I../ -I../GosuImpl `#{sdl_config} --cflags` `#{audiere_config} --cxxflags` `#{pango_config} --cflags`"
+$LDFLAGS << " `#{sdl_config} --libs` `#{audiere_config} --libs` `#{pango_config} --libs` -lX11"
 have_header('SDL_ttf.h') if have_library('SDL_ttf', 'TTF_RenderUTF8_Blended')
 have_header('gl.h') if have_library('GL', 'glMatrixMode')
 have_header('png.h') if have_library('png', 'png_sig_cmp')

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 53
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 26
-  - 1
-  version: 0.7.26.1
+  - 27
+  version: 0.7.27
 platform: ruby
 authors: 
 - Julian Raschke
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +08:00
+date: 2011-01-29 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -49,6 +48,7 @@ files:
 - Gosu/Image.hpp
 - Gosu/ImageData.hpp
 - Gosu/Input.hpp
+- Gosu/Inspection.hpp
 - Gosu/IO.hpp
 - Gosu/Math.hpp
 - Gosu/Platform.hpp
@@ -87,12 +87,12 @@ files:
 - examples/media/Starfighter.bmp
 - GosuImpl/Async.cpp
 - GosuImpl/Audio/ALChannelManagement.hpp
+- GosuImpl/Audio/AudioAudiere.cpp
 - GosuImpl/Audio/AudioFile.hpp
 - GosuImpl/Audio/AudioOpenAL.mm
 - GosuImpl/Audio/AudioSDL.cpp
 - GosuImpl/Audio/AudioToolboxFile.hpp
 - GosuImpl/Audio/OggFile.hpp
-- GosuImpl/AudioFmod.cpp
 - GosuImpl/DirectoriesMac.mm
 - GosuImpl/DirectoriesTouch.mm
 - GosuImpl/DirectoriesUnix.cpp
@@ -139,6 +139,7 @@ files:
 - GosuImpl/InputTouch.mm
 - GosuImpl/InputWin.cpp
 - GosuImpl/InputX.cpp
+- GosuImpl/Inspection.cpp
 - GosuImpl/IO.cpp
 - GosuImpl/MacUtility.hpp
 - GosuImpl/Math.cpp
@@ -203,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - See http://code.google.com/p/gosu/wiki/GettingStartedOnLinux
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: 2D game development library.