fantasy 0.1.7 → 0.1.13

data/lib/fantasy/hud_text.rb

@@ -1,14 +1,16 @@
 class HudText
-  attr_accessor :text, :size, :color, :visible, :layer, :in_world, :position
+  attr_accessor :text, :size, :color, :background_color, :visible, :layer, :in_world, :position, :alignment
 
   def initialize(position:, text: "")
     @position = position
     @text = text
     @size = "medium"
-    @color = Gosu::Color::WHITE
+    @color = Color.palette.white
+    @background_color = Color.palette.black
     @visible = true
     @layer = 100
     @in_world = false
+    @alignment = "top-left"
 
     Global.hud_texts.push(self)
   end
@@ -17,8 +19,10 @@ class HudText
 
   def draw
     if visible
-      font.draw_markup(text, screen_position.x + shadow_offset, screen_position.y - 20 + shadow_offset, 1, 1, 1, Gosu::Color::BLACK)
-      font.draw_markup(text, screen_position.x, screen_position.y - 20, 1, 1, 1, color)
+      unless @background_color.nil?
+        font.draw_markup_rel(text, screen_position.x + shadow_offset, screen_position.y + shadow_offset, 1, position_rel.x, position_rel.y, 1, 1, background_color)
+      end
+      font.draw_markup_rel(text, screen_position.x, screen_position.y, 1, position_rel.x, position_rel.y, 1, 1, color)
     end
 
     draw_debug if Global.debug
@@ -27,11 +31,37 @@ class HudText
   def font
     found_font = Global.pixel_fonts[@size]
     if found_font.nil?
-      raise "HudText.size not valid '#{@size}'. Valid sizes: 'small, medium, big, huge'"
+      raise "HudText.size value not valid '#{@size}'. Valid values: 'small, medium, big, huge'"
     end
     found_font
   end
 
+  def destroy
+    Global.hud_texts.delete(self)
+  end
+
+  def width
+    font.markup_width(text, 1)
+  end
+
+
+  private
+
+  def position_rel
+    case @alignment
+    when "top-left"
+      Coordinates.new(0, 0)
+    when "top-right"
+      Coordinates.new(1, 0)
+    when "top-center"
+      Coordinates.new(0.5, 0)
+    when "center"
+      Coordinates.new(0.5, 0.5)
+    else
+      raise "HudText.alignment value not valid '#{@alignment}'. Valid values: 'top-left, top-right, top-center, center'"
+    end
+  end
+
   def shadow_offset
     case @size
     when "small"
@@ -43,7 +73,7 @@ class HudText
     when "huge"
       4
     else
-      raise "HudText.size not valid '#{@size}'. Valid sizes: 'small, medium, big, huge'"
+      raise "HudText.size value not valid '#{@size}'. Valid sizes: 'small, medium, big, huge'"
     end
   end
 
@@ -55,11 +85,7 @@ class HudText
     end
   end
 
-  def destroy
-    Global.hud_texts.delete(self)
-  end
-
   def draw_debug
-    Global.pixel_fonts["medium"].draw_text("#{@position.x.floor},#{@position.y.floor}", @position.x, @position.y, 1)
+    Global.pixel_fonts["medium"].draw_text("#{@position.x.floor},#{@position.y.floor}", screen_position.x, screen_position.y, 1)
   end
 end

data/lib/fantasy/image.rb

@@ -23,6 +23,8 @@ class Image
     end
 
     def preload_images
+      return unless Dir.exist?(base_path)
+
       Dir.each_child(base_path) do |file_name|
         locate_image(file_name) unless file_name.start_with?(".")
       end

data/lib/fantasy/includes/gravitier.rb

@@ -0,0 +1,5 @@
+module Gravitier
+  def add_force_by_gravity
+    add_force(Coordinates.down * @gravity)
+  end
+end

data/lib/fantasy/includes/jumper.rb

@@ -0,0 +1,10 @@
+module Jumper
+  def jump
+    add_force(Coordinates.up * @jump_force)
+    @jumping = true
+    @on_floor = false
+    @final_vertical_position = @position.y - @jump_force
+
+    on_jumping_do
+  end
+end

data/lib/fantasy/includes/move_by_cursors.rb

@@ -1,15 +1,43 @@
 module MoveByCursor
