fantasy 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98083689a972e68c27f07ae5c9c8ef9818c1b1215fbf2baccc541233efca6827
-  data.tar.gz: db32ef03fd54c4711b9b38b9f4e3f4ad587839fc4d78523982c6c69f85cb0ab4
+  metadata.gz: fe5958bf098b2f7a0190eecbd5a9914c5a232e38863b4e9a19280b44653d771a
+  data.tar.gz: fa8899b7f6f6c04cda1e3ee6d470e940e377395b403d6dd3cddcdbf39583cc30
 SHA512:
-  metadata.gz: 5a6d2c503880c672d147909cd5ab5a88639ab4e3e019ea5b81601c4aa0cc967e03e5c8b48f1994309ab379e83012f5a103043ba6b64989ba8009d2c7e3950174
-  data.tar.gz: 93f37ba3a6fde17d55ba7aa203a1ade6645e69af8d670d37b5a7d78442c5c1dc4bb115784520cbd5b6a9ef661b18e6dbc2b094dab4c2a54feca8d37e4c527303
+  metadata.gz: 7c7830aca33b0a07482782f644301c854f9017ed10bc4602435945a70901e60fdd01adae8ed757f4ecb3a07a51e0b4279a273dbe149c665472e75e7c32e80f28
+  data.tar.gz: 5fee0000ec447edd1849592ab3f5145214d4a84dcf983bf1fff9c05a5ac3655d99bf519d4760ebaba2fadba6194dbf697468cd2483d0b3a77e8ab1611210eb65

data/lib/fantasy/actor.rb

@@ -80,13 +80,12 @@ class Actor
         @position = @position + (@direction * @speed * Global.frame_time)
 
         if solid?
-          actual_collisions = collisions
-          actual_collisions.each do |actor|
+          collisions.each do |actor|
             collision_with(actor)
             actor.collision_with(self)
           end
 
-          @position = @last_position if actual_collisions.any?
+          @position = @last_position if collisions.any? # we don't cache collisions because position may be changed on collision callback
         end
       end
     end

data/lib/fantasy/background.rb

@@ -0,0 +1,34 @@
+class Background
+  attr_accessor :scale, :color, :visible, :position, :layer
+
+  def initialize(image_name:)
+    @image = Image.new(image_name)
+    @name = image_name
+    @position = Coordinates.zero
+    @scale = 1
+    @visible = true
+    @draggable_on_debug = true
+    @dragging = false
+    @layer = -100
+
+    Global.backgrounds.push(self)
+  end
+
+  def width
+    @image.width() * @scale
+  end
+
+  def height
+    @image.height() * @scale
+  end
+
+  def draw
+    if visible
+      @image.draw(x: @position.x, y: @position.y, scale: @scale)
+    end
+  end
+
+  def destroy
+    Global.backgrounds.delete(self)
+  end
+end

data/lib/fantasy/clock.rb

@@ -1,7 +1,10 @@
 class Clock
+  attr_accessor :persistent
+
   def initialize(&block)
     @block = block
     @thread = nil
+    @persistent = false # if persistent, clock is not stopped when loading new scene
 
     Global.clocks << self
   end
@@ -28,12 +31,22 @@ class Clock
         while(times_executed < times)
           @block.call
           times_executed += 1;
-          sleep(seconds)
+
+          seconds_to_sleep = seconds.is_a?(Range) ? rand(seconds) : seconds
+          sleep(seconds_to_sleep)
         end
       end
   end
 
   def stop
-    Thread.kill(@thread)
+    Thread.kill(@thread) unless @thread.nil?
+  end
+
+  def started?
+    !@thread.nil?
+  end
+
+  def persistent?
+    @persistent
   end
 end

data/lib/fantasy/draggable.rb

@@ -1,26 +1,17 @@
 module Draggable
   def drag
-    puts "XXX: dragging 1 #{name}"
     mouse_position = Global.mouse_position
 
-    puts "@draggable_on_debug: #{@draggable_on_debug}"
-    puts "@dragging: #{@dragging}"
-    puts "Gosu.button_down?(Gosu::MS_LEFT): #{Gosu.button_down?(Gosu::MS_LEFT)}"
-    puts "collision: #{Utils.collision_at?(self, mouse_position.x, mouse_position.y)}"
-
     if @draggable_on_debug && !@dragging && Gosu.button_down?(Gosu::MS_LEFT) && Utils.collision_at?(self, mouse_position.x, mouse_position.y)
