ruby2d 0.9.4 → 0.11.1

data/lib/ruby2d/window.rb

@@ -4,22 +4,20 @@
 
 module Ruby2D
   class Window
+    @@open_window = false
 
     # Event structures
-    EventDescriptor = Struct.new(:type, :id)
-    MouseEvent = Struct.new(:type, :button, :direction, :x, :y, :delta_x, :delta_y)
-    KeyEvent   = Struct.new(:type, :key)
+    EventDescriptor       = Struct.new(:type, :id)
+    MouseEvent            = Struct.new(:type, :button, :direction, :x, :y, :delta_x, :delta_y)
+    KeyEvent              = Struct.new(:type, :key)
     ControllerEvent       = Struct.new(:which, :type, :axis, :value, :button)
     ControllerAxisEvent   = Struct.new(:which, :axis, :value)
     ControllerButtonEvent = Struct.new(:which, :button)
 
     def initialize(args = {})
 
-      # This window instance, stored so it can be called by the class methods
-      @@window = self
-
       # Title of the window
-      @title = args[:title]  || "Ruby 2D"
+      @title = args[:title] || "Ruby 2D"
 
       # Window background color
       @background = Color.new([0.0, 0.0, 0.0, 1.0])
@@ -51,14 +49,39 @@ module Ruby2D
       # Vertical synchronization, set to prevent screen tearing (recommended)
       @vsync = args[:vsync] || true
 
+      # Renderable objects currently in the window, like a linear scene graph
+      @objects = []
+
+      # Entities currently in the window
+      @entities = []
+
       # Mouse X and Y position in the window
       @mouse_x, @mouse_y = 0, 0
 
       # Controller axis and button mappings file
       @controller_mappings = File.expand_path('~') + "/.ruby2d/controllers.txt"
 
-      # Renderable objects currently in the window, like a linear scene graph
-      @objects = []
+      # Event stores for class pattern
+      @keys_down = []
+      @keys_held = []
+      @keys_up   = []
+      @mouse_buttons_down = []
+      @mouse_buttons_up   = []
+      @mouse_scroll_event     = false
+      @mouse_scroll_direction = nil
+      @mouse_scroll_delta_x   = 0
+      @mouse_scroll_delta_y   = 0
+      @mouse_move_event   = false
+      @mouse_move_delta_x = 0
+      @mouse_move_delta_y = 0
+      @controller_id = nil
+      @controller_axes_moved   = []
+      @controller_axis_left_x  = 0
+      @controller_axis_left_y  = 0
+      @controller_axis_right_x = 0
+      @controller_axis_right_y = 0
+      @controller_buttons_down = []
+      @controller_buttons_up   = []
 
       # Unique ID for the input event being registered
       @event_key = 0
@@ -83,6 +106,12 @@ module Ruby2D
       # The window update block
       @update_proc = Proc.new {}
 
+      # The window render block
+      @render_proc = Proc.new {}
+
+      # Detect if window is being used through the DSL or as a class instance
+      @using_dsl = !(method(:update).parameters.empty? || method(:render).parameters.empty?)
+
       # Whether diagnostic messages should be printed
       @diagnostics = false
 
@@ -118,43 +147,53 @@ module Ruby2D
       def screenshot(opts = nil); get(:screenshot, opts) end
 
       def get(sym, opts = nil)
-        @@window.get(sym, opts)
+        DSL.window.get(sym, opts)
       end
 
       def set(opts)
-        @@window.set(opts)
+        DSL.window.set(opts)
       end
 
       def on(event, &proc)
-        @@window.on(event, &proc)
+        DSL.window.on(event, &proc)
       end
 
       def off(event_descriptor)
-        @@window.off(event_descriptor)
+        DSL.window.off(event_descriptor)
       end
 
       def add(o)
-        @@window.add(o)
+        DSL.window.add(o)
       end
 
       def remove(o)
-        @@window.remove(o)
+        DSL.window.remove(o)
       end
 
       def clear
