gosu 0.7.41-x86-mingw32 → 0.7.43-x86-mingw32

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2004-2011 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2004-2012 Julian Raschke, Jan Lücker and all contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/Gosu/ButtonsX.hpp

@@ -67,8 +67,8 @@ namespace Gosu
         kbRightControl = XK_Control_R,
         kbLeftAlt = XK_Alt_L,
         kbRightAlt = XK_Alt_R,
-        kbLeftMeta = 0, // TODO?!
-        kbRightMeta = 0,
+        kbLeftMeta = XK_Meta_L,
+        kbRightMeta = XK_Meta_R,
         kbBackspace = XK_BackSpace,
         kbLeft = XK_Left,
         kbRight = XK_Right,

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 41
-#define GOSU_VERSION "0.7.41"
+#define GOSU_POINT_VERSION 43
+#define GOSU_VERSION "0.7.43"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/examples/GosuZen.rb

@@ -0,0 +1,68 @@
+# Gosu Zen example based on erisdiscord's comment here:
+# https://github.com/jlnr/gosu/pull/120
+
+# Gosu Zen is the (inline) Sinatra of Ruby multimedia programming.
+# The interface is still in flux. If you want to tune the interface
+# a little further or provide more examples, please fork Gosu and
+# send a pull request. Thanks!
+
+require 'rubygems'
+require 'gosu/zen'
+include Gosu::Zen
+
+window 480, 240, :fullscreen => false
+
+button_down Gosu::KbEscape do
+  close
+end
+
+update do
+  t = Gosu.milliseconds / 1000.0
+
+  @radius = [width, height].min * 0.37
+  @angle = t * Math::PI
+
+  a, b =\
+    (Math.cos(t) + 0.5) * 0xff,
+    (Math.sin(t) + 0.5) * 0xff
+
+  c = (a + b) / 2
+
+  @colors = [
+    Gosu::Color.rgb(a, b, 0xff),
+    Gosu::Color.rgb(a, 0x00, b),
+    Gosu::Color.rgb(0xff, b, a),
+    Gosu::Color.rgb(b, a, 0x00),
+    Gosu::Color.rgb(b, 0xff, a),
+    Gosu::Color.rgb(0x00, a, b) ]
+
+  @background = Gosu::Color.rgb(c, c, c)
+end
+
+draw do
+  draw_quad\
+    0,     0,      @background,
+    0,     height, @background,
+    width, height, @background,
+    width, 0,      @background, 0
+
+  translate width / 2, height / 2 do
+    @colors.each.with_index do |color, i|
+
+      angle = @angle + i.to_f / @colors.length * 2.0 * Math::PI
+      x = @radius * Math.sin(angle)
+      y = @radius * Math.cos(angle)
+      w, h = x, y
+
+      translate x, y do
+        rotate Gosu.radians_to_degrees(angle) do
+          draw_quad\
+            -w, +h, color,
+            -w, -h, color,
+            +w, -h, color,
+            +w, +h, color, 0
+        end
+      end
+    end
+  end
+end

data/lib/gosu/preview.rb

@@ -85,37 +85,55 @@ module Gosu
     end
   end
   
+  def self.button_down? id
+    $window.button_down? id
+  end
+  
+  def self.mouse_x
+    $window.mouse_x
+  end
+  
+  def self.mouse_y
+    $window.mouse_y
+  end
+  
+  def self.draw_line *args
+    $window.draw_line *args
+  end
+  
+  def self.draw_triangle *args
+    $window.draw_triangle *args
+  end
+  
   def self.draw_quad *args
     $window.draw_quad *args
   end
   
-  def self.clip_to *args
-    $window.clip_to *args do
-      yield
-    end
+  def self.clip_to *args, &draw
+    $window.clip_to *args, &draw
   end
   
-  def self.translate *args
-    $window.translate *args do
-      yield
-    end
+  def self.translate *args, &draw
+    $window.translate *args, &draw
   end
   
-  def self.scale *args
-    $window.scale *args do
-      yield
-    end
+  def self.scale *args, &draw
+    $window.scale *args, &draw
   end
   
-  def self.rotate *args
-    $window.rotate *args do
-      yield
-    end
+  def self.rotate *args, &draw
+    $window.rotate *args, &draw
   end
   