-      puts "XXX: dragging start #{name}"
       @dragging = true
       @dragging_offset = mouse_position - @position
     end
 
     if @dragging && !Gosu.button_down?(Gosu::MS_LEFT)
-      puts "XXX: dragging end #{name}"
       @dragging = false
     end
 
     if @dragging
-      puts "XXX: dragging 3 #{name}"
       @position = mouse_position - @dragging_offset
     end
   end

data/lib/fantasy/global.rb

@@ -2,7 +2,7 @@ require "ostruct"
 
 module Global
   class << self
-    attr_accessor :actors, :hud_texts, :hud_images, :clocks
+    attr_accessor :actors, :hud_texts, :hud_images, :backgrounds, :clocks
     attr_accessor :debug
     attr_accessor :setup_proc, :loop_proc, :button_proc
     attr_accessor :presentation_proc, :game_proc, :end_proc
@@ -25,6 +25,7 @@ module Global
       @actors = []
       @hud_texts = []
       @hud_images = []
+      @backgrounds = []
       @clocks = []
       @last_frame_at = Time.now
       @debug = false
@@ -34,10 +35,17 @@ module Global
       @camera = Camera.new(position: Coordinates.zero)
       @game_state = Global.presentation_proc.nil? ? "game" : "presentation"
 
-      @presentation_proc = Global.default_on_presentation if @presentation_proc.nil?
-      @game_proc = Global.default_on_game if @game_proc.nil?
-      @end_proc = Global.default_on_end if @end_proc.nil?
-      @paused = false
+      if @presentation_proc.nil?
+        on_presentation { Global.default_on_presentation  }
+      end
+
+      if @game_proc.nil?
+        on_game { Global.default_on_game  }
+      end
+
+      if @end_proc.nil?
+        on_end { Global.default_on_end  }
+      end
     end
 
     def update
@@ -74,7 +82,7 @@ module Global
       puts "Game stage 'presentation'"
 
       clear_state_elements
-      presentation_proc.call
+      @presentation_proc.call
     end
 
     def go_to_game
@@ -95,7 +103,8 @@ module Global
       @actors.clear
       @hud_texts.clear
       @hud_images.clear
-      @clocks.each(&:stop)
+      @backgrounds.clear
+      @clocks.reject(&:persistent?).each(&:stop)
       @background = Color.new(r: 0, g: 0, b: 0)
     end
 

data/lib/fantasy/loop.rb

@@ -45,6 +45,7 @@ class Game < Gosu::Window
     Gosu.draw_rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, Global.background)
 
     (
+      Global.backgrounds +
       Global.actors +
       Global.hud_texts +
       Global.hud_images

data/lib/fantasy/utils.rb

@@ -1,12 +1,15 @@
 module Utils
   # https://developer.mozilla.org/en-US/docs/Games/Techniques/2D_collision_detection
   def self.collision?(actor_1, actor_2)
-    (
-      actor_1.position.x < (actor_2.position.x + actor_2.width) &&
-      (actor_1.position.x + actor_1.width) > actor_2.position.x &&
-      actor_1.position.y < (actor_2.position.y + actor_2.height) &&
-      actor_1.position.y + actor_1.height > actor_2.position.y
-    )
+    result =
+      (
+        actor_1.position.x < (actor_2.position.x + actor_2.width) &&
+        (actor_1.position.x + actor_1.width) > actor_2.position.x &&
+        actor_1.position.y < (actor_2.position.y + actor_2.height) &&
+        actor_1.position.y + actor_1.height > actor_2.position.y
+      )
+
+    result
   end
 
   def self.collision_at?(actor, x, y)

data/lib/fantasy/version.rb

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

data/lib/fantasy.rb

@@ -12,6 +12,7 @@ require_relative "fantasy/clock"
 require_relative "fantasy/loop"
 require_relative "fantasy/hud_text"
 require_relative "fantasy/hud_image"
+require_relative "fantasy/background"
 require_relative "fantasy/sound"
 require_relative "fantasy/camera"
 require_relative "fantasy/image"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fantasy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Fernando Guillen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -58,6 +58,7 @@ files:
 - fonts/VT323-Regular.ttf
 - lib/fantasy.rb
 - lib/fantasy/actor.rb
+- lib/fantasy/background.rb
 - lib/fantasy/base.rb
 - lib/fantasy/camera.rb
 - lib/fantasy/clock.rb