-  def calculate_direction_by_cursors
-    if Gosu.button_down?(Gosu::KB_DOWN)
-      @direction = Coordinates.down
-    elsif Gosu.button_down?(Gosu::KB_UP)
-      @direction = Coordinates.up
-    elsif Gosu.button_down?(Gosu::KB_RIGHT)
-      @direction = Coordinates.right
-    elsif Gosu.button_down?(Gosu::KB_LEFT)
-      @direction = Coordinates.left
-    else
-      @direction = Coordinates.zero
+  def move_by_cursors
+    if Gosu.button_down?(Cursor.down) && @move_with_cursors_down
+      move_by(Coordinates.down)
     end
+
+    if Gosu.button_down?(Cursor.up) && @move_with_cursors_up
+      move_by(Coordinates.up)
+    end
+
+    if Gosu.button_down?(Cursor.right) && @move_with_cursors_right
+      move_by(Coordinates.right)
+    end
+
+    if Gosu.button_down?(Cursor.left) && @move_with_cursors_left
+      move_by(Coordinates.left)
+    end
+
+    if Gosu.button_down?(Cursor.space_bar) && !@jumping && @on_floor && @move_with_cursors_jump
+      jump
+    end
+  end
+
+  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
+
+  def move_by(direction)
+    @position += direction * @speed * Global.frame_time
   end
 end

data/lib/fantasy/includes/move_by_direction.rb

@@ -0,0 +1,5 @@
+module MoveByDirection
+  def move_by_direction
+    @position += @direction * @speed * Global.frame_time
+  end
+end

data/lib/fantasy/includes/mover.rb

@@ -0,0 +1,24 @@
+module Mover
+  def impulse(direction:, force:)
+    add_force(direction.normalize * force)
+  end
+
+  def add_force(force)
+    @acceleration ||= Coordinates.zero
+    @acceleration += force
+  end
+
+  def apply_forces(max_speed: Float::INFINITY)
+    @acceleration ||= Coordinates.zero
+    @velocity ||= Coordinates.zero
+
+    @velocity += @acceleration
+    @velocity.resize(max_speed) if @velocity.length > max_speed
+
+    unless @velocity.length.zero?
+      @position += @velocity * Global.frame_time
+    end
+
+    @acceleration = Coordinates.zero
+  end
+end

data/lib/fantasy/includes/user_inputs.rb

@@ -0,0 +1,60 @@
+module UserInputs
+  # Set callbacks
+  def on_cursor_down(&block)
+    @on_cursor_down_callback = block
+  end
+
+  def on_cursor_up(&block)
+    @on_cursor_up_callback = block
+  end
+
+  def on_cursor_left(&block)
+    @on_cursor_left_callback = block
+  end
+
+  def on_cursor_right(&block)
+    @on_cursor_right_callback = block
+  end
+
+  def on_space_bar(&block)
+    @on_space_bar_callback = block
+  end
+
+  def on_mouse_button_left(&block)
+    @on_mouse_button_left_callback = block
+  end
+
+  def on_click(&block)
+    @on_click_callback = block
+  end
+
+  # Execute callbacks
+  def on_cursor_down_do
+    instance_exec(&@on_cursor_down_callback) unless @on_cursor_down_callback.nil?
+  end
+
+  def on_cursor_up_do
+    instance_exec(&@on_cursor_up_callback) unless @on_cursor_up_callback.nil?
+  end
+
+  def on_cursor_left_do
+    instance_exec(&@on_cursor_left_callback) unless @on_cursor_left_callback.nil?
+  end
+
+  def on_cursor_right_do
+    instance_exec(&@on_cursor_right_callback) unless @on_cursor_right_callback.nil?
+  end
+
+  def on_space_bar_do
+    instance_exec(&@on_space_bar_callback) unless @on_space_bar_callback.nil?
+  end
+
+  def on_mouse_button_left_do
+    instance_exec(&@on_mouse_button_left_callback) unless @on_mouse_button_left_callback.nil?
+  end
+
+  def on_click_do
+    puts "XXX: on_click_do: #{@on_click_callback}"
+    instance_exec(&@on_click_callback) unless @on_click_callback.nil?
+  end
+end

data/lib/fantasy/loop.rb

@@ -9,13 +9,13 @@ class Game < Gosu::Window
 
   def button_down(button_id)
     case button_id
