cyberarm_engine 0.13.0 → 0.17.0

data/lib/cyberarm_engine/version.rb

@@ -1,4 +1,4 @@
-module CyberarmEngine
-  NAME    = "InDev"
-  VERSION = "0.13.0"
-end
+module CyberarmEngine
+  NAME    = "InDev".freeze
+  VERSION = "0.17.0".freeze
+end

data/lib/cyberarm_engine/{engine.rb → window.rb}

@@ -1,101 +1,114 @@
-module CyberarmEngine
-  class Engine < Gosu::Window
-    IMAGES = {}
-    SAMPLES= {}
-    SONGS  = {}
-
-    attr_accessor :show_cursor
-    attr_reader :last_frame_time
-
-    def self.now
-      Gosu.milliseconds
-    end
-
-    def self.dt
-      $window.last_frame_time/1000.0
-    end
-
-    def initialize(width: 800, height: 600, fullscreen: false, update_interval: 1000.0/60, resizable: false)
-      @show_cursor = false
-
-      super(width, height, fullscreen: fullscreen, update_interval: update_interval, resizable: resizable)
-      $window = self
-      @last_frame_time = Gosu.milliseconds-1
-      @current_frame_time = Gosu.milliseconds
-      self.caption = "CyberarmEngine #{CyberarmEngine::VERSION} #{Gosu.language}"
-
-      @states = []
-
-      setup if defined?(setup)
-    end
-
-    def draw
-      current_state.draw if current_state
-    end
-
-    def update
-      current_state.update if current_state
-      @last_frame_time = Gosu.milliseconds-@current_frame_time
-      @current_frame_time = Gosu.milliseconds
-    end
-
-    def needs_cursor?
-      @show_cursor
-    end
-
-    def dt
-      @last_frame_time/1000.0
-    end
-
-    def button_down(id)
-      super
-      current_state.button_down(id) if current_state
-    end
-
-    def button_up(id)
-      super
-      current_state.button_up(id) if current_state
-    end
-
-    def push_state(klass, options={})
-      options = {setup: true}.merge(options)
-
-      if klass.instance_of?(klass.class) && defined?(klass.options)
-        @states << klass
-        klass.setup if options[:setup]
-      else
-        @states << klass.new(options) if child_of?(klass, GameState)
-        @states << klass.new if child_of?(klass, Element::Container)
-        current_state.setup if current_state.class == klass && options[:setup]
-      end
-    end
-
-    private def child_of?(input, klass)
-      input.ancestors.detect {|c| c == klass}
-    end
-
-    def current_state
-      @states.last
-    end
-
-    def previous_state
-      if @states.size > 1 && state = @states[@states.size-2]
-        return state
-      else
-        return nil
-      end
-    end
-
-    def pop_state
-      @states.pop
-    end
-
-    # Sourced from https://gist.github.com/ippa/662583
-    def draw_circle(cx,cy,r, z = 9999,color = Gosu::Color::GREEN, step = 10)
-      0.step(360, step) do |a1|
-        a2 = a1 + step
-        draw_line(cx + Gosu.offset_x(a1, r), cy + Gosu.offset_y(a1, r), color, cx + Gosu.offset_x(a2, r), cy + Gosu.offset_y(a2, r), color, z)
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Window < Gosu::Window
+    include Common
+
+    IMAGES = {}
+    SAMPLES = {}
+    SONGS = {}
+
+    attr_accessor :show_cursor
+    attr_writer :exit_on_opengl_error
+    attr_reader :last_frame_time
+
+    def self.now
+      Gosu.milliseconds
+    end
+
+    def self.dt
+      $window.last_frame_time / 1000.0
+    end
+
+    def initialize(width: 800, height: 600, fullscreen: false, update_interval: 1000.0 / 60, resizable: false, borderless: false)
+      @show_cursor = false
+
+      super(width, height, fullscreen: fullscreen, update_interval: update_interval, resizable: resizable, borderless: borderless)
+      $window = self
+      @last_frame_time = Gosu.milliseconds - 1
+      @current_frame_time = Gosu.milliseconds
+      self.caption = "CyberarmEngine #{CyberarmEngine::VERSION} #{Gosu.language}"
+
+      @states = []
+      @exit_on_opengl_error = false
+
+      setup if defined?(setup)
+    end
+
+    def draw
+      current_state.draw if current_state
+    end
+
+    def update
+      Stats.clear
+
+      current_state.update if current_state
+      @last_frame_time = Gosu.milliseconds - @current_frame_time
+      @current_frame_time = Gosu.milliseconds
+    end
+
+    def needs_cursor?
+      @show_cursor
+    end
+
+    def dt
+      @last_frame_time / 1000.0
+    end
+
+    def aspect_ratio
+      width / height.to_f
+    end
+
+    def exit_on_opengl_error?
+      @exit_on_opengl_error
+    end
+
+    def button_down(id)
+      super
+      current_state.button_down(id) if current_state
+    end
+
+    def button_up(id)
+      super
+      current_state.button_up(id) if current_state
+    end
+
+    def push_state(klass, options = {})
+      options = { setup: true }.merge(options)
+
+      if klass.instance_of?(klass.class) && defined?(klass.options)
+        @states << klass
+        klass.setup if options[:setup]
+      else
+        @states << klass.new(options) if child_of?(klass, GameState)
+        @states << klass.new if child_of?(klass, Element::Container)
+        current_state.setup if current_state.instance_of?(klass) && options[:setup]
+      end
+    end
+
+    private def child_of?(input, klass)
+      input.ancestors.detect { |c| c == klass }
+    end
+
+    def current_state
+      @states.last
+    end
+
+    def previous_state
+      if @states.size > 1 && state = @states[@states.size - 2]
+        state
+      end
+    end
+
+    def pop_state
+      @states.pop
+    end
+
+    # Sourced from https://gist.github.com/ippa/662583
+    def draw_circle(cx, cy, r, z = 9999, color = Gosu::Color::GREEN, step = 10)
+      0.step(360, step) do |a1|
+        a2 = a1 + step
+        draw_line(cx + Gosu.offset_x(a1, r), cy + Gosu.offset_y(a1, r), color, cx + Gosu.offset_x(a2, r),
+                  cy + Gosu.offset_y(a2, r), color, z)
+      end
+    end
+  end
+end

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: cyberarm_engine
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Cyberarm
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: clipboard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.78.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: gosu_more_drawables
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '0.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 description: Yet another game making framework around gosu
 email:
 - matthewlikesrobots@gmail.com
