cyberarm_engine 0.12.1 → 0.16.0

data/lib/cyberarm_engine/version.rb

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

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

@@ -1,10 +1,13 @@
 module CyberarmEngine
-  class Engine < Gosu::Window
+  class Window < Gosu::Window
+    include Common
+
     IMAGES = {}
-    SAMPLES= {}
-    SONGS  = {}
+    SAMPLES = {}
+    SONGS = {}
 
     attr_accessor :show_cursor
+    attr_writer :exit_on_opengl_error
     attr_reader :last_frame_time
 
     def self.now
@@ -12,19 +15,20 @@ module CyberarmEngine
     end
 
     def self.dt
-      $window.last_frame_time/1000.0
+      $window.last_frame_time / 1000.0
     end
 
-    def initialize(width: 800, height: 600, fullscreen: false, update_interval: 1000.0/60, resizable: false)
+    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)
+      super(width, height, fullscreen: fullscreen, update_interval: update_interval, resizable: resizable, borderless: borderless)
       $window = self
-      @last_frame_time = Gosu.milliseconds-1
+      @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
@@ -34,8 +38,10 @@ module CyberarmEngine
     end
 
     def update
+      Stats.clear
+
       current_state.update if current_state
-      @last_frame_time = Gosu.milliseconds-@current_frame_time
+      @last_frame_time = Gosu.milliseconds - @current_frame_time
       @current_frame_time = Gosu.milliseconds
     end
 
@@ -44,7 +50,15 @@ module CyberarmEngine
     end
 
     def dt
-      @last_frame_time/1000.0
+      @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)
@@ -57,8 +71,8 @@ module CyberarmEngine
       current_state.button_up(id) if current_state
     end
 
-    def push_state(klass, options={})
-      options = {setup: true}.merge(options)
+    def push_state(klass, options = {})
+      options = { setup: true }.merge(options)
 
       if klass.instance_of?(klass.class) && defined?(klass.options)
         @states << klass
@@ -66,12 +80,12 @@ module CyberarmEngine
       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]
+        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}
+      input.ancestors.detect { |c| c == klass }
     end
 
     def current_state
@@ -79,10 +93,8 @@ module CyberarmEngine
     end
 
     def previous_state
-      if @states.size > 1 && state = @states[@states.size-2]
-        return state
-      else
-        return nil
+      if @states.size > 1 && state = @states[@states.size - 2]
+        state
       end
     end
 
@@ -91,10 +103,11 @@ module CyberarmEngine
     end
 
     # Sourced from https://gist.github.com/ippa/662583
-    def draw_circle(cx,cy,r, z = 9999,color = Gosu::Color::GREEN, step = 10)
+    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)
+        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

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: cyberarm_engine
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Cyberarm
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2021-01-18 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.14.0
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: gosu_more_drawables
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
 description: Yet another game making framework around gosu
 email:
 - matthewlikesrobots@gmail.com
@@ -74,24 +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
@@ -101,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
@@ -114,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:
   - - ">="
@@ -134,8 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-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

data/lib/cyberarm_engine/shader.rb

