fantasy 0.1.13 → 0.1.17

data/lib/fantasy/global.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require "ostruct"
 
 module Global
   class << self
+    include Log
+
     attr_accessor :actors, :hud_texts, :hud_images, :backgrounds, :tile_maps, :clocks, :shapes
     attr_accessor :debug
     attr_accessor :setup_proc, :loop_proc, :button_proc
@@ -17,11 +21,13 @@ module Global
     attr_reader :frame_time # delta_time
     attr_reader :pixel_fonts
     attr_reader :references
-    attr_reader :camera
     attr_reader :game_state
 
-    def initialize
-      puts "Global.initialize"
+    attr_reader :screen_width, :screen_height
+
+    # rubocop:disable Metrics/MethodLength
+    def initialize(screen_width, screen_height)
+      log "Global.initialize"
       @actors = []
       @hud_texts = []
       @hud_images = []
@@ -32,33 +38,34 @@ module Global
       @last_frame_at = Time.now
       @debug = false
 
-      @pixel_fonts = {}
-      @pixel_fonts["small"] = Gosu::Font.new(20, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
-      @pixel_fonts["medium"] = Gosu::Font.new(40, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
-      @pixel_fonts["big"] = Gosu::Font.new(60, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
-      @pixel_fonts["huge"] = Gosu::Font.new(100, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" } )
+      @pixel_fonts = load_fonts
 
       @d_key_pressed = false
       @references = OpenStruct.new
-      @camera = Camera.new(position: Coordinates.zero)
       @game_state = Global.presentation_proc.nil? ? "game" : "presentation"
       @scene_started_at = Time.now
-
       @background = Color.new(r: 0, g: 0, b: 0)
 
+      @frame_time = 0
+
+      @screen_width = screen_width
+      @screen_height = screen_height
+
       if @presentation_proc.nil?
-        on_presentation { Global.default_on_presentation  }
+        on_presentation { Global.default_on_presentation }
       end
 
       if @game_proc.nil?
-        on_game { Global.default_on_game  }
+        on_game { Global.default_on_game }
       end
 
       if @end_proc.nil?
-        on_end { Global.default_on_end  }
+        on_end { Global.default_on_end }
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Style/GuardClause
     def update
       @frame_time = Time.now - @last_frame_at
       @last_frame_at = Time.now
@@ -72,6 +79,7 @@ module Global
         @d_key_pressed = false
       end
     end
+    # rubocop:enable Style/GuardClause
 
     def add_reference(name:, object:)
       @references[name] = object
@@ -90,21 +98,21 @@ module Global
     end
 
     def go_to_presentation
-      puts "Game stage 'presentation'"
+      log "Game stage 'presentation'"
 
       clear_state_elements
       @presentation_proc.call
     end
 
     def go_to_game
-      puts "Game stage 'game'"
+      log "Game stage 'game'"
 
       clear_state_elements
       game_proc.call
     end
 
     def go_to_end
-      puts "Game stage 'end'"
+      log "Game stage 'end'"
 
       clear_state_elements
       end_proc.call
@@ -112,19 +120,45 @@ module Global
 
     def clear_state_elements
       @scene_started_at = Time.now
+
+      clear_entities
+      clear_callbacks
+    end
+
+    def mouse_position
+      Coordinates.new(Global.game.mouse_x, Global.game.mouse_y)
+    end
+
+    def setup
+      Sound.preload_sounds
+      Image.preload_images
+      Music.preload_musics
+    end
+
+    def seconds_in_scene
+      Time.now - @scene_started_at
+    end
+
+    private
+
+    def clear_entities
       @actors.clear
       @hud_texts.clear
       @hud_images.clear
       @backgrounds.clear
       @tile_maps.clear
       @shapes.clear
-      @camera.position = Coordinates.zero
 
       @clocks.reject(&:persistent?).each do |clock|
         clock.stop unless clock.thread == Thread.current # no stop current Thread
       end
 
-      # clear callbacks
+      @background = Color.new(r: 0, g: 0, b: 0)
+
+      Camera.reset
+    end
+
+    def clear_callbacks
       @button_proc = nil
       @space_bar_proc = nil
       @cursor_up_proc = nil
@@ -133,22 +167,16 @@ module Global
       @cursor_right_proc = nil
       @mouse_button_left_proc = nil
       @mouse_button_right_proc = nil
-
-      @background = Color.new(r: 0, g: 0, b: 0)
-    end
-
-    def mouse_position
-      Coordinates.new(Global.game.mouse_x, Global.game.mouse_y)
     end
 
-    def setup
-      Sound.preload_sounds
-      Image.preload_images
-      Music.preload_musics
-    end
+    def load_fonts
+      result = {}
+      result["small"] = Gosu::Font.new(20, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" })
+      result["medium"] = Gosu::Font.new(40, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" })
+      result["big"] = Gosu::Font.new(60, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" })
+      result["huge"] = Gosu::Font.new(100, { name: "#{__dir__}/../../fonts/VT323-Regular.ttf" })
 
-    def seconds_in_scene
-      Time.now - @scene_started_at
+      result
     end
   end
 end

data/lib/fantasy/hud_image.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class HudImage
   include Draggable
 
   attr_accessor :name, :scale, :color, :visible, :position, :layer
 
-  def initialize(position:, image_name: )
+  def initialize(position:, image_name:)
     @image = Image.new(image_name)
     @name = image_name
     @position = position
@@ -17,11 +19,11 @@ class HudImage
   end
 
   def width
-    @image.width() * @scale
+    @image.width * @scale
   end
 
   def height
-    @image.height() * @scale
+    @image.height * @scale
   end
 
   def move

data/lib/fantasy/hud_text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HudText
   attr_accessor :text, :size, :color, :background_color, :visible, :layer, :in_world, :position, :alignment
 
@@ -17,6 +19,7 @@ class HudText
 
   def move; end
 
+  # rubocop:disable Metrics/AbcSize
   def draw
     if visible
       unless @background_color.nil?
@@ -27,12 +30,14 @@ class HudText
 
     draw_debug if Global.debug
   end
+  # rubocop:enable Metrics/AbcSize
 
   def font
     found_font = Global.pixel_fonts[@size]
     if found_font.nil?
       raise "HudText.size value not valid '#{@size}'. Valid values: 'small, medium, big, huge'"
     end
+
     found_font
   end
 
@@ -44,7 +49,6 @@ class HudText
     font.markup_width(text, 1)
   end
 
-
   private
 
   def position_rel
@@ -79,7 +83,7 @@ class HudText
 
   def screen_position
     if @in_world
-      @position - Global.camera.position
+      @position - Camera.main.position
     else
       @position
     end

data/lib/fantasy/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Image
   def initialize(image_name)
     @image = Image.load(image_name)
@@ -16,6 +18,8 @@ class Image
   end
 
   class << self
+    include Log
+
     @@images = {}
 
     def load(image_name)
@@ -35,19 +39,23 @@ class Image
     def locate_image(image_name)
       return @@images[image_name] if @@images[image_name]
 
-      puts "Initialize image: '#{image_name}'"
+      log "Initialize image: '#{image_name}'"
 
-      file_name = Dir.entries(base_path).find { |e| e =~ /^#{image_name}($|\.)/  }
+      file_name = Dir.entries(base_path).find { |e| e =~ /^#{image_name}($|\.)/ }
 
       raise "Image file not found with name '#{image_name}' in #{base_path}" if file_name.nil?
 
       @@images[image_name] = Gosu::Image.new("#{base_path}/#{file_name}", { retro: true })
 
-      return @@images[image_name]
+      @@images[image_name]
     end
 
     def base_path
-      "#{Dir.pwd}/images"
+      if ENV["environment"] == "test"
+        "#{Dir.pwd}/test/fixtures/images"
+      else
+        "#{Dir.pwd}/images"
+      end
     end
   end
 end

data/lib/fantasy/includes/gravitier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gravitier
   def add_force_by_gravity
     add_force(Coordinates.down * @gravity)

data/lib/fantasy/includes/jumper.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module Jumper
   def jump
-    add_force(Coordinates.up * @jump_force)
+    impulse(direction: Coordinates.up, force: @jump_force)
     @jumping = true
     @on_floor = false
-    @final_vertical_position = @position.y - @jump_force
 
     on_jumping_do
   end

data/lib/fantasy/includes/log.rb

@@ -0,0 +1,12 @@
+module Log
+  def log(message)
+    if ENV["debug"] == "active"
+      full_message = "[#{Time.now.strftime("%T")}]"
+      full_message += " [#{object_id}]"
+      full_message += " [#{@name}]" if defined?(@name)
+      full_message += " : #{message}"
+
+      puts full_message
+    end
+  end
+end

data/lib/fantasy/includes/move_by_cursors.rb

@@ -1,4 +1,26 @@
+# frozen_string_literal: true
+
 module MoveByCursor
+  # rubocop:disable Metrics/PerceivedComplexity
+  def move_with_cursors(down: nil, up: nil, left: nil, right: nil, jump: false)
+    if down.nil? && up.nil? && left.nil? && right.nil?
+      down = true
+      up = true
+      left = true
+      right = true
+    end
+
+    @move_with_cursors_down = down || false
+    @move_with_cursors_up = up || false
+    @move_with_cursors_left = left || false
+    @move_with_cursors_right = right || false
+    @move_with_cursors_jump = jump || false
+  end
+  # rubocop:enable Metrics/PerceivedComplexity
+
+  # rubocop:disable
+
+  # @!visibility private
   def move_by_cursors
     if Gosu.button_down?(Cursor.down) && @move_with_cursors_down
       move_by(Coordinates.down)
@@ -20,22 +42,9 @@ module MoveByCursor
       jump
     end
   end
+  # rubocop:enable
 
-  def move_with_cursors(down: nil, up: nil, left: nil, right: nil, jump: false)
-    puts "#{@name}: move_with_cursors(down: #{down}, up: #{up}, left: #{left}, right: #{right}), jump: #{jump}"
-
-    if down.nil? and up.nil? and left.nil? and right.nil?
-      down = true
-      up = true
-      left = true
-      right = true
-    end
-    @move_with_cursors_down = down || false
-    @move_with_cursors_up = up || false
-    @move_with_cursors_left = left || false
-    @move_with_cursors_right = right || false
-    @move_with_cursors_jump = jump || false
-  end
+  private
 
   def move_by(direction)
     @position += direction * @speed * Global.frame_time

data/lib/fantasy/includes/move_by_direction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MoveByDirection
   def move_by_direction
     @position += @direction * @speed * Global.frame_time

data/lib/fantasy/includes/mover.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mover
   def impulse(direction:, force:)
     add_force(direction.normalize * force)
@@ -13,6 +15,7 @@ module Mover
     @velocity ||= Coordinates.zero
 
     @velocity += @acceleration
+
     @velocity.resize(max_speed) if @velocity.length > max_speed
 
     unless @velocity.length.zero?

data/lib/fantasy/includes/user_inputs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UserInputs
   # Set callbacks
   def on_cursor_down(&block)
@@ -57,4 +59,8 @@ module UserInputs
     puts "XXX: on_click_do: #{@on_click_callback}"
     instance_exec(&@on_click_callback) unless @on_click_callback.nil?
   end
+
+  protected
+
+  attr_accessor :on_cursor_down_callback, :on_cursor_up_callback, :on_cursor_left_callback, :on_cursor_right_callback, :on_space_bar_callback, :on_mouse_button_left_callback
 end

data/lib/fantasy/loop.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 class Game < Gosu::Window
-  def initialize
-    # TODO: require SCREEN_WIDTH and SCREEN_HEIGHT
-    super(SCREEN_WIDTH, SCREEN_HEIGHT)
-    Global.initialize
+  def initialize(screen_width, screen_height)
+    Camera.initialize
+    Global.initialize(screen_width, screen_height)
+
+    super(Global.screen_width, Global.screen_height)
 
-    Global.presentation_proc.call()
+    Global.presentation_proc.call
   end
 
+  # rubocop:disable Metrics/CyclomaticComplexity
   def button_down(button_id)
     case button_id
     when Cursor.down then cursor_down_pressed
@@ -18,73 +22,56 @@ class Game < Gosu::Window
     when Mouse.left then mouse_button_left_pressed
     end
 
-    Global.button_proc.call(button_id) unless Global.button_proc.nil?
+    Global.button_proc&.call(button_id)
 
     super
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def cursor_down_pressed
-    Global.cursor_down_proc.call unless Global.cursor_down_proc.nil?
-    invoke_input_method("on_cursor_down_do")
+    Global.cursor_down_proc&.call
+    invoke_input_method_in_entities("on_cursor_down_do")
   end
 
   def cursor_up_pressed
-    Global.cursor_up_proc.call unless Global.cursor_up_proc.nil?
-    invoke_input_method("on_cursor_up_do")
+    Global.cursor_up_proc&.call
+    invoke_input_method_in_entities("on_cursor_up_do")
   end
 
   def cursor_left_pressed
-    Global.cursor_left_proc.call unless Global.cursor_left_proc.nil?
-    invoke_input_method("on_cursor_left_do")
+    Global.cursor_left_proc&.call
+    invoke_input_method_in_entities("on_cursor_left_do")
   end
 
   def cursor_right_pressed
-    Global.cursor_right_proc.call unless Global.cursor_right_proc.nil?
-    invoke_input_method("on_cursor_right_do")
+    Global.cursor_right_proc&.call
+    invoke_input_method_in_entities("on_cursor_right_do")
   end
 
   def space_bar_pressed
-    Global.space_bar_proc.call unless Global.space_bar_proc.nil?
-    invoke_input_method("on_space_bar_do")
+    Global.space_bar_proc&.call
+    invoke_input_method_in_entities("on_space_bar_do")
   end
 
   def mouse_button_left_pressed
-    Global.mouse_button_left_proc.call unless Global.mouse_button_left_proc.nil?
+    Global.mouse_button_left_proc&.call
 
     check_click
   end
 
-  def invoke_input_method(input_method_name)
-    (
-      Global.actors +
-      Global.shapes
-    ).sort_by(&:layer).each do |e|
-      e.send(input_method_name)
-    end
-  end
-
   def update
     Global.update
 
-    Global.actors.each do |e|
-      e.move
-    end
-
-    Global.hud_texts.each do |e|
-      e.move
-    end
-
-    Global.hud_images.each do |e|
-      e.move
-    end
-
-    Global.camera.move
+    Global.actors.each(&:move)
+    Global.hud_texts.each(&:move)
+    Global.hud_images.each(&:move)
+    Camera.main.move
 
-    Global.loop_proc.call() unless Global.loop_proc.nil?
+    Global.loop_proc&.call
   end
 
   def draw
-    Gosu.draw_rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, Global.background)
+    Gosu.draw_rect(0, 0, Global.screen_width, Global.screen_height, Global.background)
 
     (
       Global.backgrounds +
@@ -93,9 +80,7 @@ class Game < Gosu::Window
       Global.hud_texts +
       Global.hud_images +
       Global.shapes
-    ).sort_by(&:layer).each do |e|
-      e.draw
-    end
+    ).sort_by(&:layer).each(&:draw)
   end
 
   def check_click
@@ -106,4 +91,16 @@ class Game < Gosu::Window
       e.on_click_do if Utils.collision_at?(e, mouse_x, mouse_y)
     end
   end
+
+  private
+
+  def invoke_input_method_in_entities(input_method_name)
+    (
+      Global.actors +
+      Global.shapes
+    ).sort_by(&:layer).each do |e|
+      e.send(input_method_name)
+    end
+  end
+
 end

data/lib/fantasy/mouse.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mouse
   def self.left
     Gosu::MS_LEFT

data/lib/fantasy/music.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Music
   class << self
     @@musics = {}
@@ -13,7 +15,7 @@ module Music
     end
 
     def stop
-      @@actual_song.stop unless @@actual_song.nil?
+      @@actual_song&.stop
     end
 
     def volume
@@ -35,7 +37,7 @@ module Music
 
       @@musics[music_name] = Gosu::Song.new("#{base_path}/#{file_name}")
 
-      return @@musics[music_name]
+      @@musics[music_name]
     end
 
     def preload_musics

data/lib/fantasy/shape.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 class Shape
   include UserInputs
 
   attr_accessor :kind, :position, :width, :height, :stroke, :color, :fill, :stroke_color, :layer
 
+  # rubocop:disable Metrics/ParameterLists
   def initialize(kind:, position:, width:, height:, stroke: 1, fill: true, color: Color.palette.black, stroke_color: nil)
     @kind = kind
     @position = position
@@ -16,9 +19,10 @@ class Shape
 
     Global.shapes << self
   end
+  # rubocop:enable Metrics/ParameterLists
 
-  def self.rectangle(position:, width:, height:, color: Color.palette.black)
-    Shape.new(kind: "rectangle", position: position, width: width, height: height)
+  def self.rectangle(position:, width:, height:, color: Color.palette.black, stroke_color: nil, stroke: 0)
+    Shape.new(kind: "rectangle", position: position, width: width, height: height, color: color)
   end
 
   def draw
@@ -36,20 +40,25 @@ class Shape
 
   private
 
+  # rubocop:disable Style/GuardClause
   def draw_rectangle
     if fill
       Gosu.draw_rect(@position.x, @position.y, @width, @height, @color)
     end
 
+
     unless stroke.zero?
       draw_frame(@position.x, @position.y, @width, @height, @stroke, @stroke_color || @color)
     end
   end
+  # rubocop:enable Style/GuardClause
 
+  # rubocop:disable Metrics/ParameterLists
   def draw_frame(x, y, width, height, stroke, color)
     Gosu.draw_rect(x, y, width, stroke, color)
     Gosu.draw_rect(width - stroke + x, y, stroke, height, color)
     Gosu.draw_rect(x, height - stroke + y, width, stroke, color)
     Gosu.draw_rect(x, y, stroke, height, color)
   end
+  # rubocop:enable Metrics/ParameterLists
 end

data/lib/fantasy/sound.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sound
   class << self
     @@sounds = {}
@@ -17,7 +19,7 @@ module Sound
 
       @@sounds[sound_name] = Gosu::Sample.new("#{base_path}/#{file_name}")
 
-      return @@sounds[sound_name]
+      @@sounds[sound_name]
     end
 
     def preload_sounds