cyberarm_engine 0.14.0 → 0.15.0

data/lib/cyberarm_engine/ui/gui_state.rb

@@ -17,10 +17,13 @@ module CyberarmEngine
       @active_width  = window.width
       @active_height = window.height
 
+      @menu = nil
       @focus = nil
       @mouse_over = nil
       @mouse_down_on = {}
       @mouse_down_position = {}
+      @last_mouse_pos = nil
+      @dragging_element = nil
       @pending_recalculate_request = false
 
       @tip = CyberarmEngine::Text.new("", size: 22, z: Float::INFINITY)
@@ -32,7 +35,7 @@ module CyberarmEngine
     # throws :blur event to focused element and sets GuiState focused element
     # Does NOT throw :focus event at element or set element as focused
     def focus=(element)
-      @focus.publish(:blur) if @focus and element && @focus != element
+      @focus.publish(:blur) if @focus && element && @focus != element
       @focus = element
     end
 
@@ -43,7 +46,13 @@ module CyberarmEngine
     def draw
       super
 
-      if @tip.text.length > 0
+      if @menu
+        Gosu.flush
+        @menu.draw
+      end
+
+      if @tip.text.length.positive?
+        Gosu.flush
         Gosu.draw_rect(@tip.x - 2, @tip.y - 2, @tip.width + 4, @tip.height + 4, 0xff020202, Float::INFINITY)
         @tip.draw
       end
@@ -53,12 +62,17 @@ module CyberarmEngine
       if @pending_recalculate_request
         @root_container.recalculate
         @root_container.recalculate
+        @root_container.recalculate
+
         @pending_recalculate_request = false
       end
 
+      @menu&.update
       super
 
-      new_mouse_over = @root_container.hit_element?(window.mouse_x, window.mouse_y)
+      new_mouse_over = @menu.hit_element?(window.mouse_x, window.mouse_y) if @menu
+      new_mouse_over ||= @root_container.hit_element?(window.mouse_x, window.mouse_y)
+
       if new_mouse_over
         new_mouse_over.publish(:enter) if new_mouse_over != @mouse_over
         new_mouse_over.publish(:hover)
@@ -74,7 +88,8 @@ module CyberarmEngine
       if Vector.new(window.mouse_x, window.mouse_y) == @last_mouse_pos
         if @mouse_over && (Gosu.milliseconds - @mouse_moved_at) > tool_tip_delay
           @tip.text = @mouse_over.tip if @mouse_over
-          @tip.x, @tip.y = window.mouse_x - @tip.width / 2, window.mouse_y - @tip.height - 4
+          @tip.x = window.mouse_x - @tip.width / 2
+          @tip.y = window.mouse_y - @tip.height - 4
         else
           @tip.text = ""
         end
@@ -108,6 +123,8 @@ module CyberarmEngine
       when Gosu::KbF5
         request_recalculate
       end
+
+      @focus.button_down(id) if @focus.respond_to?(:button_down)
     end
 
     def button_up(id)
@@ -125,9 +142,13 @@ module CyberarmEngine
       when Gosu::MsWheelDown
         redirect_mouse_wheel(:down)
       end
+
+      @focus.button_up(id) if @focus.respond_to?(:button_up)
     end
 
     def redirect_mouse_button(button)
+      hide_menu unless @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
+
       if @focus && @mouse_over != @focus
         @focus.publish(:blur)
         @focus = nil
@@ -145,9 +166,14 @@ module CyberarmEngine
     end
 
     def redirect_released_mouse_button(button)
+      hide_menu if @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
+
       if @mouse_over
         @mouse_over.publish(:"released_#{button}_mouse_button", window.mouse_x, window.mouse_y)
-        @mouse_over.publish(:"clicked_#{button}_mouse_button", window.mouse_x, window.mouse_y) if @mouse_over == @mouse_down_on[button]
+        if @mouse_over == @mouse_down_on[button]
+          @mouse_over.publish(:"clicked_#{button}_mouse_button", window.mouse_x,
+                              window.mouse_y)
+        end
       end
 
       if @dragging_element
@@ -162,13 +188,13 @@ module CyberarmEngine
     def redirect_holding_mouse_button(button)
       if !@dragging_element && @mouse_down_on[button] && @mouse_down_on[button].draggable?(button) && @mouse_pos.distance(@mouse_down_position[button]) > @min_drag_distance
         @dragging_element = @mouse_down_on[button]
-        @dragging_element.publish(:"begin_drag", window.mouse_x, window.mouse_y, button)
+        @dragging_element.publish(:begin_drag, window.mouse_x, window.mouse_y, button)
       end
 
       if @dragging_element
-        @dragging_element.publish(:"drag_update", window.mouse_x, window.mouse_y, button) if @dragging_element
-      else
-        @mouse_over.publish(:"holding_#{button}_mouse_button", window.mouse_x, window.mouse_y) if @mouse_over
+        @dragging_element.publish(:drag_update, window.mouse_x, window.mouse_y, button) if @dragging_element
+      elsif @mouse_over
+        @mouse_over.publish(:"holding_#{button}_mouse_button", window.mouse_x, window.mouse_y)
       end
     end
 
@@ -180,5 +206,13 @@ module CyberarmEngine
     def request_recalculate
       @pending_recalculate_request = true
     end
+
+    def show_menu(list_box)
+      @menu = list_box
+    end
+
+    def hide_menu
+      @menu = nil
+    end
   end
-end
+end

data/lib/cyberarm_engine/ui/style.rb

@@ -1,11 +1,11 @@
 module Gosu
   class Color
-    def _dump(level)
+    def _dump(_level)
       [
-        "%02X" % self.alpha,
-        "%02X" % self.red,
-        "%02X" % self.green,
-        "%02X" % self.blue
+        "%02X" % alpha,
+        "%02X" % red,
+        "%02X" % green,
+        "%02X" % blue
       ].join
     end
 
@@ -21,17 +21,18 @@ module CyberarmEngine
       @hash = Marshal.load(Marshal.dump(hash))
     end
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args)
       if method.to_s.end_with?("=")
         raise "Did not expect more than 1 argument" if args.size > 1
-        return @hash[method.to_s.sub("=", "").to_sym] = args.first
+
+        @hash[method.to_s.sub("=", "").to_sym] = args.first
 
       elsif args.size == 0
-        return @hash[method]
+        @hash[method]
 
       else
         raise ArgumentError, "Did not expect arguments"
       end
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/theme.rb

@@ -11,17 +11,21 @@ module CyberarmEngine
 
     def theme_defaults(options)
       raise "Error" unless self.class.ancestors.include?(CyberarmEngine::Element)
+
       _theme = THEME
-      _theme = _theme.merge(options[:theme]) if options[:theme]
+      _theme = deep_merge(_theme, options[:theme]) if options[:theme]
       _theme.delete(:theme) if options[:theme]
 
       hash = {}
       class_names = self.class.ancestors
-      class_names = class_names[0..class_names.index(CyberarmEngine::Element)].map! {|c| c.to_s.split("::").last.to_sym}.reverse!
+      class_names = class_names[0..class_names.index(CyberarmEngine::Element)].map! do |c|
+        c.to_s.split("::").last.to_sym
+      end.reverse!
 
       class_names.each do |klass|
         next unless data = _theme.dig(klass)
-        data.each do |key, value|
+
+        data.each do |_key, _value|
           hash.merge!(data)
         end
       end
@@ -32,7 +36,7 @@ module CyberarmEngine
     # Derived from Rails Hash#deep_merge!
     # Enables passing partial themes through Element options without issue
     def deep_merge(original, intergrate, &block)
-      hash = original.merge(intergrate) do |key, this_val, other_val|
+      original.merge(intergrate) do |key, this_val, other_val|
         if this_val.is_a?(Hash) && other_val.is_a?(Hash)
           deep_merge(this_val, other_val, &block)
         elsif block_given?
@@ -41,8 +45,6 @@ module CyberarmEngine
           other_val
         end
       end
-
-      return hash
     end
 
     THEME = {
@@ -51,28 +53,30 @@ module CyberarmEngine
         y: 0,
         z: 30,
 
-        width:  nil,
+        width: nil,
         height: nil,
-        color:     Gosu::Color::WHITE,
+        color: Gosu::Color::WHITE,
         background: Gosu::Color::NONE,
-        margin:   0,
-        padding:  0,
+        margin: 0,
+        padding: 0,
         border_thickness: 0,
         border_color: Gosu::Color::NONE,
-        border_radius: 0,
+        border_radius: 0
       },
 
       Button: { # < Label
-        margin:   1,
-        padding:  4,
+        margin: 1,
+        padding: 4,
         border_thickness: 1,
         border_color: ["ffd59674".hex, "ffff8746".hex],
         border_radius: 0,
         background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],