@@ -1,205 +0,0 @@
-module CyberarmEngine
-  # Ref: https://github.com/vaiorabbit/ruby-opengl/blob/master/sample/OrangeBook/brick.rb
-  class Shader
-    include OpenGL
-    @@shaders = {}
-
-    def self.add(name, instance)
-      @@shaders[name] = instance
-    end
-
-    def self.use(name, &block)
-      shader = @@shaders.dig(name)
-      if shader
-        shader.use(&block)
-      else
-        raise ArgumentError, "Shader '#{name}' not found!"
-      end
-    end
-
-    def self.available?(name)
-      @@shaders.dig(name).is_a?(Shader)
-    end
-
-    def self.get(name)
-      @@shaders.dig(name)
-    end
-
-    def self.active_shader
-      @active_shader
-    end
-
-    def self.active_shader=(instance)
-      @active_shader = instance
-    end
-
-    def self.stop
-      shader = Shader.active_shader
-
-      if shader
-        shader.stop
-      else
-        raise ArgumentError, "No active shader to stop!"
-      end
-    end
-
-    def self.attribute_location(variable)
-      raise RuntimeError, "No active shader!" unless Shader.active_shader
-      Shader.active_shader.attribute_location(variable)
-    end
-
-    def self.set_uniform(variable, value)
-      raise RuntimeError, "No active shader!" unless Shader.active_shader
-      Shader.active_shader.set_uniform(variable, value)
-    end
-
-    attr_reader :name, :program
-    def initialize(name:, vertex: "shaders/default.vert", fragment:)
-      @name = name
-      @vertex_file   = vertex
-      @fragment_file = fragment
-      @compiled = false
-
-      @program = nil
-
-      @error_buffer_size = 1024
-      @variable_missing = {}
-
-      raise ArgumentError, "Shader files not found: #{@vertex_file} or #{@fragment_file}" unless shader_files_exist?
-
-      create_shaders
-      compile_shaders
-
-      # Only add shader if it successfully compiles
-      if @compiled
-        Shader.add(@name, self)
-      else
-        puts "FAILED to compile shader: #{@name}", ""
-      end
-    end
-
-    def shader_files_exist?
-      File.exist?(@vertex_file) && File.exist?(@fragment_file)
-    end
-
-    def create_shaders
-      @vertex   = glCreateShader(GL_VERTEX_SHADER)
-      @fragment = glCreateShader(GL_FRAGMENT_SHADER)
-
-      source = [File.read(@vertex_file)].pack('p')
-      size   = [File.size(@vertex_file)].pack('I')
-      glShaderSource(@vertex, 1, source, size)
-
-      source = [File.read(@fragment_file)].pack('p')
-      size   = [File.size(@fragment_file)].pack('I')
-      glShaderSource(@fragment, 1, source, size)
-    end
-
-    def compile_shaders
-      return unless shader_files_exist?
-
-      glCompileShader(@vertex)
-      buffer = '    '
-      glGetShaderiv(@vertex, GL_COMPILE_STATUS, buffer)
-      compiled = buffer.unpack('L')[0]
-
-      if compiled == 0
-        log = ' ' * @error_buffer_size
-        glGetShaderInfoLog(@vertex, @error_buffer_size, nil, log)
-        puts "Shader Error: Program \"#{@name}\""
-        puts "  Vectex Shader InfoLog:", "  #{log.strip.split("\n").join("\n  ")}\n\n"
-        puts "  Shader Compiled status: #{compiled}"
-        puts "    NOTE: assignment of uniforms in shaders is illegal!"
-        puts
-        return
-      end
-
-      glCompileShader(@fragment)
-      buffer = '    '
-      glGetShaderiv(@fragment, GL_COMPILE_STATUS, buffer)
-      compiled = buffer.unpack('L')[0]
-
-      if compiled == 0
-        log = ' ' * @error_buffer_size
-        glGetShaderInfoLog(@fragment, @error_buffer_size, nil, log)
-        puts "Shader Error: Program \"#{@name}\""
-        puts "  Fragment Shader InfoLog:", "  #{log.strip.split("\n").join("\n  ")}\n\n"
-        puts "  Shader Compiled status: #{compiled}"
-        puts "    NOTE: assignment of uniforms in shader is illegal!"
-        puts
-        return
-      end
-
-      @program = glCreateProgram
-      glAttachShader(@program, @vertex)
-      glAttachShader(@program, @fragment)
-      glLinkProgram(@program)
-
-      buffer = '    '
-      glGetProgramiv(@program, GL_LINK_STATUS, buffer)
-      linked = buffer.unpack('L')[0]
-
-      if linked == 0
-        log = ' ' * @error_buffer_size
-        glGetProgramInfoLog(@program, @error_buffer_size, nil, log)
-        puts "Shader Error: Program \"#{@name}\""
-        puts "  Program InfoLog:", "  #{log.strip.split("\n").join("\n  ")}\n\n"
-      end
-
-      @compiled = linked == 0 ? false : true
-    end
-
-    # Returns the location of a uniform variable
-    def variable(variable)
-      loc = glGetUniformLocation(@program, variable)
-      if (loc == -1)
-        puts "Shader Error: Program \"#{@name}\" has no such uniform named \"#{variable}\"", "  Is it used in the shader? GLSL may have optimized it out.", "  Is it miss spelled?" unless @variable_missing[variable]
-        @variable_missing[variable] = true
-      end
-      return loc
-    end
-
-    def use(&block)
-      return unless compiled?
-      raise "Another shader is already in use! #{Shader.active_shader.name.inspect}" if Shader.active_shader
-      Shader.active_shader=self
-
-      glUseProgram(@program)
-
-      if block
-        block.call(self)
-        stop
-      end
-    end
-
-    def stop
-      Shader.active_shader = nil if Shader.active_shader == self
-      glUseProgram(0)
-    end
-
-    def compiled?
-      @compiled
-    end
-
-    def attribute_location(variable)
-      glGetUniformLocation(@program, variable)
-    end
-
-    def set_uniform(variable, value, location = nil)
-      attr_loc = location ? location : attribute_location(variable)
-
-      case value.class.to_s.downcase.to_sym
-      when :integer
-        glUniform1i(attr_loc, value)
-      when :float
-        glUniform1f(attr_loc, value)
-      when :string
-      when :array
-      else
-        raise NotImplementedError, "Shader support for #{value.class.inspect} not implemented."
-      end
-
-      Window.handle_gl_error
-    end
-  end
-end