-    when Gosu::KB_DOWN then Global.cursor_down_proc.call unless Global.cursor_down_proc.nil?
-    when Gosu::KB_UP then Global.cursor_up_proc.call unless Global.cursor_up_proc.nil?
-    when Gosu::KB_LEFT then Global.cursor_left_proc.call unless Global.cursor_left_proc.nil?
-    when Gosu::KB_RIGHT then Global.cursor_right_proc.call unless Global.cursor_right_proc.nil?
-    when Gosu::MS_LEFT then Global.mouse_button_left_proc.call unless Global.mouse_button_left_proc.nil?
-    when Gosu::MS_RIGHT then Global.mouse_button_right_proc.call unless Global.mouse_button_right_proc.nil?
-    when Gosu::KB_SPACE then Global.space_bar_proc.call unless Global.space_bar_proc.nil?
+    when Cursor.down then cursor_down_pressed
+    when Cursor.up then cursor_up_pressed
+    when Cursor.left then cursor_left_pressed
+    when Cursor.right then cursor_right_pressed
+    when Cursor.space_bar then space_bar_pressed
+
+    when Mouse.left then mouse_button_left_pressed
     end
 
     Global.button_proc.call(button_id) unless Global.button_proc.nil?
@@ -23,6 +23,46 @@ class Game < Gosu::Window
     super
   end
 
+  def cursor_down_pressed
+    Global.cursor_down_proc.call unless Global.cursor_down_proc.nil?
+    invoke_input_method("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")
+  end
+
+  def cursor_left_pressed
+    Global.cursor_left_proc.call unless Global.cursor_left_proc.nil?
+    invoke_input_method("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")
+  end
+
+  def space_bar_pressed
+    Global.space_bar_proc.call unless Global.space_bar_proc.nil?
+    invoke_input_method("on_space_bar_do")
+  end
+
+  def mouse_button_left_pressed
+    Global.mouse_button_left_proc.call unless Global.mouse_button_left_proc.nil?
+
+    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
 
@@ -51,9 +91,19 @@ class Game < Gosu::Window
       Global.tile_maps +
       Global.actors +
       Global.hud_texts +
-      Global.hud_images
+      Global.hud_images +
+      Global.shapes
     ).sort_by(&:layer).each do |e|
       e.draw
     end
   end
+
+  def check_click
+    (
+      Global.actors +
+      Global.shapes
+    ).sort_by(&:layer).each do |e|
+      e.on_click_do if Utils.collision_at?(e, mouse_x, mouse_y)
+    end
+  end
 end

data/lib/fantasy/mouse.rb

@@ -0,0 +1,9 @@
+module Mouse
+  def self.left
+    Gosu::MS_LEFT
+  end
+
+  def self.right
+    Gosu::MS_RIGHT
+  end
+end

data/lib/fantasy/music.rb

