ruby2d 0.2.1 → 0.3.0

data/lib/ruby2d/square.rb

@@ -1,7 +1,7 @@
 # square.rb
 
 module Ruby2D
-  class Square < Ruby2D::Rectangle
+  class Square < Rectangle
     
     attr_reader :size
     
@@ -11,10 +11,7 @@ module Ruby2D
       @width = @height = @size = s
       update_coords(x, y, s, s)
       update_color(c)
-      
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.add(self)
-      end
+      add
     end
     
     def size=(s)

data/lib/ruby2d/text.rb

@@ -3,38 +3,38 @@
 module Ruby2D
   class Text
     
-    attr_accessor :x, :y, :size, :text
+    attr_accessor :x, :y, :data
+    attr_reader :text, :size, :font, :color
     
-    def initialize(x=0, y=0, size=20, msg="Hello World!", font="Arial", c="white")
+    def initialize(x=0, y=0, text="Hello World!", size=20, font=nil, c="white")
       
-      if File.exists? font
+      # if File.exists? font
         @font = font
-      else
-        @font = resolve_path(font)
-      end
+      # else
+      #   @font = resolve_path(font)
+      # end
       
-      @type_id = 4
+      @type_id = 5
       @x, @y, @size = x, y, size
-      @text, @color = msg, c
-      update_color(c)
-      
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.add(self)
-      end
+      @text = text
+      @color = Color.new(c)
+      init
+      add
     end
     
     def color=(c)
-      @color = c
-      update_color(c)
+      @color = Color.new(c)
     end
     
-    def text=(t)
-      
+    def add
+      if Module.const_defined? :DSL
+        Application.add(self)
+      end
     end
     
     def remove
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.remove(self)
+      if Module.const_defined? :DSL
+        Application.remove(self)
       end
     end
     
@@ -55,9 +55,5 @@ module Ruby2D
       end
     end
     
-    def update_color(c)
-      @c = Ruby2D::Color.new(c)
-    end
-    
   end
 end

data/lib/ruby2d/triangle.rb

@@ -6,7 +6,7 @@ module Ruby2D
     attr_accessor :x1, :y1, :c1,
                   :x2, :y2, :c2,
                   :x3, :y3, :c3
-    attr_reader :color
+    attr_reader :color, :type_id
     
     def initialize(x1=50, y1=0, x2=100, y2=100, x3=0, y3=100, c='white')
       @type_id = 1
@@ -15,10 +15,7 @@ module Ruby2D
       @x3, @y3 = x3, y3
       @color = c
       update_color(c)
-      
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.add(self)
-      end
+      add
     end
     
     def color=(c)
@@ -26,25 +23,42 @@ module Ruby2D
       @color = c
     end
     
+    def add
+      if Module.const_defined? :DSL
+        Application.add(self)
+      end
+    end
+    
     def remove
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.remove(self)
+      if Module.const_defined? :DSL
+        Application.remove(self)
       end
     end
     
     private
     
     def update_color(c)
-      # If a 2D array
-      if c.class == Array && c.all? { |el| el.class == Array }
-        @c1 = Ruby2D::Color.new(c[0])
-        @c2 = Ruby2D::Color.new(c[1])
-        @c3 = Ruby2D::Color.new(c[2])
+      
+      # If a valid color, use it for each vertex
+      if Color.is_valid? c
+        @c1 = Color.new(c)
+        @c2 = Color.new(c)
+        @c3 = Color.new(c)
+        
+      elsif c.class == Array && c.length < 3
+        raise Error, "Triangles require 3 colors, one for each vertex. Only " <<
+                     "#{c.length} were given."
+        
+      # If a valid array of colors, assign them to each vertex, respectively
+      elsif c.all? { |el| Color.is_valid? el }
+        @c1 = Color.new(c[0])
+        @c2 = Color.new(c[1])
+        @c3 = Color.new(c[2])
+        
       else
-        @c1 = Ruby2D::Color.new(c)
-        @c2 = Ruby2D::Color.new(c)
-        @c3 = Ruby2D::Color.new(c)
+        raise Error, "Not a valid color for #{self.class}"
       end
+      
     end
     
   end

data/lib/ruby2d/version.rb

@@ -1,5 +1,5 @@
 # version.rb
 
 module Ruby2D
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/ruby2d/window.rb