-  def self.transform *args
-    $window.transform *args do
-      yield
-    end
+  def self.transform *args, &draw
+    $window.transform *args, &draw
+  end
+  
+  def self.record width, height, &draw
+    $window.record width, height, &draw
+  end
+  
+  def self.gl *args, &draw
+    $window.gl *args, &draw
   end
 end

data/lib/gosu/swig_patches.rb

@@ -10,8 +10,8 @@ class Gosu::Window
      lose_focus button_down button_up).each do |callback|
     define_method "protected_#{callback}" do |*args|
       begin
-        # Turn into a boolean result for needs_cursor? etc while we are at it.
         # If there has been an exception, don't do anything as to not make matters worse.
+        # Conveniently turn the return value into a boolean result (for needs_cursor? etc).
         defined?(@_exception) ? false : !!send(callback, *args)
       rescue Exception => e
         # Exit the message loop naturally, then re-throw
@@ -21,6 +21,17 @@ class Gosu::Window
     end
   end
   
+  def protected_draw_2
+    protected_draw
+    $gosu_gl_blocks = nil
+  end
+  
+  def gl(*args, &block)
+    $gosu_blocks ||= []
+    $gosu_blocks << block
+    unsafe_gl(*args, &block)
+  end
+  
   alias show_internal show
   def show
     show_internal

data/lib/gosu/zen.rb

@@ -1,28 +1,77 @@
-require 'gosu'
-require 'singleton'
+require 'gosu/preview'
 
 module Gosu
+  module Zen
+    
+    @@window_args = [800, 600, {}]
+    @@options = {}
+    
+    def window width, height, options = nil
+      if $window.nil?
+        @@window_args[0] = width
+        @@window_args[1] = height
+        @@window_args[2].merge! options if options
+      else
+        raise "window size can only be set before the window is created"
+      end
+    end
+    
+    def set what, value
+      if $window.nil?
+        @@options[what.to_sym] = value
+      else
+        $window.send "#{what}=", value
+      end
+    end
+    
+    def button_down id = nil, &body
+      m = id ? "button_down_#{id}" : :button_down_other
+      ZenWindow.send :define_method, m, &body
+    end
+    
+    def button_up id = nil, &body
+      m = id ? "button_up_#{id}" : :button_up_other
+      ZenWindow.send :define_method, m, &body
+    end
+    
+    def update &body
+      ZenWindow.send :define_method, :update, &body
+    end
+    
+    def draw &body
+      ZenWindow.send :define_method, :draw, &body
+    end
+    
+    def run!
+      window = ZenWindow.new *@@window_args
+      @@options.each do |opt, value|
+        window.send "#{opt}=", value
+      end
+      window.show
+    end
+    
+    def Zen.included mod
+      at_exit { run! unless $! }
+    end
+    
+  end
+  
   class ZenWindow < Window
-    include Singleton
+    def button_down id
+      m = :"button_down_#{id}"
+      respond_to?(m) ? send(m) : button_down_other(id)
+    end
+    
+    def button_up id
+      m = :"button_up_#{id}"
+      respond_to?(m) ? send(m) : button_up_other(id)
+    end
+    
+    def button_down_other id
+    end
     
-    def initialize
-      super 800, 600, false
+    def button_up_other id
     end
+    
   end
 end
-
-def set what, value
-  Gosu::ZenWindow.instance.send "#{what}=", value
-end
-
-def update(&proc)
-  Gosu::ZenWindow.send :define_method, :update, proc
-end
-
-# WIP - needs all other callbacks, even with arguments
-
-# WIP - needs to be compatible with gosu/preview.rb later
-
-at_exit do
-  Gosu::ZenWindow.instance.show
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 85
   prerelease: 
   segments: 
   - 0
   - 7
-  - 41
-  version: 0.7.41
+  - 43
+  version: 0.7.43
 platform: x86-mingw32
 authors: 
 - Julian Raschke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-17 00:00:00 Z
+date: 2012-03-18 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
@@ -68,6 +68,7 @@ files:
 - lib/gosu.rb
 - examples/ChipmunkIntegration.rb
 - examples/CptnRuby.rb
+- examples/GosuZen.rb
 - examples/MoreChipmunkAndRMagick.rb
 - examples/OpenGLIntegration.rb
 - examples/RMagickIntegration.rb
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: 2D game development library.