+        text_align: :center,
+        text_wrap: :none,
 
         hover: {
-          color: Gosu::Color.rgb(200,200,200),
-          background:  ["ffB23E41".to_i(16), "ffFF7C00".to_i(16)],
+          color: Gosu::Color.rgb(200, 200, 200),
+          background: ["ffB23E41".to_i(16), "ffFF7C00".to_i(16)]
         },
 
         active: {
@@ -89,18 +93,22 @@ module CyberarmEngine
         caret_color: Gosu::Color::WHITE,
         caret_interval: 500,
         selection_color: Gosu::Color.rgba(255, 128, 50, 200),
+        text_align: :left
       },
 
       Image: { # < Element
+        color: Gosu::Color::WHITE,
         retro: false
       },
 
       Label: { # < Element
-      text_size: 28,
-      text_shadow: false,
-      font: "Arial",
-      margin: 0,
-      padding: 2
+        text_size: 28,
+        text_wrap: :none, # :word_wrap, :break_word, :none
+        text_shadow: false,
+        text_align: :left,
+        font: "Arial",
+        margin: 0,
+        padding: 2
       },
 
       ToggleButton: { # < Button

data/lib/cyberarm_engine/vector.rb

@@ -60,22 +60,15 @@ module CyberarmEngine
       Vector.new(0, 0, -1)
     end
 
+    attr_accessor :x, :y, :z, :weight
+
     def initialize(x = 0, y = 0, z = 0, weight = 0)
-      @x, @y, @z, @weight = x, y, z, weight
+      @x = x
+      @y = y
+      @z = z
+      @weight = weight
     end
 
-    def x; @x; end
-    def x=(n); @x = n; end
-
-    def y; @y; end
-    def y=(n); @y = n; end
-
-    def z; @z; end
-    def z=(n); @z = n; end
-
-    def weight; @weight; end
-    def weight=(n); @weight = n; end
-
     alias w weight
     alias w= weight=
 
@@ -83,14 +76,14 @@ module CyberarmEngine
     def ==(other)
       if other.is_a?(Numeric)
         @x      == other &&
-        @y      == other &&
-        @z      == other &&
-        @weight == other
+          @y      == other &&
+          @z      == other &&
+          @weight == other
       elsif other.is_a?(Vector)
         @x      == other.x &&
-        @y      == other.y &&
-        @z      == other.z &&
-        @weight == other.weight
+          @y      == other.y &&
+          @z      == other.z &&
+          @weight == other.weight
       else
         other == self
       end
@@ -137,6 +130,17 @@ module CyberarmEngine
       operator("*", other)
     end
 
+    def multiply_transform(transform)
+      e = transform.elements
+
+      x = @x * e[0]  + @y * e[1]  + @z * e[2]  + 1 * e[3]
+      y = @x * e[4]  + @y * e[5]  + @z * e[6]  + 1 * e[7]
+      z = @x * e[8]  + @y * e[9]  + @z * e[10] + 1 * e[11]
+      w = @x * e[12] + @y * e[13] + @z * e[14] + 1 * e[15]
+
+      Vector.new(x / 1, y / 1, z / 1, w / 1)
+    end
+
     # Divides Vector and Numeric or Vector and Vector, excluding {weight}
     # @return [CyberarmEngine::Vector]
     def /(other)
@@ -161,20 +165,20 @@ module CyberarmEngine
     def dot(other)
       product = 0
 
-      a = self.to_a
+      a = to_a
       b = other.to_a
 
       3.times do |i|
-        product = product + (a[i] * b[i])
+        product += (a[i] * b[i])
       end
 
-      return product
+      product
     end
 
     # cross product of {Vector}
     # @return [CyberarmEngine::Vector]
     def cross(other)
-      a = self.to_a
+      a = to_a
       b = other.to_a
 
       Vector.new(
@@ -187,7 +191,7 @@ module CyberarmEngine
     # returns degrees
     # @return [Float]
     def angle(other)
-      Math.acos( self.normalized.dot(other.normalized) ) * 180 / Math::PI
+      Math.acos(normalized.dot(other.normalized)) * 180 / Math::PI
     end
 
     # returns magnitude of Vector, ignoring #weight
@@ -209,7 +213,6 @@ module CyberarmEngine
       self / Vector.new(mag, mag, mag)
     end
 
-
     # returns a direction {Vector}
     #
     # z is pitch
@@ -254,19 +257,19 @@ module CyberarmEngine
     # 2D distance using X and Y
     # @return [Float]
     def distance(other)
-      Math.sqrt((@x-other.x)**2 + (@y-other.y)**2)
+      Math.sqrt((@x - other.x)**2 + (@y - other.y)**2)
     end
 
     # 2D distance using X and Z
     # @return [Float]
     def gl_distance2d(other)
-      Math.sqrt((@x-other.x)**2 + (@z-other.z)**2)
+      Math.sqrt((@x - other.x)**2 + (@z - other.z)**2)
     end
 
     # 3D distance using X, Y, and Z
     # @return [Float]
     def distance3d(other)
-      Math.sqrt((@x-other.x)**2 + (@y-other.y)**2 + (@z-other.z)**2)
+      Math.sqrt((@x - other.x)**2 + (@y - other.y)**2 + (@z - other.z)**2)
     end
 
     # Converts {Vector} to Array
@@ -284,7 +287,7 @@ module CyberarmEngine
     # Converts {Vector} to Hash
     # @return [Hash]
     def to_h
-      {x: @x, y: @y, z: @z, weight: @weight}
+      { x: @x, y: @y, z: @z, weight: @weight }
     end
   end
-end
+end

data/lib/cyberarm_engine/version.rb

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

data/lib/cyberarm_engine/window.rb

@@ -1,10 +1,11 @@
 module CyberarmEngine
   class Window < Gosu::Window
     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 +13,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
@@ -37,7 +39,7 @@ module CyberarmEngine
       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
 
@@ -46,7 +48,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)
@@ -59,8 +69,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
@@ -68,12 +78,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
@@ -81,10 +91,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
 
@@ -93,10 +101,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