author_engine 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240a86f7ca8210f55b1000684999a28d178bb8aee05816924c09987279930acb
-  data.tar.gz: b020c530b4e217ff3b2c6fa8f956eae3a7faef8c3e07de8226fdbd239a0adec9
+  metadata.gz: cdf3e00f6f0e8840311bc2fb5c77c7dfe56c0bf9de8efa7cb310468b649d4ff4
+  data.tar.gz: b32cfb362b8bdfe3c408ac8e113082c94c68faaa2475afbc91b8e97ffdee2ffe
 SHA512:
-  metadata.gz: 979bd0fc59a1767dede59ca38f1ac63965beb8c538c95c25fd824d7d5c0b4449508d83f4dec6bc2e4b0d8c046f37f35c1995da4f2460e4d9562534d59b4e41fd
-  data.tar.gz: d105fe0793a73d82bb36c69623a031ad0a45ffd0dfbae4027a55e4a77e05bcd75be360fc9fa8427080a2ab1dc4f993f87065a63b0fdbb7e1ec89c99dbc2649d6
+  metadata.gz: 0ddf727d607cd61cf2aa34551c8489cc8af8af44c26c263eed9faac1f0ac7ff0563ccbe8ea400a4762d050f08f6a76e40d874484770ee833d28340de3bdb66fd
+  data.tar.gz: 91335c5c61622bb198535bb62bd15b5ad3db5eb10f2aa290dfc3b7ff7bc05e96b5ed270834eca6ee25721d1ace97bd30c9587746eabaa3f4217cfd236a8d7560

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    author_engine (0.5.0)
+    author_engine (0.6.0)
       coderay (~> 1.1.2)
       gosu (~> 0.14.4)
       opal (~> 0.11.4)

data/lib/author_engine/containers/loader.rb

@@ -2,8 +2,17 @@ class AuthorEngine
   class Loader < Container
     Project = Struct.new(:name, :block)
     def setup
-      @root_directory = Dir.pwd#"#{Dir.home}/AuthorEngineProjects"
-      Dir.mkdir(@root_directory) unless File.exists?(@root_directory)
+      if ARGV[0] && File.exists?(ARGV[0]) && Gosu.milliseconds < 1500
+        if ARGV[0].end_with?(".authorengine")
+          load(ARGV[0])
+          return
+        elsif File.directory?(ARGV[0])
+          @root_directory = ARGV[0]
+        else
+          puts "AuthorEngine: #{ARGV[0]} is not a compatible file."
+        end
+      end
+      @root_directory ||= Dir.pwd #"#{Dir.home}/AuthorEngineProjects"
 
       @list = []
       @files = Dir.glob(@root_directory+"/*.authorengine")
@@ -27,13 +36,9 @@ class AuthorEngine
       end
       @new_button.x = window.width - @new_button.width
 
-      if ARGV[0] && File.exists?(ARGV[0])
-        if ARGV[0].end_with?(".authorengine")
-          load(ARGV[0])
-        else
-          puts "AuthorEngine: #{ARGV[0]} is not a compatible file."
-        end
-      end
+      @draw_caret = true
+      @last_caret_update = Gosu.milliseconds
+      @caret_interval = 500
     end
 
     def load(filename)
@@ -53,8 +58,23 @@ class AuthorEngine
     end
 
     def draw_inputter
+      caret_x = @font.text_width(window.text_input.text[0..window.text_input.caret_pos-1])
+      caret_x = 0 if window.text_input.caret_pos == 0
+      if Gosu.milliseconds > @last_caret_update + @caret_interval
+        @draw_caret = !@draw_caret
+        @last_caret_update = Gosu.milliseconds
+      end
+
       x = window.width/2 - @font.text_width(window.text_input.text+".authorengine")/2
+      error_x = window.width/2 - @font.text_width(window.text_input.text.strip+".authorengine already exists!")/2
       y = window.height/2 - @font.height/2
+
+      Gosu.draw_rect(x+caret_x, y, 2, @font.height, Gosu::Color::WHITE) if @draw_caret
+      if window.text_input.text.strip+".authorengine" == @name_exists
+        @font.draw_text(window.text_input.text.strip+".authorengine already exists!", error_x, y - 32, 0, 1,1, red) if @name_exists
+      else
+        @name_exists = false
+      end
       @font.draw_text(window.text_input.text+".authorengine", x, y, 0)
     end
 
@@ -100,12 +120,22 @@ class AuthorEngine
         @index = 0 if @list.size == 0
         @index = @index % @list.size-1 if @list.size != 0
       when Gosu::KbEnter, Gosu::KbReturn
+        filename = window.text_input.text.strip if window.text_input
+
         if @entering_name
-          SaveFile.create(window.text_input.text.strip+".authorengine")
-          load(window.text_input.text.strip+".authorengine")
+          if File.exists?(filename)
+            @name_exists = filename
+          else
+            window.text_input = nil
+            savefile = SaveFile.create(filename+".authorengine")
+            load(filename+".authorengine")
+          end
         else
           @list[@index].block.call if @list[@index]&.block
         end
+      when Gosu::KbEscape
+        @entering_name = false
+        window.text_input = nil
       end
     end
   end

data/lib/author_engine/game/common/parts/common.rb

@@ -1,14 +1,17 @@
 class AuthorEngine
   class Part
     module Common
+      # returns display width
       def width
         128
       end
 
+      # returns display height
       def height
         128
       end
 
+      # returns frames per seconds
       def fps
         if RUBY_ENGINE == "opal"
           AuthorEngine::GameRunner.instance.fps
@@ -17,6 +20,14 @@ class AuthorEngine
         end
       end
 
+      def distance(x1, y1, x2, y2)
+        dx = x2 - x1
+        dy = y2 - y1
+
+        Math.sqrt(dx * dx + dy * dy)
+      end
+
+      # returns number of milliseconds since game started
       def milliseconds
         if RUBY_ENGINE == "opal"
           @__initial_milliseconds ||= `performance.now()`

data/lib/author_engine/game/opal/game_runner.rb

@@ -44,38 +44,18 @@ class AuthorEngine
       @game.init
 
       @show_touch_controls = false
+      @touch_joystick = TouchJoystick.new(x: 100, radius: 50, side: :left)
       @touch_buttons = []
-      buttons = AuthorEngine::Part::OpalInput::BUTTONS
-      key_states = AuthorEngine::Part::OpalInput::KEY_STATES
       @touch_buttons.push(
         TouchButton.new(
-          label: "Up", color: @game.dark_gray, x: 137, y: `window.innerHeight/2 - #{125}`, width: 50, height: 50, side: :left,
-          contact_proc: proc { key_states[buttons["up"]] = true}, no_contact_proc: proc { key_states[buttons["up"]] = false}
-        ),
+          label: "X", color: @game.red, x: 50, width: 50, height: 50, side: :right, for_key: "x"
+          ),
         TouchButton.new(
-          label: "Down", color: @game.dark_gray, x: 137, y: `window.innerHeight/2 + 25`, width: 50, height: 50, side: :left,
-          contact_proc: proc { key_states[buttons["down"]] = true}, no_contact_proc: proc { key_states[buttons["down"]] = false}
-        ),
-
-        TouchButton.new(
-          label: "Left", color: @game.black, x: 175, width: 50, height: 50, side: :left,
-          contact_proc: proc { key_states[buttons["left"]] = true}, no_contact_proc: proc { key_states[buttons["left"]] = false}
-        ),
-        TouchButton.new(
-          label: "Right", color: @game.black, x: 100, width: 50, height: 50, side: :left,
-          contact_proc: proc { key_states[buttons["right"]] = true}, no_contact_proc: proc { key_states[buttons["right"]] = false}
-        ),
-
-
-        TouchButton.new(
-          label: "X", color: @game.red, x: 50, width: 50, height: 50, side: :right,
-          contact_proc: proc { key_states[buttons["x"]] = true}, no_contact_proc: proc { key_states[buttons["x"]] = false}
-        ),
-        TouchButton.new(
-          label: "Y", color: @game.yellow, x: 125, width: 50, height: 50, side: :right,
-          contact_proc: proc { key_states[buttons["y"]] = true}, no_contact_proc: proc { key_states[buttons["y"]] = false}
+          label: "Y", color: @game.yellow, x: 125, width: 50, height: 50, side: :right, for_key: "y"
         )
       )
+
+      @fullscreen_button = TouchButton.new(label: "Fullscreen", color: @game.black, x: 50, y: 10, width: 100, height: 50, side: :right)
       touch_handler_setup
 
       return self
@@ -95,6 +75,8 @@ class AuthorEngine
     def run_game
       `window.requestAnimationFrame(function() {#{run_game}})` # placed here to ensure next frame is called even if draw or update throw an error
       `#{@game.canvas_context}.clearRect(0,0, window.innerWidth, window.innerHeight)`