-        @@window.clear
+        DSL.window.clear
       end
 
       def update(&proc)
-        @@window.update(&proc)
+        DSL.window.update(&proc)
+      end
+
+      def render(&proc)
+        DSL.window.render(&proc)
       end
 
       def show
-        @@window.show
+        DSL.window.show
       end
 
       def close
-        @@window.close
+        DSL.window.close
+      end
+
+      def render_ready_check
+        unless @@open_window
+          raise Error, "Attempting to draw before the window is ready. Please put calls to draw() inside of a render block."
+        end
       end
     end
 
@@ -219,6 +258,8 @@ module Ruby2D
       case o
       when nil
         raise Error, "Cannot add '#{o.class}' to window!"
+      when Entity
+        @entities.push(o)
       when Array
         o.each { |x| add_object(x) }
       else
@@ -232,8 +273,9 @@ module Ruby2D
         raise Error, "Cannot remove '#{o.class}' from window!"
       end
 
-      if i = @objects.index(o)
-        @objects.delete_at(i)
+      collection = o.class.ancestors.include?(Ruby2D::Entity) ? @entities : @objects
+      if i = collection.index(o)
+        collection.delete_at(i)
         true
       else
         false
@@ -243,14 +285,21 @@ module Ruby2D
     # Clear all objects from the window
     def clear
       @objects.clear
+      @entities.clear
     end
 
-    # Set an update callback
+    # Set the update callback
     def update(&proc)
       @update_proc = proc
       true
     end
 
+    # Set the render callback
+    def render(&proc)
+      @render_proc = proc
+      true
+    end
+
     # Generate a new event key (ID)
     def new_event_key
       @event_key = @event_key.next
@@ -271,6 +320,21 @@ module Ruby2D
       @events[event_descriptor.type].delete(event_descriptor.id)
     end
 
+    # Key down event method for class pattern
+    def key_down(key)
+      @keys_down.include? key
+    end
+
+    # Key held event method for class pattern
+    def key_held(key)
+      @keys_held.include? key
+    end
+
+    # Key up event method for class pattern
+    def key_up(key)
+      @keys_up.include? key
+    end
+
     # Key callback method, called by the native and web extentions
     def key_callback(type, key)
       key = key.downcase
@@ -283,22 +347,66 @@ module Ruby2D
       case type
       # When key is pressed, fired once
       when :down
+        # For class pattern
+        unless @using_dsl
+          unless @keys_down.include? key
+            @keys_down << key
+          end
+        end
+
+        # Call event handler
         @events[:key_down].each do |id, e|
           e.call(KeyEvent.new(type, key))
         end
       # When key is being held down, fired every frame
       when :held
+        # For class pattern
+        unless @using_dsl
+          unless @keys_held.include? key
+            @keys_held << key
+          end
+        end
+
+        # Call event handler
         @events[:key_held].each do |id, e|
           e.call(KeyEvent.new(type, key))
         end
       # When key released, fired once
       when :up
+        # For class pattern
+        unless @using_dsl
+          unless @keys_up.include? key
+            @keys_up << key
+          end
+        end
+
+        # Call event handler
         @events[:key_up].each do |id, e|
           e.call(KeyEvent.new(type, key))
         end
       end
     end
 
+    # Mouse down event method for class pattern
+    def mouse_down(btn)
+      @mouse_buttons_down.include? btn
+    end
+
+    # Mouse up event method for class pattern
+    def mouse_up(btn)
+      @mouse_buttons_up.include? btn
+    end
+
+    # Mouse scroll event method for class pattern
+    def mouse_scroll
+      @mouse_scroll_event
+    end
+
+    # Mouse move event method for class pattern
+    def mouse_move
+      @mouse_move_event
+    end
+
     # Mouse callback method, called by the native and web extentions
     def mouse_callback(type, button, direction, x, y, delta_x, delta_y)
       # All mouse events