@@ -2,52 +2,69 @@
 
 module Ruby2D
   class Window
-    attr_reader :title, :width, :height, :mouse_x, :mouse_y
-    
-    def initialize(width: 640, height: 480, title: "Ruby 2D", fps: 60, vsync: true)
-      @width, @height, @title = width, height, title
-      @mouse_x = @mouse_y = 0
-      @fps_cap = fps
-      @fps = 60
-      @vsync = vsync
-      
-      @objects = []
-      @keys = {}
-      @keys_down = {}
-      @controller = {}
-      @update_proc = Proc.new {}
+    
+    attr_reader :objects
+    attr_accessor :mouse_x, :mouse_y, :frames, :fps
+    
+    def initialize(args = {})
+      @title      = args[:title]  || "Ruby 2D"
+      @background = Color.new([0.0, 0.0, 0.0, 1.0])
+      @width      = args[:width]  || 640
+      @height     = args[:height] || 480
+      @viewport_width, @viewport_height = nil, nil
+      @resizable  = false
+      @borderless = false
+      @fullscreen = false
+      @highdpi    = false
+      @frames     = 0
+      @fps_cap    = args[:fps] || 60
+      @fps        = @fps_cap
+      @vsync      = args[:vsync] || true
+      @mouse_x = 0; @mouse_y = 0
+      @objects    = []
+      @keys_down, @keys, @keys_up, @mouse, @controller = {}, {}, {}, {}, {}
+      @on_key_proc        = Proc.new {}
+      @on_controller_proc = Proc.new {}
+      @update_proc        = Proc.new {}
+      @diagnostics        = false
     end
     
     def get(sym)
       case sym
-      when :window
-        return self
-      when :title
-        return @title
-      when :width
-        return @width
-      when :height
-        return @height
-      when :fps
-        return @fps
-      when :mouse_x
-        return @mouse_x
-      when :mouse_y
-        return @mouse_y
+      when :window;          self
+      when :title;           @title
+      when :background;      @background
+      when :width;           @width
+      when :height;          @height
+      when :viewport_width;  @viewport_width
+      when :viewport_height; @viewport_height
+      when :resizable;       @resizable
+      when :borderless;      @borderless
+      when :fullscreen;      @fullscreen
+      when :highdpi;         @highdpi
+      when :frames;          @frames
+      when :fps;             @fps
+      when :mouse_x;         @mouse_x
+      when :mouse_y;         @mouse_y
+      when :diagnostics;     @diagnostics
       end
     end
     
     def set(opts)
-      valid_keys = [:title, :width, :height]
-      valid_opts = opts.reject { |k| !valid_keys.include?(k) }
-      if !valid_opts.empty?
-        @title = valid_opts[:title]
-        @width = valid_opts[:width]
-        @height = valid_opts[:height]
-        return true
-      else
-        return false
+      # Store new window attributes, or ignore if nil
+      @title           = opts[:title]           || @title
+      if Color.is_valid? opts[:background]
+        @background    = Color.new(opts[:background])
       end
+      @width           = opts[:width]           || @width
+      @height          = opts[:height]          || @height
+      @viewport_width  = opts[:viewport_width]  || @viewport_width
+      @viewport_height = opts[:viewport_height] || @viewport_height
+      @resizable       = opts[:resizable]       || @resizable
+      @borderless      = opts[:borderless]      || @borderless
+      @fullscreen      = opts[:fullscreen]      || @fullscreen
+      @highdpi         = opts[:highdpi]         || @highdpi
+      @diagnostics     = opts[:diagnostics]     || @diagnostics
     end
     
     def add(o)
@@ -83,17 +100,28 @@ module Ruby2D
       true
     end
     
-    def on(mouse: nil, key: nil, key_down: nil, controller: nil, &proc)
+    # def on(mouse: nil, key: nil, key_up: nil, key_down: nil, controller: nil, &proc)
+    def on(args = {}, &proc)
+      mouse      = args[:mouse]
+      key        = args[:key]
+      key_up     = args[:key_up]
+      key_down   = args[:key_down]
+      controller = args[:controller]
+      
       unless mouse.nil?
-        # reg_mouse(btn, &proc)
+        reg_mouse(mouse, &proc)
+      end
+      
+      unless key_down.nil?
+        reg_key_down(key_down, &proc)
       end
       
       unless key.nil?
         reg_key(key, &proc)
       end
       
-      unless key_down.nil?
-        reg_key_down(key_down, &proc)
+      unless key_up.nil?
+        reg_key_up(key_up, &proc)
       end
       
       unless controller.nil?
@@ -101,43 +129,57 @@ module Ruby2D
       end
     end
     
-    def key_callback(key)
-      key.downcase!
-      if @keys.has_key? key
-        @keys[key].call
+    def mouse_callback(btn, x, y)
+      if @mouse.has_key? 'any'
+        @mouse[btn].call(x, y)
       end
     end
     
+    def on_key(&proc)
+      @on_key_proc = proc
+      true
+    end
+    
     def key_down_callback(key)
-      key.downcase!
+      key = key.downcase
+      if @keys_down.has_key? 'any'
+        @keys_down['any'].call
+      end
       if @keys_down.has_key? key
         @keys_down[key].call
       end
     end
     
-    def controller_callback(is_axis, axis, val, is_btn, btn)
-      
-      # puts "is_axis: #{is_axis}, axis: #{axis}, val: #{val}, is_btn: #{is_btn}, btn: #{btn}"
-      
-      if is_axis
-        if axis == 0 && val == -32768
-          event = 'left'
-        elsif axis == 0 && val == 32767
-          event = 'right'
-        elsif axis == 1 && val == -32768
-          event = 'up'
-        elsif axis == 1 && val == 32767
-          event = 'down'
-        end
-      elsif is_btn
-        event = btn
+    def key_callback(key)
+      key = key.downcase
+      @on_key_proc.call(key)
+      if @keys.has_key? 'any'
+        @keys['any'].call
       end
-      
-      if @controller.has_key? event
-        @controller[event].call
+      if @keys.has_key? key
+        @keys[key].call
+      end
+    end
+    
+    def key_up_callback(key)
+      key = key.downcase
+      if @keys_up.has_key? 'any'
+        @keys_up['any'].call
+      end
+      if @keys_up.has_key? key
+        @keys_up[key].call
       end
     end
     
+    def on_controller(&proc)
+      @on_controller_proc = proc
+      true
+    end
+    
+    def controller_callback(which, is_axis, axis, val, is_btn, btn, pressed)
+      @on_controller_proc.call(which, is_axis, axis, val, is_btn, btn, pressed)
+    end
+    
     def update_callback
       @update_proc.call
     end
@@ -153,6 +195,12 @@ module Ruby2D
       end
     end
     
+    # Register key string with proc
+    def reg_key_down(key, &proc)
+      @keys_down[key] = proc
+      true
+    end
+    
     # Register key string with proc
     def reg_key(key, &proc)
       @keys[key] = proc
@@ -160,8 +208,14 @@ module Ruby2D
     end
     
     # Register key string with proc
-    def reg_key_down(key, &proc)
-      @keys_down[key] = proc
+    def reg_key_up(key, &proc)
+      @keys_up[key] = proc
+      true
+    end
+    
+    # Register mouse button string with proc
+    def reg_mouse(btn, &proc)
+      @mouse[btn] = proc
       true
     end
     

metadata

@@ -1,40 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: opal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 description: Make cross-platform 2D applications in Ruby
-email: "@blacktm"
+email: tom@blacktm.com
 executables:
 - ruby2d
 extensions:
 - ext/ruby2d/extconf.rb
 extra_rdoc_files: []
 files:
+- assets/README.md
 - assets/app.icns
+- assets/opal.js
+- assets/simple2d.js
+- assets/template.html
 - bin/ruby2d
 - ext/ruby2d/extconf.rb
+- ext/ruby2d/ruby2d-opal.rb
 - ext/ruby2d/ruby2d.c
 - lib/ruby2d.rb
 - lib/ruby2d/application.rb
@@ -42,9 +61,11 @@ files:
 - lib/ruby2d/dsl.rb
 - lib/ruby2d/exceptions.rb
 - lib/ruby2d/image.rb
+- lib/ruby2d/music.rb
 - lib/ruby2d/quad.rb
 - lib/ruby2d/rectangle.rb
 - lib/ruby2d/sound.rb
+- lib/ruby2d/sprite.rb
 - lib/ruby2d/square.rb
 - lib/ruby2d/text.rb
 - lib/ruby2d/triangle.rb
@@ -70,9 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Ruby 2D
 test_files: []
-has_rdoc: