Bumped version

lib/cyberarm_engine.rb

@@ -1,20 +1,28 @@
-require "gosu"
+begin
+  require File.expand_path("../../ffi-gosu/lib/gosu", File.dirname(__FILE__))
+rescue LoadError => e
+  pp e
+  require "gosu"
+end
 
 require_relative "cyberarm_engine/version"
 
 require_relative "cyberarm_engine/common"
 
+require_relative "cyberarm_engine/gosu_ext/circle"
+
 require_relative "cyberarm_engine/game_object"
 require_relative "cyberarm_engine/engine"
 
-require_relative "cyberarm_engine/lib/bounding_box"
+require_relative "cyberarm_engine/bounding_box"
-require_relative "cyberarm_engine/lib/vector"
+require_relative "cyberarm_engine/vector"
-require_relative "cyberarm_engine/lib/ray"
+require_relative "cyberarm_engine/transform"
-require_relative "cyberarm_engine/lib/shader" if defined?(OpenGL)
+require_relative "cyberarm_engine/ray"
+require_relative "cyberarm_engine/shader" if defined?(OpenGL)
 require_relative "cyberarm_engine/background"
 
-require_relative "cyberarm_engine/objects/text"
+require_relative "cyberarm_engine/text"
-require_relative "cyberarm_engine/objects/timer"
+require_relative "cyberarm_engine/timer"
 
 require_relative "cyberarm_engine/ui/theme"
 require_relative "cyberarm_engine/ui/event"

lib/cyberarm_engine/background.rb

@@ -1,5 +1,3 @@
-require "gosu"
-
 module CyberarmEngine
   class Background
     attr_accessor :x, :y, :z, :width, :height, :angle, :debug

lib/cyberarm_engine/bounding_box.rb

@@ -49,11 +49,17 @@ module CyberarmEngine
       return temp
     end
 
-    # returns whether both bounding boxes intersect
+    # returns whether bounding box intersects other
     def intersect?(other)
+      if other.is_a?(Ray)
+        other.intersect?(self)
+      elsif other.is_a?(BoundingBox)
         (@min.x <= other.max.x && @max.x >= other.min.x) &&
         (@min.y <= other.max.y && @max.y >= other.min.y) &&
         (@min.z <= other.max.z && @max.z >= other.min.z)
+      else
+        raise "Unknown collider: #{other.class}"
+      end
     end
 
     # does this bounding box envelop other bounding box? (inclusive of border)
@@ -62,11 +68,17 @@ module CyberarmEngine
       other.max.x <= max.x && other.max.y <= max.y && other.max.z <= max.z
     end
 
-    # returns whether the vector is inside of the bounding box
+    # returns whether the 3D vector is inside of the bounding box
+    def inside?(vector)
+      (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) &&
+      (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y)) &&
+      (vector.z.between?(@min.z, @max.z) || vector.z.between?(@max.z, @min.z))
+    end
+
+    # returns whether the 2D vector is inside of the bounding box
     def point?(vector)
-      vector.x.between?(@min.x, @max.x) &&
+      (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) &&
-      vector.y.between?(@min.y, @max.y) &&
+      (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y))
-      vector.z.between?(@min.z, @max.z)
     end
 
     def volume
@@ -87,26 +99,26 @@ module CyberarmEngine
 
     def normalize(entity)
       temp = BoundingBox.new
-      temp.min.x = @min.x.to_f * entity.scale
+      temp.min.x = @min.x.to_f * entity.scale.x
-      temp.min.y = @min.y.to_f * entity.scale
+      temp.min.y = @min.y.to_f * entity.scale.y
-      temp.min.z = @min.z.to_f * entity.scale
+      temp.min.z = @min.z.to_f * entity.scale.z
 
-      temp.max.x = @max.x.to_f * entity.scale
+      temp.max.x = @max.x.to_f * entity.scale.x
-      temp.max.y = @max.y.to_f * entity.scale
+      temp.max.y = @max.y.to_f * entity.scale.y
-      temp.max.z = @max.z.to_f * entity.scale
+      temp.max.z = @max.z.to_f * entity.scale.z
 
       return temp
     end
 
     def normalize_with_offset(entity)
       temp = BoundingBox.new