@@ -0,0 +1,53 @@
+module Music
+  class << self
+    @@musics = {}
+    @@actual_song = nil
+
+    def play(music_name, volume: nil)
+      stop
+
+      @@actual_song = locate_music(music_name)
+      @@actual_song.play(true)
+
+      self.volume = volume unless volume.nil?
+    end
+
+    def stop
+      @@actual_song.stop unless @@actual_song.nil?
+    end
+
+    def volume
+      @@actual_song&.volume
+    end
+
+    def volume=(value)
+      @@actual_song.volume = value unless @@actual_song.nil?
+    end
+
+    def locate_music(music_name)
+      return @@musics[music_name] if @@musics[music_name]
+
+      puts "Initialize Music: '#{music_name}'"
+
+      file_name = Dir.entries(base_path).find { |e| e =~ /^#{music_name}($|\.)/ }
+
+      raise "Music file not found with name '#{music_name}'" if file_name.nil?
+
+      @@musics[music_name] = Gosu::Song.new("#{base_path}/#{file_name}")
+
+      return @@musics[music_name]
+    end
+
+    def preload_musics
+      return unless Dir.exist?(base_path)
+
+      Dir.each_child(base_path) do |file_name|
+        locate_music(file_name) unless file_name.start_with?(".")
+      end
+    end
+
+    def base_path
+      "#{Dir.pwd}/musics"
+    end
+  end
+end

data/lib/fantasy/shape.rb

@@ -0,0 +1,55 @@
+class Shape
+  include UserInputs
+
+  attr_accessor :kind, :position, :width, :height, :stroke, :color, :fill, :stroke_color, :layer
+
+  def initialize(kind:, position:, width:, height:, stroke: 1, fill: true, color: Color.palette.black, stroke_color: nil)
+    @kind = kind
+    @position = position
+    @width = width
+    @height = height
+    @stroke = stroke
+    @color = color
+    @fill = fill
+    @stroke_color = stroke_color
+    @layer = 1
+
+    Global.shapes << self
+  end
+
+  def self.rectangle(position:, width:, height:, color: Color.palette.black)
+    Shape.new(kind: "rectangle", position: position, width: width, height: height)
+  end
+
+  def draw
+    case @kind
+    when "rectangle"
+      draw_rectangle
+    else
+      raise "Shape.kind not supported: '#{@kind}'. Supported kinds: 'rectangle'"
+    end
+  end
+
+  def destroy
+    Global.shapes.delete(self)
+  end
+
+  private
+
+  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
+
+  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
+end

data/lib/fantasy/sound.rb

@@ -2,8 +2,8 @@ module Sound
   class << self
     @@sounds = {}
 
-    def play(sound_name)
-      locate_sound(sound_name).play
+    def play(sound_name, volume: 1)
+      locate_sound(sound_name).play(volume)
     end
 
     def locate_sound(sound_name)
@@ -21,6 +21,8 @@ module Sound
     end
 
     def preload_sounds
+      return unless Dir.exist?(base_path)
+
       Dir.each_child(base_path) do |file_name|
         locate_sound(file_name) unless file_name.start_with?(".")
       end

data/lib/fantasy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fantasy
-  VERSION = "0.1.7"
+  VERSION = "0.1.13"
 end

data/lib/fantasy.rb

@@ -2,12 +2,21 @@
 require "gosu"
 
 require_relative "fantasy/version"
+
+require_relative "fantasy/coordinates"
+require_relative "fantasy/cursor"
+require_relative "fantasy/mouse"
 require_relative "fantasy/includes/move_by_cursors"
+require_relative "fantasy/includes/move_by_direction"
+require_relative "fantasy/includes/mover"
+require_relative "fantasy/includes/gravitier"
+require_relative "fantasy/includes/jumper"
+require_relative "fantasy/includes/user_inputs"
 require_relative "fantasy/tween"
 require_relative "fantasy/draggable"
 require_relative "fantasy/color"
+require_relative "fantasy/shape"
 require_relative "fantasy/actor"
-require_relative "fantasy/coordinates"
 require_relative "fantasy/utils"
 require_relative "fantasy/global"
 require_relative "fantasy/clock"
@@ -16,7 +25,9 @@ require_relative "fantasy/hud_text"
 require_relative "fantasy/hud_image"
 require_relative "fantasy/background"
 require_relative "fantasy/sound"
+require_relative "fantasy/music"
 require_relative "fantasy/camera"
 require_relative "fantasy/image"
 require_relative "fantasy/tilemap"
 require_relative "fantasy/base"
+require_relative "fantasy/disk"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fantasy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.13
 platform: ruby
 authors:
 - Fernando Guillen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".rubocop.yml"
 - CHANGELOG.md
+- COLOR_PALETTE.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -64,13 +65,23 @@ files:
 - lib/fantasy/clock.rb
 - lib/fantasy/color.rb
 - lib/fantasy/coordinates.rb
+- lib/fantasy/cursor.rb
+- lib/fantasy/disk.rb
 - lib/fantasy/draggable.rb
 - lib/fantasy/global.rb
 - lib/fantasy/hud_image.rb
 - lib/fantasy/hud_text.rb
 - lib/fantasy/image.rb
+- lib/fantasy/includes/gravitier.rb
+- lib/fantasy/includes/jumper.rb
 - lib/fantasy/includes/move_by_cursors.rb
+- lib/fantasy/includes/move_by_direction.rb
+- lib/fantasy/includes/mover.rb
+- lib/fantasy/includes/user_inputs.rb
 - lib/fantasy/loop.rb
+- lib/fantasy/mouse.rb
+- lib/fantasy/music.rb
+- lib/fantasy/shape.rb
 - lib/fantasy/sound.rb
 - lib/fantasy/tilemap.rb
 - lib/fantasy/tween.rb