@@ -309,21 +417,54 @@ module Ruby2D
       case type
       # When mouse button pressed
       when :down
+        # For class pattern
+        unless @using_dsl
+          unless @mouse_buttons_down.include? button
+            @mouse_buttons_down << button
+          end
+        end
+
+        # Call event handler
         @events[:mouse_down].each do |id, e|
           e.call(MouseEvent.new(type, button, nil, x, y, nil, nil))
         end
       # When mouse button released
       when :up
+        # For class pattern
+        unless @using_dsl
+          unless @mouse_buttons_up.include? button
+            @mouse_buttons_up << button
+          end
+        end
+
+        # Call event handler
         @events[:mouse_up].each do |id, e|
           e.call(MouseEvent.new(type, button, nil, x, y, nil, nil))
         end
       # When mouse motion / movement
       when :scroll
+        # For class pattern
+        unless @using_dsl
+          @mouse_scroll_event     = true
+          @mouse_scroll_direction = direction
+          @mouse_scroll_delta_x   = delta_x
+          @mouse_scroll_delta_y   = delta_y
+        end
+
+        # Call event handler
         @events[:mouse_scroll].each do |id, e|
           e.call(MouseEvent.new(type, nil, direction, nil, nil, delta_x, delta_y))
         end
       # When mouse scrolling, wheel or trackpad
       when :move
+        # For class pattern
+        unless @using_dsl
+          @mouse_move_event   = true
+          @mouse_move_delta_x = delta_x
+          @mouse_move_delta_y = delta_y
+        end
+
+        # Call event handler
         @events[:mouse_move].each do |id, e|
           e.call(MouseEvent.new(type, nil, nil, x, y, delta_x, delta_y))
         end
@@ -337,6 +478,21 @@ module Ruby2D
       end
     end
 
+    # Controller axis event method for class pattern
+    def controller_axis(axis)
+      @controller_axes_moved.include? axis
+    end
+
+    # Controller button down event method for class pattern
+    def controller_button_down(btn)
+      @controller_buttons_down.include? btn
+    end
+
+    # Controller button up event method for class pattern
+    def controller_button_up(btn)
+      @controller_buttons_up.include? btn
+    end
+
     # Controller callback method, called by the native and web extentions
     def controller_callback(which, type, axis, value, button)
       # All controller events
@@ -347,16 +503,56 @@ module Ruby2D
       case type
       # When controller axis motion, like analog sticks
       when :axis
+
+        # For class pattern
+        unless @using_dsl
+          @controller_id = which
+
+          unless @controller_axes_moved.include? axis
+            @controller_axes_moved << axis
+          end
+
+          case axis
+          when :left_x
+            @controller_axis_left_x = value
+          when :left_y
+            @controller_axis_left_y = value
+          when :right_x
+            @controller_axis_right_x = value
+          when :right_y
+            @controller_axis_right_y = value
+          end
+        end
+
+        # Call event handler
         @events[:controller_axis].each do |id, e|
           e.call(ControllerAxisEvent.new(which, axis, value))
         end
       # When controller button is pressed
       when :button_down
+        # For class pattern
+        unless @using_dsl
+          @controller_id = which
+          unless @controller_buttons_down.include? button
+            @controller_buttons_down << button
+          end
+        end
+
+        # Call event handler
         @events[:controller_button_down].each do |id, e|
           e.call(ControllerButtonEvent.new(which, button))
         end
       # When controller button is released
       when :button_up
+        # For class pattern
+        unless @using_dsl
+          @controller_id = which
+          unless @controller_buttons_up.include? button
+            @controller_buttons_up << button
+          end
+        end
+
+        # Call event handler
         @events[:controller_button_up].each do |id, e|
           e.call(ControllerButtonEvent.new(which, button))
         end
@@ -365,8 +561,17 @@ module Ruby2D
 
     # Update callback method, called by the native and web extentions
     def update_callback
+      unless @using_dsl
+        update
+      end
+
       @update_proc.call
 
+      # Run update method on all entities
+      @entities.each do |e|
+        e.update
+      end
+
       # Accept and eval commands if in console mode
       if @console
         if STDIN.ready?
@@ -385,10 +590,42 @@ module Ruby2D
         end
       end
 
+      # Clear inputs if using class pattern
+      unless @using_dsl
+        @keys_down.clear
+        @keys_held.clear
+        @keys_up.clear
+        @mouse_buttons_down.clear
+        @mouse_buttons_up.clear
+        @mouse_scroll_event = false
+        @mouse_move_event = false
+        @controller_axes_moved.clear
+        @controller_buttons_down.clear
+        @controller_buttons_up.clear
+      end
+    end
+
+    # Render callback method, called by the native and web extentions
+    def render_callback
+      unless @using_dsl
+        render
+      end
+
+      @render_proc.call
+
+      # Run render method on all entities
+      @entities.each do |e|
+        e.render
+      end
     end
 
     # Show the window
     def show
+      if @@open_window
+        raise Error, "Window#show called multiple times, Ruby2D only supports a single open window"
+      end
+
+      @@open_window = true
       ext_show
     end
 

data/lib/ruby2d.rb

@@ -7,20 +7,25 @@ unless RUBY_ENGINE == 'mruby'
   require 'ruby2d/color'
   require 'ruby2d/window'
   require 'ruby2d/dsl'
+  require 'ruby2d/entity'
   require 'ruby2d/quad'
   require 'ruby2d/line'
   require 'ruby2d/circle'
   require 'ruby2d/rectangle'
   require 'ruby2d/square'
   require 'ruby2d/triangle'
+  require 'ruby2d/pixel'
   require 'ruby2d/image'
   require 'ruby2d/sprite'
+  require 'ruby2d/tileset'
   require 'ruby2d/font'
   require 'ruby2d/text'
   require 'ruby2d/sound'
   require 'ruby2d/music'
+  require 'ruby2d/texture'
+  require 'ruby2d/vertices'
 
-  if RUBY_PLATFORM =~ /mingw/
+  if defined?(RubyInstaller)
     s2d_dll_path = Gem::Specification.find_by_name('ruby2d').gem_dir + '/assets/mingw/bin'
     RubyInstaller::Runtime.add_dll_directory(File.expand_path(s2d_dll_path))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.11.1
 platform: ruby
 authors:
 - Tom Black
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,9 +69,12 @@ files:
 - assets/include/SDL2/SDL_keyboard.h
 - assets/include/SDL2/SDL_keycode.h
 - assets/include/SDL2/SDL_loadso.h
+- assets/include/SDL2/SDL_locale.h
 - assets/include/SDL2/SDL_log.h
 - assets/include/SDL2/SDL_main.h
 - assets/include/SDL2/SDL_messagebox.h
+- assets/include/SDL2/SDL_metal.h
+- assets/include/SDL2/SDL_misc.h
 - assets/include/SDL2/SDL_mixer.h
 - assets/include/SDL2/SDL_mouse.h
 - assets/include/SDL2/SDL_mutex.h
@@ -123,7 +126,6 @@ files:
 - assets/include/SDL2/begin_code.h
 - assets/include/SDL2/close_code.h
 - assets/include/glew.h
-- assets/include/simple2d.h
 - assets/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
 - assets/ios/Assets.xcassets/Contents.json
 - assets/ios/Base.lproj/LaunchScreen.storyboard
@@ -165,23 +167,6 @@ files:
 - assets/ios/MyApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - assets/ios/MyApp.xcodeproj/project.xcworkspace/xcshareddata/MyApp.xcscmblueprint
 - assets/ios/main.c