-      temp.min.x = @min.x.to_f * entity.scale + entity.position.x
+      temp.min.x = @min.x.to_f * entity.scale.x + entity.position.x
-      temp.min.y = @min.y.to_f * entity.scale + entity.position.y
+      temp.min.y = @min.y.to_f * entity.scale.y + entity.position.y
-      temp.min.z = @min.z.to_f * entity.scale + entity.position.z
+      temp.min.z = @min.z.to_f * entity.scale.z + entity.position.z
 
-      temp.max.x = @max.x.to_f * entity.scale + entity.position.x
+      temp.max.x = @max.x.to_f * entity.scale.x + entity.position.x
-      temp.max.y = @max.y.to_f * entity.scale + entity.position.y
+      temp.max.y = @max.y.to_f * entity.scale.y + entity.position.y
-      temp.max.z = @max.z.to_f * entity.scale + entity.position.z
+      temp.max.z = @max.z.to_f * entity.scale.z + entity.position.z
 
       return temp
     end

lib/cyberarm_engine/common.rb

@@ -1,50 +1,50 @@
 module CyberarmEngine
   module Common
     def push_state(klass, options={})
-      $window.push_state(klass, options)
+      window.push_state(klass, options)
     end
 
     def current_state
-      $window.current_state
+      window.current_state
     end
 
     def previous_state
-      $window.previous_state
+      window.previous_state
     end
 
     def pop_state
-      $window.pop_state
+      window.pop_state
     end
 
     def show_cursor
-      $window.show_cursor
+      window.show_cursor
     end
 
     def show_cursor=boolean
-      $window.show_cursor = boolean
+      window.show_cursor = boolean
     end
 
     def draw_rect(x, y, width, height, color, z = 0)
-      $window.draw_rect(x,y,width,height,color,z)
+      Gosu.draw_rect(x, y, width, height, color, z)
     end
 
     def fill(color, z = 0)
-      draw_rect(0, 0, $window.width, $window.height, color, z)
+      draw_rect(0, 0, window.width, window.height, color, z)
     end
 
     def lighten(color, amount = 25)
       if defined?(color.alpha)
-        return Gosu::Color.rgba(color.red+amount, color.green+amount, color.blue+amount, color.alpha)
+        return Gosu::Color.rgba(color.red + amount, color.green + amount, color.blue + amount, color.alpha)
       else
-        return Gosu::Color.rgb(color.red+amount, color.green+amount, color.blue+amount)
+        return Gosu::Color.rgb(color.red + amount, color.green + amount, color.blue + amount)
       end
     end
 
     def darken(color, amount = 25)
       if defined?(color.alpha)
-        return Gosu::Color.rgba(color.red-amount, color.green-amount, color.blue-amount, color.alpha)
+        return Gosu::Color.rgba(color.red - amount, color.green - amount, color.blue - amount, color.alpha)
       else
-        return Gosu::Color.rgb(color.red-amount, color.green-amount, color.blue-amount)
+        return Gosu::Color.rgb(color.red - amount, color.green - amount, color.blue - amount)
       end
     end
 
@@ -54,7 +54,7 @@ module CyberarmEngine
       return Gosu::Color.rgba(color.red, color.green, color.blue, alpha)
     end
 
-    def get_asset(path, hash, klass)
+    def get_asset(path, hash, klass, retro = false, tileable = false)
       asset = nil
       hash.detect do |_asset, instance|
         if _asset == path
@@ -64,7 +64,12 @@ module CyberarmEngine
       end
 
       unless asset
+        instance = nil
+        if klass == Gosu::Image
+          instance = klass.new(path, retro: retro, tileable: tileable)
+        else
           instance = klass.new(path)
+        end
         hash[path] = instance
         asset = instance
       end
@@ -72,8 +77,8 @@ module CyberarmEngine
       return asset
     end
 
-    def get_image(path)
+    def get_image(path, retro: false, tileable: false)
-      get_asset(path, Engine::IMAGES, Gosu::Image)
+      get_asset(path, Engine::IMAGES, Gosu::Image, retro, tileable)
     end
 
     def get_sample(path)

lib/cyberarm_engine/engine.rb

@@ -5,7 +5,7 @@ module CyberarmEngine
     SONGS  = {}
 
     attr_accessor :show_cursor
-    attr_reader :current_state, :last_frame_time
+    attr_reader :last_frame_time
 
     def self.now
       Gosu.milliseconds
@@ -58,11 +58,15 @@ module CyberarmEngine
     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
 

lib/cyberarm_engine/game_object.rb

@@ -3,7 +3,8 @@ module CyberarmEngine
     include Common
 
     attr_accessor :image, :angle, :position, :velocity, :center_x, :center_y, :scale_x, :scale_y,
-                  :color, :alpha, :mode, :options, :paused, :radius, :last_position
+                  :color, :mode, :options, :paused, :radius, :last_position
+    attr_reader :alpha
     def initialize(options={})
       if options[:auto_manage] || options[:auto_manage] == nil
         $window.current_state.add_game_object(self)
@@ -141,7 +142,7 @@ module CyberarmEngine
       self.angle%=360
     end
 
-    def alpha=int # 0-255
+    def alpha=(int) # 0-255
       @alpha = int
       @alpha = 255 if @alpha > 255
       @color = Gosu::Color.rgba(@color.red, @color.green, @color.blue, int)
@@ -154,7 +155,7 @@ module CyberarmEngine
     def button_up(id)
     end
 
-    def button_down?(id)
+    def button_down(id)
     end
 
     def find_closest(game_object_class)

lib/cyberarm_engine/game_state.rb

@@ -12,8 +12,6 @@ module CyberarmEngine
       $window.text_input = nil unless options[:preserve_text_input]
 
       @down_keys = {}
-
-      setup
     end
 
     def setup

lib/cyberarm_engine/gosu_ext/circle.rb

@@ -0,0 +1,9 @@
+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

lib/cyberarm_engine/ray.rb

@@ -1,11 +1,12 @@
 module CyberarmEngine
   class Ray
-    def initialize(origin, direction)
+    def initialize(origin, direction, range = Float::INFINITY)
       raise "Origin must be a Vector!" unless origin.is_a?(Vector)
       raise "Direction must be a Vector!" unless direction.is_a?(Vector)
 
       @origin  = origin
       @direction = direction
+      @range = range
 
       @inverse_direction = @direction.inverse
     end
@@ -20,8 +21,8 @@ module CyberarmEngine
 
     # Based on: https://tavianator.com/fast-branchless-raybounding-box-intersections/
     def intersect_bounding_box?(box)
-      tmin = -Float::INFINITY
+      tmin = -@range
-      tmax = Float::INFINITY
+      tmax = @range
 
       tx1 = (box.min.x - @origin.x) * @inverse_direction.x
       tx2 = (box.max.x - @origin.x) * @inverse_direction.x

lib/cyberarm_engine/shader.rb

@@ -2,14 +2,14 @@ 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 ||= {}
+      @@shaders[name] = instance
-      @shaders[name] = instance
     end
 
     def self.use(name, &block)
-      shader = @shaders.dig(name)
+      shader = @@shaders.dig(name)
       if shader
         shader.use(&block)
       else
@@ -17,6 +17,14 @@ module CyberarmEngine
       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

lib/cyberarm_engine/transform.rb

@@ -0,0 +1,84 @@
+module CyberarmEngine
+  class Transform
+    attr_reader :elements
+    def initialize(matrix)
+      @elements = matrix
+
+      raise "Transform is wrong size! Got #{@elements.size}, expected 16" if 16 != @elements.size
+    end
+
+    def self.rotate(angle, rotate_around = nil)
+      double c = Math.cos(angle).degrees_to_radians
+      double s = Math.sin(angle).degrees_to_radians
+      matrix = [
+          +c, +s, 0, 0,
+          -s, +c, 0, 0,
+          0,  0,  1, 0,
+          0,  0,  0, 1,
+      ]
+
+      rotate_matrix = Transform.new(matrix, rows: 4, columns: 4)
+
+      if rotate_around && (rotate_around.x != 0.0 || rotate_around.y != 0.0)
+        negative_rotate_around = Vector.new(-rotate_around.x, -rotate_around.y, -rotate_around.z)
+
+        rotate_matrix = concat(
+          concat(translate(negative_rotate_around), rotate_matrix),
+          translate(rotate_around)
+        )
+      end
+
+      return rotate_matrix
+    end
+
+    def self.translate(vector)
+      x, y, z = vector.to_a[0..2]
+      matrix = [
+        1, 0, 0, 0,
+        0, 1, 0, 0,
+        0, 0, 1, 0,
+        x, y, z, 1,
+      ]
+
+      Transform.new(matrix)
+    end
+
+    def self.scale(vector, center_around = nil)
+      scale_x, scale_y, scale_z = vector.to_a[0..2]
+      matrix = [
+        scale_x, 0,       0,       0,
+        0,       scale_y, 0,       0,
+        0,       0,       scale_z, 0,
+        0,       0,       0,       1,
+      ]
+
+      scale_matrix = Transform.new(matrix)
+
+      if center_around && (center_around.x != 0.0 || center_around.y != 0.0)
+        negative_center_around = Vector.new(-center_around.x, -center_around.y, -center_around.z)
+
+        scale_matrix = concat(
+          concat(translate(negative_center_around), scale_matrix),
+          translate(center_around)
+        )
+      end
+
+      return scale_matrix
+    end
+
+    def self.concat(left, right)
+      matrix = Array.new(left.elements.size)
+      rows = 4
+
+      matrix.size.times do |i|
+        matrix[i] = 0
+
+        rows.times do |j|
+          matrix[i] += left.elements[i / rows * rows + j] * right.elements[i % rows + j * rows]
+        end
+      end
+
+      Transform.new(matrix)
+    end
+  end
+end

lib/cyberarm_engine/ui/element.rb

@@ -32,6 +32,9 @@ module CyberarmEngine
       @style.width  = default(:width)  || nil
       @style.height = default(:height) || nil
 
+      @style.background_canvas = Background.new
+      @style.border_canvas     = BorderCanvas.new(element: self)
+
       stylize
 
       default_events
@@ -44,9 +47,6 @@ module CyberarmEngine
 
       set_margin(@style.margin)
 
-      @style.background_canvas = Background.new
-      @style.border_canvas     = BorderCanvas.new(element: self)
-
       set_background(@style.background)
       set_border_color(@style.border_color)
     end

lib/cyberarm_engine/ui/elements/button.rb

@@ -25,6 +25,8 @@ module CyberarmEngine
           @style.background_canvas.background = default(:hover, :background)
           @text.color = default(:hover, :color)
         end
+
+        return :handled
       end
 
       def left_mouse_button(sender, x, y)
@@ -32,23 +34,33 @@ module CyberarmEngine
         @style.background_canvas.background = default(:active, :background)
         window.current_state.focus = self
         @text.color = default(:active, :color)
+
+        return :handled
       end
 
       def released_left_mouse_button(sender,x, y)
         enter(sender)
+
+        return :handled
       end
 
       def clicked_left_mouse_button(sender, x, y)
         @block.call(self) if @block
+
+        return :handled
       end
 
       def leave(sender)
         @style.background_canvas.background = default(:background)
         @text.color = default(:color)
+
+        return :handled
       end
 
       def blur(sender)
         @focus = false
+
+        return :handled
       end
     end
   end

lib/cyberarm_engine/ui/elements/container.rb

@@ -67,8 +67,11 @@ module CyberarmEngine
           @width  = @style.width  = window.width
           @height = @style.height = window.height
         else
+          @width, @height = 0, 0
+
           _width = dimensional_size(@style.width, :width)
           _height= dimensional_size(@style.height,:height)
+
           @width  = _width  ? _width  : (@children.map {|c| c.x + c.outer_width }.max || 0).round
           @height = _height ? _height : (@children.map {|c| c.y + c.outer_height}.max || 0).round
         end

