or2d 0.0.1.pre.rc1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0597361e53518e19601f4e1a17341d5bcba4a55eb76541f6b7c228c32222ec
-  data.tar.gz: 8e83ff4280a96860f70ad048b5f41d786ed80fd1d87bb480679d5fe51be00c03
+  metadata.gz: d549bc286d1ed32b29b3c09acb3490e373568eb8505895f6453287289a204261
+  data.tar.gz: 0a031f2fe7d9f0316388952ddff86c0adc4dfaf06d00368432e6c30b73a46468
 SHA512:
-  metadata.gz: 839294376a8000552136d439f56f7043b0398cfe5a1c20a0fe19093bd8fc984ca105db82dd08437b28266690b507914a1fb65fdd1db025afe747efbafdd58661
-  data.tar.gz: a648146556ab88b70f614bc6b6559cf292352b366d04ce2c7504f479d8699d378f1e04bd107a7e049100ac993d853df63c0039b13245b8279d3238fb3ddb5ede
+  metadata.gz: bb2eac9fbac591a5398821fda5dee6e94fb45f25cb8624999d2c0fe67feadee62efee3b1e02051655fc7d3a1c5ecdbf7ffd8a431ffbb38323bae81bc093ed1ce
+  data.tar.gz: 3a6166a5d9ccbb2359bb3026efced1e30696c40506354a0725db510057b76f32efcb0733c96b6935c29aae4b28083b776b3b1c6c509c643c4ca7baffec70b16c

data/lib/or2d/composite.rb

@@ -39,6 +39,16 @@ module OR2D
       OR2D.game.remove_entity(id)
     end
 
+    def each_layer(&block)
+      @layers.each(&block)
+    end
+
+    def toggle_boundary
+      @layers.each_key do |key|
+        OR2D.game.entities[key].toggle_boundary
+      end
+    end
+
     # Show the Composite object.
     def show
       @layers.each do |id, properties|

data/lib/or2d/console.rb

@@ -18,17 +18,16 @@ module OR2D
                                         height: (OR2D.game.window.get(:height) / 2),
                                         color: 'green', opacity: 0.25)
       OR2D.game.window.add(@boundary)
-      @properties = { input_size: (8 * OR2D.scale), output_size: (4 * OR2D.scale), max_length: options[:max_length] || 24 }
-      @properties[:max_lines] = (@boundary.height / (@properties[:output_size] * OR2D.scale)).to_i - @properties[:output_size]
-
+      @properties = { input_size: 8.scale, output_size: 4.scale, max_length: options[:max_length] || 24 }
+      @properties[:max_lines] = (@boundary.height / @properties[:output_size].scale).to_i - @properties[:output_size]
 
       @prompt = options[:prompt] || '>> '
       @buffer = String.new
       @display = OR2D::Composites::Text.new
       @display.add_line(text: 'OR2D Console', color: 'yellow', size: @properties[:output_size],
-                        x: @boundary.x + 16, y: @boundary.y + (16 * OR2D.scale), z: @boundary.z + 1)
+                        x: @boundary.x + 16, y: @boundary.y + 16.scale, z: @boundary.z + 1)
       @input = OR2D::Entity.new(:text, { text: @prompt, color: 'white',
-                                         x: @boundary.x + 16, y: (@boundary.y + @boundary.height) - (16 * OR2D.scale),
+                                         x: @boundary.x + 16, y: (@boundary.y + @boundary.height) - 16.scale,
                                          z: @boundary.z + 1, size: @properties[:input_size],
                                          show: true })
       @state = State.new(:RETRACTED, false, false)
@@ -62,7 +61,7 @@ module OR2D
           @state.drawn = false
         end
       when :PULL_DOWN
-        if @boundary.y <= -16 * OR2D.scale
+        if @boundary.y <= -16.scale
           @boundary.y += 16
           @input.y += 16
           @display.y += 16 unless @display.empty?
@@ -157,8 +156,8 @@ module OR2D
             puts e.backtrace
           end
 