-- assets/linux/simple2d/Makefile
-- assets/linux/simple2d/bin/simple2d.sh
-- assets/linux/simple2d/include/simple2d.h
-- assets/linux/simple2d/src/controllers.c
-- assets/linux/simple2d/src/gl.c
-- assets/linux/simple2d/src/gl2.c
-- assets/linux/simple2d/src/gl3.c
-- assets/linux/simple2d/src/gles.c
-- assets/linux/simple2d/src/image.c
-- assets/linux/simple2d/src/input.c
-- assets/linux/simple2d/src/music.c
-- assets/linux/simple2d/src/shapes.c
-- assets/linux/simple2d/src/simple2d.c
-- assets/linux/simple2d/src/sound.c
-- assets/linux/simple2d/src/sprite.c
-- assets/linux/simple2d/src/text.c
-- assets/linux/simple2d/src/window.c
 - assets/macos/lib/libFLAC.a
 - assets/macos/lib/libSDL2.a
 - assets/macos/lib/libSDL2_image.a
@@ -189,10 +174,10 @@ files:
 - assets/macos/lib/libSDL2_ttf.a
 - assets/macos/lib/libfreetype.a
 - assets/macos/lib/libjpeg.a
+- assets/macos/lib/libmodplug.a
 - assets/macos/lib/libmpg123.a
 - assets/macos/lib/libogg.a
 - assets/macos/lib/libpng16.a
-- assets/macos/lib/libsimple2d.a
 - assets/macos/lib/libtiff.a
 - assets/macos/lib/libvorbis.a
 - assets/macos/lib/libvorbisfile.a
@@ -228,7 +213,6 @@ files:
 - assets/mingw/lib/libSDL2main.a
 - assets/mingw/lib/libglew32.a
 - assets/mingw/lib/libglew32.dll.a
-- assets/mingw/lib/libsimple2d.a
 - assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
 - assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json
 - assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json
@@ -288,8 +272,23 @@ files:
 - assets/tvos/MyApp.xcodeproj/project.xcworkspace/xcshareddata/MyApp.xcscmblueprint
 - assets/tvos/main.c
 - bin/ruby2d
+- ext/ruby2d/common.c
+- ext/ruby2d/controllers.c
 - ext/ruby2d/extconf.rb
+- ext/ruby2d/font.c
+- ext/ruby2d/gl.c
+- ext/ruby2d/gl2.c
+- ext/ruby2d/gl3.c
+- ext/ruby2d/gles.c
+- ext/ruby2d/image.c
+- ext/ruby2d/input.c
+- ext/ruby2d/music.c
 - ext/ruby2d/ruby2d.c
+- ext/ruby2d/ruby2d.h
+- ext/ruby2d/shapes.c
+- ext/ruby2d/sound.c
+- ext/ruby2d/text.c
+- ext/ruby2d/window.c
 - lib/ruby2d.rb
 - lib/ruby2d/circle.rb
 - lib/ruby2d/cli/build.rb
@@ -299,11 +298,13 @@ files:
 - lib/ruby2d/cli/launch.rb
 - lib/ruby2d/color.rb
 - lib/ruby2d/dsl.rb
+- lib/ruby2d/entity.rb
 - lib/ruby2d/exceptions.rb
 - lib/ruby2d/font.rb
 - lib/ruby2d/image.rb
 - lib/ruby2d/line.rb
 - lib/ruby2d/music.rb
+- lib/ruby2d/pixel.rb
 - lib/ruby2d/quad.rb
 - lib/ruby2d/rectangle.rb
 - lib/ruby2d/renderable.rb
@@ -311,14 +312,17 @@ files:
 - lib/ruby2d/sprite.rb
 - lib/ruby2d/square.rb
 - lib/ruby2d/text.rb
+- lib/ruby2d/texture.rb
+- lib/ruby2d/tileset.rb
 - lib/ruby2d/triangle.rb
 - lib/ruby2d/version.rb
+- lib/ruby2d/vertices.rb
 - lib/ruby2d/window.rb
 homepage: http://www.ruby2d.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -333,8 +337,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.31
+signing_key:
 specification_version: 4
 summary: Ruby 2D
 test_files: []