+      `#{@game.canvas_context}.fillStyle = "#222"`
+      `#{@game.canvas_context}.fillRect(0,0, window.innerWidth, window.innerHeight)`
 
       @counted_frames+=1
 
@@ -139,22 +121,17 @@ class AuthorEngine
     end
 
     def draw_touch_controls
+      @fullscreen_button.draw
       @touch_buttons.each(&:draw)
+      @touch_joystick.draw
     end
 
     def update_touch_controls
-      active_buttons = []
-
-      @touch_buttons.each do |button|
-        @current_touches.each do |id, touch|
-          if touch.x.between?(button.x, button.x+button.width) && touch.y.between?(button.y, button.y+button.height)
-            active_buttons << button
-            button.active
-          end
-        end
-      end
+      @touch_buttons.each { |button| button.trigger?(@current_touches) }
+      @touch_joystick.update(@current_touches)
+    end
 
-      (@touch_buttons - active_buttons).each(&:inactive)
+    def reposition_touch_controls
     end
 
     def resize_canvas
@@ -173,6 +150,8 @@ class AuthorEngine
       `#{@game.canvas}.style.height = #{height}`
 
       `#{@game.canvas_context}.imageSmoothingEnabled = false`
+
+      reposition_touch_controls
       return nil
     end
 
@@ -221,19 +200,26 @@ class AuthorEngine
       return nil
     end
 
+    def fullscreen_changed
+      resize_canvas
+    end
+
     def show(update_interval = (1000.0 / 60))
       return unless RUBY_ENGINE == "opal"
 
       `window.addEventListener('resize', () => { #{resize_canvas} })`
-      `document.addEventListener('keydown', (event) => { #{AuthorEngine::Part::OpalInput::KEY_STATES[`event.key`] = true} })`
+      `document.addEventListener('keydown', (event) => { #{@show_touch_controls = false; AuthorEngine::Part::OpalInput::KEY_STATES[`event.key`] = true} })`
       `document.addEventListener('keyup',   (event) => { #{AuthorEngine::Part::OpalInput::KEY_STATES[`event.key`] = false} })`
 
-      `#{@game.canvas}.addEventListener('touchstart',  (event) => { #{@show_touch_controls = true; handle_touch_start(`event`); puts "Touch started..."} })`
-      `#{@game.canvas}.addEventListener('touchmove',   (event) => { #{handle_touch_move(`event`); puts "Touch moved..."} })`
-      `#{@game.canvas}.addEventListener('touchcancel', (event) => { #{handle_touch_cancel(`event`); puts "Touch canceled."} })`
-      `#{@game.canvas}.addEventListener('touchend',    (event) => { #{handle_touch_end(`event`); puts "Touch Ended."} })`
+      `#{@game.canvas}.addEventListener('touchstart',  (event) => { #{@show_touch_controls = true; handle_touch_start(`event`)} })`
+      `#{@game.canvas}.addEventListener('touchmove',   (event) => { #{handle_touch_move(`event`)} })`
+      `#{@game.canvas}.addEventListener('touchcancel', (event) => { #{handle_touch_cancel(`event`)} })`
+      `#{@game.canvas}.addEventListener('touchend',    (event) => { #{handle_touch_end(`event`)} })`
+
+      `#{@game.canvas}.addEventListener('fullscreenchange',    () => { #{fullscreen_changed} })`
 
       `document.getElementById('loading').style.display = "none"`
+
       `window.requestAnimationFrame(function() {#{run_game}})`
       return nil
     end

data/lib/author_engine/game/opal/parts/graphics.rb

@@ -45,7 +45,7 @@ class AuthorEngine
         _level = AuthorEngine::GameRunner.instance.levels[level]
         raise "No level at '#{index}'!" unless _level
         raise "No sprite at '#{current_sprite}'!" unless AuthorEngine::GameRunner.instance.sprites[current_sprite]
-        raise "No sprite at '#{current_sprite}'!" unless AuthorEngine::GameRunner.instance.sprites[replacement_sprite]
+        raise "No sprite at '#{replacement_sprite}'!" unless AuthorEngine::GameRunner.instance.sprites[replacement_sprite]
 
         _level.each {|sprite| sprite.sprite = replacement_sprite if sprite.sprite == current_sprite}
       end

data/lib/author_engine/game/opal/touch_button.rb

@@ -1,9 +1,13 @@
 class AuthorEngine
   class TouchButton
     attr_reader :x, :y, :width, :height