-          @display.add_line(text: "#{@buffer} #=> #{output}", 
-                            size: @properties[:output_size], 
+          @display.add_line(text: "#{@buffer} #=> #{output}",
+                            size: @properties[:output_size],
                             color: 'white',
                             show: true)
           @buffer.clear

data/lib/or2d/entity.rb

@@ -20,8 +20,8 @@ module OR2D
     def initialize(type, options = {})
       super(x: options[:x] || 0,
             y: options[:y] || 0,
-            width: options[:width].nil? ? 1 : options[:width] * OR2D.scale,
-            height: options[:height].nil? ? 1 : options[:height] * OR2D.scale,
+            width: options[:width].nil? ? 1 : options[:width].scale,
+            height: options[:height].nil? ? 1 : options[:height].scale,
             opacity: options[:show_boundary] ? 0.55 : 0.0,
             color: 'green')
       @id = options[:id] || SecureRandom.uuid
@@ -56,6 +56,10 @@ module OR2D
                        end
     end
 
+    def contains?(x, y)
+      (@x1..@x2).cover?(x) && (@y1..@y4).cover?(y)
+    end
+
     # Show the entity on the game instance window.
     def show
       OR2D.game.window.add(self)

data/lib/or2d/instance.rb

@@ -181,6 +181,5 @@ module OR2D
       puts "An error occurred while processing the current scene: #{e.message}"
       puts e.backtrace if OR2D.debug?
     end
-
   end
 end

data/lib/or2d/patches/float.rb

@@ -0,0 +1,5 @@
+class Float
+  def scale
+    self * OR2D.scale.to_f
+  end
+end

data/lib/or2d/patches/integer.rb

@@ -0,0 +1,7 @@
+class Integer
+
+  # Scale the integer by the game window's scale.
+  def scale
+    self * OR2D.scale
+  end
+end

data/lib/or2d/resource.rb

@@ -41,8 +41,8 @@ module OR2D::Resource
   def create_image(options)
     Ruby2D::Image.new(options[:path],
                       atlas: options[:atlas],
-                      width: options[:width] * OR2D.scale || 4,
-                      height: options[:height] * OR2D.scale || 4,
+                      width: options[:width].scale || 4,
+                      height: options[:height].scale || 4,
                       opacity: options[:opacity] || 1.0,
                       rotate: options[:rotate] || 0,
                       x: options[:x] || 0,
@@ -58,8 +58,8 @@ module OR2D::Resource
                      y1: options[:y1],
                      x2: options[:x2],
                      y2: options[:y2],
-                     z: options[:z],
-                     width: options[:width] * OR2D.scale || 2,
+                     z: options[:z] || 0,
+                     width: options[:width].scale || 2,
                      color: options[:color] || 'yellow',
                      opacity: options[:opacity] || 1.0)
   end
@@ -71,8 +71,8 @@ module OR2D::Resource
     Ruby2D::Rectangle.new(x: options[:x] || 0,
                           y: options[:y] || 0,
                           z: options[:z] || 0,
-                          width: options[:width] * OR2D.scale,
-                          height: options[:height] * OR2D.scale,
+                          width: options[:width].scale,
+                          height: options[:height].scale,
                           color: options[:color] || 'yellow',
                           opacity: options[:opacity] || 1.0)
   end
@@ -83,8 +83,8 @@ module OR2D::Resource
   def create_sprite(options)
     Ruby2D::Sprite.new(options[:path],
                        atlas: options[:atlas],
-                       width: options[:width] ? options[:width] * OR2D.scale : nil,
-                       height: options[:height] ? options[:height] * OR2D.scale : nil,
+                       width: options[:width] ? options[:width].scale : nil,
+                       height: options[:height] ? options[:height].scale : nil,
                        rotate: options[:rotate] || 0,
                        opacity: options[:opacity] || 1.0,
                        loop: options[:loop] || false,
@@ -120,7 +120,7 @@ module OR2D::Resource
                      x: options[:x] || 0,
                      y: options[:y] || 0,
                      z: options[:z] || 0,
-                     size: (options[:size] || 16) * OR2D.scale,
+                     size: (options[:size] || 16).scale,
                      style: options[:style],
                      font: options[:font] || Ruby2D::Font.default,
                      color: options[:color] || 'yellow',

data/lib/or2d/scene.rb

@@ -96,6 +96,11 @@ module OR2D
       Fiber.yield
     end
 
+    def clear_descriptors
+      @descriptors.each_value { |descriptor| OR2D.game.window.off(descriptor) }
+      @descriptors.clear
+    end
+
     # Setup event descriptors.
     def setup_descriptor(label, event, &block)
       @descriptors[label] = OR2D.game.window.on(event, &block)

data/lib/or2d/scenes/placeholder_scene.rb

@@ -42,7 +42,7 @@ module OR2D::Scenes
     def setup_events
       setup_descriptor(:mouse_input, :mouse) do |event|
         @cursor_position.resource.text = "[x: #{event.x}, y: #{event.y}]"
-        @cursor_position.width = @cursor_position.resource.text.length * (6 * OR2D.scale)
+        @cursor_position.width = @cursor_position.resource.text.length * 6.scale
       end
 
       setup_descriptor(:debug_input, :key_up) do |event|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or2d
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.rc1
+  version: 0.0.5
 platform: ruby
 authors:
 - Patrick W.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: ruby2d
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.1
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.18'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.42'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +145,8 @@ files:
 - lib/or2d/console.rb
 - lib/or2d/entity.rb
 - lib/or2d/instance.rb
+- lib/or2d/patches/float.rb
+- lib/or2d/patches/integer.rb
 - lib/or2d/patches/music.rb
 - lib/or2d/patches/renderable.rb
 - lib/or2d/patches/sound.rb
@@ -134,9 +170,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: