gosu 0.8.0.pre3 → 0.8.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3b8c63fdb8bac539845da6a18d8f2313d9ba12
-  data.tar.gz: 65173f1f5bd56bbc78fa4f45c5aaff46fab385a0
+  metadata.gz: 9671065f952ce2b0c1c21c05764bf32e21413839
+  data.tar.gz: 6bdab075165e4ee1a8d02c82c15d0d9a7bbcd2ac
 SHA512:
-  metadata.gz: 33b65ff860f1c76c3256299c7639643e631d2e7afafa3646ed8b6466ecd52d0d028c22eca974ef43ec2e64994996166e299bda930f81602920432571e28681fe
-  data.tar.gz: 6fe10cb8bba4769f3f6287ad12a30ec5af6503c37d34c016118ec54f7f345139984adf6c60d8adfbfa012c313524f1479aadfa184442bc8e6ac2e88ba8740f8b
+  metadata.gz: be621974356bc5a746bafeb2cc4da576a3cc157599fc18d6b6b47a4bb9bb39fbeff4502a4cb4b7f884441e3951b91f6d3cccb95a08a1ebcc48cc31a1b4ea2f6e
+  data.tar.gz: 71f034d78c7cf1b5b57d5486b856ff33c69ebfcd05dfd29d9007756d52793fe1a75ac3c324fc5e89614f34d2c3eba67d7f18a4bd82040f3bc3499e4c2d7881b2

data/Gosu/Buttons.hpp

@@ -36,16 +36,16 @@ namespace Gosu
         kbF10 = 67,
         kbF11 = 68,
         kbF12 = 69,
-        kb0 = 30,
-        kb1 = 31,
-        kb2 = 32,
-        kb3 = 33,
-        kb4 = 34,
-        kb5 = 35,
-        kb6 = 36,
-        kb7 = 37,
-        kb8 = 38,
-        kb9 = 39,
+        kb0 = 39,
+        kb1 = 30,
+        kb2 = 31,
+        kb3 = 32,
+        kb4 = 33,
+        kb5 = 34,
+        kb6 = 35,
+        kb7 = 36,
+        kb8 = 37,
+        kb9 = 38,
         kbTab = 43,
         kbReturn = 40,
         kbSpace = 44,
@@ -106,6 +106,8 @@ namespace Gosu
         kbX = 27,
         kbY = 28,
         kbZ = 29,
+        // ` on US/UK Mac, < on EU Mac, \ in US/UK Windows
+        kbISO = 100,
         kbNumpad0 = 98,
         kbNumpad1 = 89,
         kbNumpad2 = 90,
@@ -124,8 +126,8 @@ namespace Gosu
 
         msRangeBegin,
         msLeft = msRangeBegin,
-        msRight,
         msMiddle,
+        msRight,
         msWheelUp,
         msWheelDown,
         msOther0,

data/{linux → ext/gosu}/extconf.rb

@@ -2,84 +2,71 @@
 
 WINDOWS_HINTS = %w(-win32 win32- mswin mingw32)
 
-if defined? RUBY_PLATFORM and WINDOWS_HINTS.any? { |hint| RUBY_PLATFORM.include? hint } then
+if RUBY_PLATFORM =~ /mswin|mingw32|mingw64|win32\-|\-win32/ then
   puts 'This gem is not meant to be installed on Windows. Instead, please use:'
   puts 'gem install gosu --platform=i386-mingw32'
   exit 1
 end
 
-puts 'The Gosu gem requires some libraries to be installed system-wide.'
-puts 'See the following site for a list:'
-puts 'https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux'
-puts
+if `uname`.chomp != "Darwin" then
+  puts 'The Gosu gem requires some libraries to be installed system-wide.'
+  puts 'See the following site for a list:'
+  puts 'https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux'
+  puts
+end
 
 BASE_FILES = %w(
+  Bitmap/Bitmap.cpp
+  Bitmap/BitmapColorKey.cpp
+  Bitmap/BitmapUtils.cpp
   DirectoriesUnix.cpp
   FileUnix.cpp
-  Graphics/Bitmap.cpp
-  Graphics/BitmapColorKey.cpp
-  Graphics/BitmapUtils.cpp
   Graphics/BlockAllocator.cpp
   Graphics/Color.cpp
-  Graphics/Font.cpp
   Graphics/Graphics.cpp
   Graphics/Image.cpp
   Graphics/LargeImageData.cpp
   Graphics/TexChunk.cpp
-  Graphics/Text.cpp
   Graphics/Texture.cpp
   Graphics/Transform.cpp
-  Input.cpp
+  Input/Input.cpp
+  Input/TextInput.cpp
   Inspection.cpp
   IO.cpp
   Math.cpp
-  RubyGosu_wrap.cxx
+  Text/Font.cpp
+  Text/Text.cpp
   Utility.cpp
-  TextInput.cpp
   Window.cpp
 )
 
 MAC_FILES = %w(
   Audio/AudioOpenAL.mm
-  Graphics/BitmapApple.mm
-  Graphics/TextMac.cpp
-  Graphics/TextTouch.mm
+  Bitmap/BitmapApple.mm
+  Text/TextApple.mm
+  Text/TextMac.cpp
   TimingApple.cpp
   UtilityApple.mm
 )
 
 LINUX_FILES = %w(
   Audio/AudioOpenAL.cpp
-  Graphics/BitmapFreeImage.cpp
-  Graphics/TextUnix.cpp
+  Bitmap/BitmapFreeImage.cpp
+  Text/TextUnix.cpp
   TimingUnix.cpp
 )
 
-OGG_VORBIS_FILES = Dir['../dependencies/libogg/src/*.c'] +
-                   Dir['../dependencies/libvorbis/lib/vorbisfile.c'] +
-                   %w(analysis bitrate block codebook envelope floor0 floor1
-                      info lookup lpc lsp mapping0 mdct psy registry res0
-                      sharedbook smallft synthesis window).map do |basename|
-                     "../dependencies/libvorbis/lib/#{basename}.c"
-                   end
-
 require 'mkmf'
 require 'fileutils'
 
 # Silence internal deprecation warnings in Gosu
 $CFLAGS << " -DGOSU_DEPRECATED="
 
-$INCFLAGS << " -I../ -I../GosuImpl"
+$INCFLAGS << " -I../.. -I../../src"
 
 if `uname`.chomp == 'Darwin' then
-  SOURCE_FILES = BASE_FILES + MAC_FILES + OGG_VORBIS_FILES
+  SOURCE_FILES = BASE_FILES + MAC_FILES
   
-  # Apple curiously distributes libpng only inside X11
-  $INCFLAGS  << " -I/usr/X11/include"
-  # Use included libogg, libvorbis to make Gosu easier to install on OS X
-  $INCFLAGS  << " -I../dependencies/libogg/include"
-  $INCFLAGS  << " -I../dependencies/libvorbis/include"
-  $INCFLAGS  << " -I../dependencies/libvorbis/lib"
   # To make everything work with the Objective C runtime
   $CFLAGS    << " -x objective-c -DNDEBUG"
   # Compile all C++ files as Objective C++ on OS X since mkmf does not support .mm
@@ -93,25 +80,23 @@ if `uname`.chomp == 'Darwin' then
     # TODO: This can probably be enabled starting from 10.6?
     CONFIG['CXXFLAGS'] << " -std=gnu++11"
   end
-  $LDFLAGS   << " -L/usr/X11/lib -liconv -lSDL2"
+  $LDFLAGS   << " -liconv -lSDL2 -logg -lvorbis -lvorbisfile"
   %w(AudioToolbox IOKit OpenAL OpenGL AppKit ApplicationServices Foundation Carbon).each do |f|
     $LDFLAGS << " -framework #{f}"
   end
 else
   SOURCE_FILES = BASE_FILES + LINUX_FILES
 
-  pkg_config 'sdl2'
-
-  if /Raspbian/ =~ `cat /etc/issue` then
+  if /Raspbian/ =~ `cat /etc/issue` or /BCM2708/ =~ `cat /proc/cpuinfo` then
     $INCFLAGS << " -I/opt/vc/include/GLES"
     $INCFLAGS << " -I/opt/vc/include"
-    $CFLAGS   << " -DGOSU_IS_RASPBERRY_PI"
     $LDFLAGS  << " -L/opt/vc/lib"
     $LDFLAGS  << " -lGLESv1_CM"
   else
     pkg_config 'gl'
   end
 
+  pkg_config 'sdl2'
   pkg_config 'pangoft2'
   pkg_config 'vorbisfile'
   pkg_config 'openal'
@@ -122,13 +107,6 @@ else
   have_header 'AL/al.h'     if have_library('openal')
 end
 
-# Symlink our pretty gosu.so into ../lib
-# TODO gosu.rb should just look in the right place.
-unless File.exist? "../lib/gosu.#{RbConfig::CONFIG['DLEXT']}"
-  FileUtils.ln_s "../linux/gosu.#{RbConfig::CONFIG['DLEXT']}",
-                 "../lib/gosu.#{RbConfig::CONFIG['DLEXT']}"
-end
-
 # And now it gets ridiculous (or I am overcomplicating things...):
 # mkmf will compile all .c/.cpp files in this directory, but if they are nested
 # inside folders, it will not find the resulting .o files during linking.
@@ -139,7 +117,7 @@ end
 SOURCE_FILES.each do |file|
   shim_name = file.gsub('/', '-').sub(/\.mm$/, '.cpp')
   File.open(shim_name, "w") do |shim|
-    shim.puts "#include \"../GosuImpl/#{file}\""
+    shim.puts "#include \"../../src/#{file}\""
   end
 end
 

data/{GosuImpl/RubyGosu_wrap.cxx → ext/gosu/gosu_wrap.cxx}

@@ -2848,7 +2848,7 @@ SWIGINTERN void Gosu_Window_translate(Gosu::Window *self,double x,double y){
  * C++ director class methods
  * --------------------------------------------------- */
 
-#include "RubyGosu_wrap.h"
+#include "gosu_wrap.h"
 
 SwigDirector_TextInput::SwigDirector_TextInput(VALUE self): Gosu::TextInput(), Swig::Director(self) {
   
@@ -11073,6 +11073,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "KbX", SWIG_From_int(static_cast< int >(Gosu::kbX)));
   rb_define_const(mGosu, "KbY", SWIG_From_int(static_cast< int >(Gosu::kbY)));
   rb_define_const(mGosu, "KbZ", SWIG_From_int(static_cast< int >(Gosu::kbZ)));
+  rb_define_const(mGosu, "KbISO", SWIG_From_int(static_cast< int >(Gosu::kbISO)));
   rb_define_const(mGosu, "KbNumpad0", SWIG_From_int(static_cast< int >(Gosu::kbNumpad0)));
   rb_define_const(mGosu, "KbNumpad1", SWIG_From_int(static_cast< int >(Gosu::kbNumpad1)));
   rb_define_const(mGosu, "KbNumpad2", SWIG_From_int(static_cast< int >(Gosu::kbNumpad2)));
@@ -11088,8 +11089,8 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "KbNumpadMultiply", SWIG_From_int(static_cast< int >(Gosu::kbNumpadMultiply)));
   rb_define_const(mGosu, "KbNumpadDivide", SWIG_From_int(static_cast< int >(Gosu::kbNumpadDivide)));
   rb_define_const(mGosu, "MsLeft", SWIG_From_int(static_cast< int >(Gosu::msLeft)));
-  rb_define_const(mGosu, "MsRight", SWIG_From_int(static_cast< int >(Gosu::msRight)));
   rb_define_const(mGosu, "MsMiddle", SWIG_From_int(static_cast< int >(Gosu::msMiddle)));
+  rb_define_const(mGosu, "MsRight", SWIG_From_int(static_cast< int >(Gosu::msRight)));
   rb_define_const(mGosu, "MsWheelUp", SWIG_From_int(static_cast< int >(Gosu::msWheelUp)));
   rb_define_const(mGosu, "MsWheelDown", SWIG_From_int(static_cast< int >(Gosu::msWheelDown)));
   rb_define_const(mGosu, "MsOther0", SWIG_From_int(static_cast< int >(Gosu::msOther0)));

data/lib/gosu.rb

@@ -1,16 +1,15 @@
 require 'rbconfig'
 
-if defined? RUBY_PLATFORM and
-    %w(-win32 win32- mswin mingw32).any? { |s| RUBY_PLATFORM.include? s } then
+if RUBY_PLATFORM =~ /mswin|mingw32|mingw64|win32\-|\-win32/ then
+  # Add this gem to the PATH on Windows so that DLLs can be found
   ENV['PATH'] = "#{File.dirname(__FILE__)};#{ENV['PATH']}"
 end
 
-if File.exist? "#{File.dirname(__FILE__)}/gosu.#{RbConfig::CONFIG['DLEXT']}"
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/gosu.#{RbConfig::CONFIG['DLEXT']}"
+rescue LoadError
   require "gosu.#{RbConfig::CONFIG['DLEXT']}"
-elsif defined? RUBY_VERSION and RUBY_VERSION >= '1.9' then
-  require "gosu.for_1_9.#{RbConfig::CONFIG['DLEXT']}"
-else
-  require "gosu.for_1_8.#{RbConfig::CONFIG['DLEXT']}"
 end
 
 require "gosu/swig_patches"

data/lib/gosu/zen.rb

@@ -24,6 +24,10 @@ module Gosu
       end
     end
     
+    def init &body
+      ZenWindow.send :define_method, :init, &body
+    end
+    
     def button_down id = nil, &body
       m = id ? "button_down_#{id}" : :button_down_other
       ZenWindow.send :define_method, m, &body
@@ -57,6 +61,14 @@ module Gosu
   end
   
   class ZenWindow < Window
+    def initialize *args
+      super
+      init
+    end
+    
+    def init
+    end
+    
     def button_down id
       m = :"button_down_#{id}"
       respond_to?(m) ? send(m) : button_down_other(id)

data/{GosuImpl/Graphics → src/Bitmap}/Bitmap.cpp

@@ -38,6 +38,8 @@ void Gosu::Bitmap::insert(const Bitmap& source, int x, int y)
 void Gosu::Bitmap::insert(const Bitmap& source, int x, int y, unsigned srcX,
     unsigned srcY, unsigned srcWidth, unsigned srcHeight)
 {
+    // TODO: This should use memcpy if possible (x == 0 && srcWidth == this->width())
+    
     if (x < 0)
     {
         unsigned clipLeft = -x;

data/{GosuImpl/Graphics → src/Text}/Font.cpp

@@ -4,7 +4,7 @@
 #include <Gosu/Math.hpp>
 #include <Gosu/Text.hpp>
 #include <Gosu/TR1.hpp>
-#include "Common.hpp"
+#include "../Graphics/Common.hpp"
 #include "FormattedString.hpp"
 #include <cassert>
 #include <map>

data/{GosuImpl/Graphics → src/Text}/Text.cpp

@@ -5,7 +5,7 @@
 #include <Gosu/Math.hpp>
 #include <Gosu/TR1.hpp>
 #include <Gosu/Utility.hpp>
-#include "Common.hpp"
+#include "../Graphics/Common.hpp"
 #include "FormattedString.hpp"
 #include <cassert>
 #include <cmath>

data/{GosuImpl/Graphics → src/Text}/TextMac.cpp

@@ -8,7 +8,7 @@
 #include <Gosu/Math.hpp>
 #include <Gosu/Utility.hpp>
 #include <Gosu/IO.hpp>
-#include <GosuImpl/MacUtility.hpp>
+#include "../MacUtility.hpp"
 #include <cmath>
 #include <stdexcept>
 #include <map>