-    def initialize(label:, color:, x:, y: nil, width:, height:, side:, contact_proc:, no_contact_proc:)
+    def initialize(label:, color:, x:, y: nil, width:, height:, side:, for_key: nil, &block)
       @label, @color, @x, @y, @width, @height = label, color, x, y, width, height
-      @side, @contact_proc, @no_contact_proc = side, contact_proc, no_contact_proc
+      @side, @for_key = side, for_key
+      @block = block
+
+      @buttons    = AuthorEngine::Part::OpalInput::BUTTONS
+      @key_states = AuthorEngine::Part::OpalInput::KEY_STATES
 
       @game       = AuthorEngine::GameRunner.instance.game
       @game_width = 128 * @game.scale
@@ -17,20 +21,46 @@ class AuthorEngine
         raise "side must be :left or :right"
       end
 
-      @y = `window.innerHeight/2 - #{height}` unless @y.is_a?(Numeric)
+      @y = `window.innerHeight/2 - #{height/2}` unless @y.is_a?(Numeric)
     end
 
     def draw
       `#{@game.canvas_context}.fillStyle = #{@color}`
-      `#{@game.canvas_context}.fillRect(#{@x}, #{@y}, #{width}, #{width})`
+      `#{@game.canvas_context}.fillRect(#{@x}, #{@y}, #{@width}, #{@height})`
+
+      font = "#{@height}px Connection, Consolas"
+      `#{@game.canvas_context}.font = #{font}`
+      `#{@game.canvas_context}.fillStyle = "white"`
+      `#{@game.canvas_context}.textBaseline = "top"`
+      `#{@game.canvas_context}.fillText(#{@label}, #{@x}, #{@y}, #{@width})`
+    end
+
+    def trigger?(touches)
+      triggered = false
+
+      touches.detect do |id, touch|
+        if touch.x.between?(@x, @x+@width) && touch.y.between?(@y, @y+@height)
+          triggered = true
+        end
+      end
+
+
+      if @for_key
+        active if triggered
+        inactive unless triggered
+      else
+        @block.call if @block && triggered
+      end
+
+      return triggered
     end
 
     def active
-      @contact_proc.call
+      @key_states[@buttons[@for_key]] = true
     end
 
     def inactive
-      @no_contact_proc.call
+      @key_states[@buttons[@for_key]] = false
     end
   end
 end

data/lib/author_engine/game/opal/touch_handler.rb

@@ -1,12 +1,21 @@
 class AuthorEngine
   module TouchHandler
-    Touch = Struct.new(:x, :y)
+    Touch = Struct.new(:origin_x, :origin_y, :x, :y)
     def touch_handler_setup
       @current_touches = {}
     end
 
     def copy_touch(touch)
-      Touch.new(`touch.pageX`, `touch.pageY`)
+      Touch.new(`touch.pageX`, `touch.pageY`, `touch.pageX`, `touch.pageY`)
+    end
+
+    def set_touch(touch)
+      struct = @current_touches[`#{touch}.identifier`]
+
+      struct.x = `#{touch}.pageX`
+      struct.y = `#{touch}.pageY`
+
+      return nil
     end
 
     def handle_touch_start(event)
@@ -17,6 +26,14 @@ class AuthorEngine
         #{@current_touches[`touches[i].identifier`] = copy_touch(`touches[i]`)}
       }`
 
+      if @fullscreen_button && @fullscreen_button.trigger?(@current_touches)
+        `if (document.fullscreenElement == null && #{@game.canvas}.requestFullscreen) {
+          #{game.canvas}.requestFullscreen()
+        } else if(document.fullscreenElement != null && document.exitFullscreen) {
+          document.exitFullscreen()
+        } `
+      end
+
       return nil
     end
 
@@ -25,7 +42,7 @@ class AuthorEngine
 
       touches = `#{event}.changedTouches`
       `for (var i = 0; i < #{touches}.length; i++) {
-        #{@current_touches[`touches[i].identifier`] = copy_touch(`touches[i]`)}
+        #{set_touch(`touches[i]`)}
       }`
 
       return nil

data/lib/author_engine/game/opal/touch_joystick.rb