lib/cyberarm_engine/ui/elements/edit_line.rb

@@ -46,6 +46,8 @@ module CyberarmEngine
 
         @caret_last_interval = Gosu.milliseconds
         @show_caret = true
+
+        return :handled
       end
 
       def enter(sender)
@@ -56,12 +58,16 @@ module CyberarmEngine
           @style.background_canvas.background = default(:hover, :background)
           @text.color = default(:hover, :color)
         end
+
+        return :handled
       end
 
       def leave(sender)
         unless @focus
           super
         end
+
+        return :handled
       end
 
       def blur(sender)
@@ -69,6 +75,8 @@ module CyberarmEngine
         @style.background_canvas.background = default(:background)
         @text.color = default(:color)
         window.text_input = nil
+
+        return :handled
       end
 
       # TODO: Fix caret rendering in wrong position unless caret_pos is at end of text

lib/cyberarm_engine/ui/elements/image.rb

@@ -19,6 +19,8 @@ module CyberarmEngine
 
       def clicked_left_mouse_button(sender, x, y)
         @block.call(self) if @block
+
+        return :handled
       end
 
       def recalculate

lib/cyberarm_engine/ui/elements/label.rb

@@ -13,11 +13,16 @@ module CyberarmEngine
 
       def clicked_left_mouse_button(sender, x, y)
         @block.call(self) if @block
+
+        return :handled
       end
 
       def recalculate
+        @width, @height = 0, 0
+
         _width = dimensional_size(@style.width, :width)
         _height= dimensional_size(@style.height,:height)
+
         @width = _width  ? _width  : @text.width.round
         @height= _height ? _height : @text.height.round
 

lib/cyberarm_engine/ui/elements/toggle_button.rb

@@ -24,6 +24,8 @@ module CyberarmEngine
         toggle
 
         @block.call(self) if @block
+
+        return :handled
       end
 
       def toggle

lib/cyberarm_engine/ui/gui_state.rb

@@ -22,8 +22,6 @@ module CyberarmEngine
       @mouse_down_on = {}
       @mouse_down_position = {}
       @pending_recalculate_request = false
-
-      setup
     end
 
     # throws :blur event to focused element and sets GuiState focused element

lib/cyberarm_engine/ui/theme.rb

@@ -65,7 +65,7 @@ module CyberarmEngine
       Button: { # < Label
         margin:   1,
         padding:  4,
-        border_thickness: 4,
+        border_thickness: 1,
         border_color: ["ffd59674".hex, "ffff8746".hex],
         border_radius: 0,
         background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],

lib/cyberarm_engine/vector.rb

@@ -1,5 +1,29 @@
 module CyberarmEngine
   class Vector
+    def self.up
+      Vector.new(0, 1, 0)
+    end
+
+    def self.down
+      Vector.new(0, -1, 0)
+    end
+
+    def self.left
+      Vector.new(-1, 0, 0)
+    end
+
+    def self.right
+      Vector.new(1, 0, 0)
+    end
+
+    def self.forward
+      Vector.new(0, 0, 1)
+    end
+
+    def self.backward
+      Vector.new(0, 0, -1)
+    end
+
     def initialize(x = 0, y = 0, z = 0, weight = 0)
       @x, @y, @z, @weight = x, y, z, weight
     end
@@ -16,6 +40,9 @@ module CyberarmEngine
     def weight; @weight; end
     def weight=(n); @weight = n; end
 
+    alias w weight
+    alias w= weight=
+
     def ==(other)
       if other.is_a?(Numeric)
         @x      == other &&
@@ -138,6 +165,10 @@ module CyberarmEngine
       @x + @y + @z
     end
 
+    def lerp(other, factor)
+      (self - other) * factor.clamp(0.0, 1.0)
+    end
+
     # 2D distance using X and Y
     def distance(other)
       Math.sqrt((@x-other.x)**2 + (@y-other.y)**2)

lib/cyberarm_engine/version.rb

@@ -1,4 +1,4 @@
 module CyberarmEngine
   NAME    = "InDev"
-  VERSION = "0.10.0"
+  VERSION = "0.12.1"
 end