@@ -74,25 +116,46 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/textures/default.png
 - bin/console
 - bin/setup
 - cyberarm_engine.gemspec
 - lib/cyberarm_engine.rb
 - lib/cyberarm_engine/animator.rb
 - lib/cyberarm_engine/background.rb
+- lib/cyberarm_engine/background_nine_slice.rb
 - lib/cyberarm_engine/bounding_box.rb
+- lib/cyberarm_engine/cache.rb
+- lib/cyberarm_engine/cache/download_manager.rb
 - lib/cyberarm_engine/common.rb
-- lib/cyberarm_engine/engine.rb
+- lib/cyberarm_engine/config_file.rb
 - lib/cyberarm_engine/game_object.rb
 - lib/cyberarm_engine/game_state.rb
-- lib/cyberarm_engine/gosu_ext/circle.rb
+- lib/cyberarm_engine/model.rb
+- lib/cyberarm_engine/model/material.rb
+- lib/cyberarm_engine/model/model_object.rb
+- lib/cyberarm_engine/model/parser.rb
+- lib/cyberarm_engine/model/parsers/collada_parser.rb
+- lib/cyberarm_engine/model/parsers/wavefront_parser.rb
+- lib/cyberarm_engine/model_cache.rb
+- lib/cyberarm_engine/opengl.rb
+- lib/cyberarm_engine/opengl/light.rb
+- lib/cyberarm_engine/opengl/orthographic_camera.rb
+- lib/cyberarm_engine/opengl/perspective_camera.rb
+- lib/cyberarm_engine/opengl/renderer/bounding_box_renderer.rb
+- lib/cyberarm_engine/opengl/renderer/g_buffer.rb
+- lib/cyberarm_engine/opengl/renderer/opengl_renderer.rb
+- lib/cyberarm_engine/opengl/renderer/renderer.rb
+- lib/cyberarm_engine/opengl/shader.rb
+- lib/cyberarm_engine/opengl/texture.rb
 - lib/cyberarm_engine/ray.rb
-- lib/cyberarm_engine/shader.rb
+- lib/cyberarm_engine/stats.rb
 - lib/cyberarm_engine/text.rb
 - lib/cyberarm_engine/timer.rb
 - lib/cyberarm_engine/transform.rb
@@ -102,12 +165,17 @@ files:
 - lib/cyberarm_engine/ui/elements/button.rb
 - lib/cyberarm_engine/ui/elements/check_box.rb
 - lib/cyberarm_engine/ui/elements/container.rb
+- lib/cyberarm_engine/ui/elements/edit_box.rb
 - lib/cyberarm_engine/ui/elements/edit_line.rb
 - lib/cyberarm_engine/ui/elements/flow.rb
 - lib/cyberarm_engine/ui/elements/image.rb
 - lib/cyberarm_engine/ui/elements/label.rb
+- lib/cyberarm_engine/ui/elements/list_box.rb
 - lib/cyberarm_engine/ui/elements/progress.rb
+- lib/cyberarm_engine/ui/elements/radio.rb
+- lib/cyberarm_engine/ui/elements/slider.rb
 - lib/cyberarm_engine/ui/elements/stack.rb
+- lib/cyberarm_engine/ui/elements/text_block.rb
 - lib/cyberarm_engine/ui/elements/toggle_button.rb
 - lib/cyberarm_engine/ui/event.rb
 - lib/cyberarm_engine/ui/gui_state.rb
@@ -115,15 +183,17 @@ files:
 - lib/cyberarm_engine/ui/theme.rb
 - lib/cyberarm_engine/vector.rb
 - lib/cyberarm_engine/version.rb
+- lib/cyberarm_engine/window.rb
 homepage: https://github.com/cyberarm/cyberarm_engine
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- assets
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -135,8 +205,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.3
+signing_key:
 specification_version: 4
 summary: Make games quickly and easily with gosu
 test_files: []

data/lib/cyberarm_engine/gosu_ext/circle.rb

@@ -1,9 +0,0 @@
-module Gosu
-  # Sourced from https://gist.github.com/ippa/662583
-  def self.draw_circle(cx,cy,r, z = 9999,color = Gosu::Color::GREEN, step = 10)
-    0.step(360, step) do |a1|
-      a2 = a1 + step
-      draw_line(cx + Gosu.offset_x(a1, r), cy + Gosu.offset_y(a1, r), color, cx + Gosu.offset_x(a2, r), cy + Gosu.offset_y(a2, r), color, z)
-    end
-  end
-end