@@ -0,0 +1,122 @@
+class AuthorEngine
+  class TouchJoystick
+    def initialize(x:, y: nil, radius:, side:, background: nil, color: nil)
+      @x, @y, @radius, @side, @background, @color = x, y, radius, side, background, color
+
+      @buttons    = AuthorEngine::Part::OpalInput::BUTTONS
+      @key_states = AuthorEngine::Part::OpalInput::KEY_STATES
+
+      @game       = AuthorEngine::GameRunner.instance.game
+      @game_width = 128 * @game.scale
+      @game_x     = `window.innerWidth/2 - #{@game_width/2}`
+
+      if @side == :left
+        @x = @game_x-@x
+      elsif @side == :right
+        @x = @game_x+@game_width+@x
+      else
+        raise "side must be :left or :right"
+      end
+
+      @y = `window.innerHeight/2` unless @y.is_a?(Numeric)
+      @color = @game.dark_gray unless @color
+      @background = @game.light_gray unless @background
+
+      @joystick_x, @joystick_y, @joystick_radius = @x, @y, @radius/2
+    end
+
+    def draw
+      # Background
+      `#{@game.canvas_context}.fillStyle = #{@background}`
+      `#{@game.canvas_context}.beginPath()`
+      `#{@game.canvas_context}.arc(#{@x}, #{@y}, #{@radius}, 0, 2 * Math.PI)`
+      `#{@game.canvas_context}.fill()`
+
+      # Joystick
+      `#{@game.canvas_context}.beginPath()`
+      `#{@game.canvas_context}.fillStyle = #{@color}`
+      `#{@game.canvas_context}.arc(#{@joystick_x}, #{@joystick_y}, #{@joystick_radius}, 0, 2 * Math.PI)`
+      `#{@game.canvas_context}.fill()`
+
+      return nil
+    end
+
+    def circles_collide?(x,y, radius, x2,y2, radius2)
+      radii = radius + radius2
+
+      if @game.distance(x,y, x2,y2) < radii
+        return true
+      else
+        return false
+      end
+    end
+
+    def update(touches)
+      touch_detected = false
+
+      touches.detect do |id, touch|
+        if circles_collide?(@x, @y, @radius, touch.origin_x, touch.origin_y, 1)
+          touch_detected = true
+
+          _distance = @game.distance(@x,@y, touch.x,touch.y).clamp(0, @radius)
+          _direction = Math.atan2(touch.y - @y, touch.x - @x)
+
+          @joystick_x = @x +(_distance * Math.cos(_direction))
+          @joystick_y = @y +(_distance * Math.sin(_direction))
+
+          return true
+        end
+      end
+
+
+      unless touch_detected
+        @joystick_x = @x
+        @joystick_y = @y
+      end
+
+      trigger_input
+
+      return nil
+    end
+
+    def trigger_input(threshold = 0.35)
+      threshold = @radius * threshold
+
+      if @joystick_x != @x || @joystick_y != @y
+        if (@x - @joystick_x) < -threshold
+          set("right", true)
+        else
+          set("right", false)
+        end
+
+        if (@x - @joystick_x) > threshold
+          set("left", true)
+        else
+          set("left", false)
+        end
+
+        if (@y - @joystick_y) < -threshold
+          set("down", true)
+        else
+          set("down", false)
+        end
+
+        if (@y - @joystick_y) > threshold
+          set("up", true)
+        else
+          set("up", false)
+        end
+
+      else
+        set("up", false)
+        set("down", false)
+        set("left", false)
+        set("right", false)
+      end
+    end
+
+    def set(key, boolean)
+      @key_states[@buttons[key]] = boolean
+    end
+  end
+end

data/lib/author_engine/opal.rb

@@ -14,4 +14,5 @@ require_relative "game/game"
 require_relative "save_file"
 require_relative "game/opal/touch_handler"
 require_relative "game/opal/touch_button"
+require_relative "game/opal/touch_joystick"
 require_relative "game/opal/game_runner"

data/lib/author_engine/version.rb

@@ -1,3 +1,3 @@
 class AuthorEngine
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/author_engine/views/sprite_editor.rb

@@ -60,7 +60,11 @@ class AuthorEngine
         end
       end
 
-      import_spritesheet(window.container.savefile.sprites)
+      if window.container.savefile.sprites.to_blob.length < 4
+        import_spritesheet(spritesheet)
+      else
+        import_spritesheet(window.container.savefile.sprites)
+      end
     end
 
     def focus

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: author_engine
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -148,6 +148,7 @@ files:
 - lib/author_engine/game/opal/parts/input.rb
 - lib/author_engine/game/opal/touch_button.rb
 - lib/author_engine/game/opal/touch_handler.rb
+- lib/author_engine/game/opal/touch_joystick.rb
 - lib/author_engine/image.rb
 - lib/author_engine/level_picker.rb
 - lib/author_engine/opal.rb