author_engine 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 694fa108a1f195431f1a2e19a9c27f23b26b1749d671f564f8cbbf4a5763b6a7
-  data.tar.gz: 0b366a28a323cd1dbc2fff3854ee6785fd35561ec0c0f6cf2d175dcddf5eba7d
+  metadata.gz: 240a86f7ca8210f55b1000684999a28d178bb8aee05816924c09987279930acb
+  data.tar.gz: b020c530b4e217ff3b2c6fa8f956eae3a7faef8c3e07de8226fdbd239a0adec9
 SHA512:
-  metadata.gz: 5516f268ab834bc8ea4b78e81a12ece30471e9dfd8a88a79bd21265067a161345bc923825572917afb17a2222cec2214b7d02768b9ec1fe4836346f007914769
-  data.tar.gz: f047c5ca5837b0ccac07690fb9ce939e22705bb90357837e66ca8d35bb3570ac1de98b22bbbeeb774b4cd07462334833cfb3d691054e56e1c197c20a44bb1b19
+  metadata.gz: 979bd0fc59a1767dede59ca38f1ac63965beb8c538c95c25fd824d7d5c0b4449508d83f4dec6bc2e4b0d8c046f37f35c1995da4f2460e4d9562534d59b4e41fd
+  data.tar.gz: d105fe0793a73d82bb36c69623a031ad0a45ffd0dfbae4027a55e4a77e05bcd75be360fc9fa8427080a2ab1dc4f993f87065a63b0fdbb7e1ec89c99dbc2649d6

data/Gemfile.lock

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

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

@@ -14,6 +14,21 @@ class AuthorEngine
       return name.split("_").map {|n| n.capitalize}.join(" ")
     end
 
+    # Rebuild opal runtime of it doesn't exist or if its out of date
+    def build_opal?
+      opal_runtime = "#{export_directory}/js/runtime.js"
+
+      if File.exists?(opal_runtime)
+        file = File.open(opal_runtime)
+        version = file.first.gsub("/", "").strip
+        file.close
+
+        Opal::VERSION != version
+      else
+        true
+      end
+    end
+
     def stylesheet
       %{
 @font-face { font-family: Connection; src: url('fonts/Connection.otf'); }
@@ -27,7 +42,7 @@ body {
 #canvas {
   display: block;
   margin: 0 auto;
-  cursor: none;
+  // cursor: none;
 }
 #loading {
   font-family: Connection, sans serif;
@@ -54,8 +69,8 @@ var projectString = `#{File.open(@project_file).read}`;
 
     def game_runtime
       program = %{
-require "opal"
-require "opal-parser"
+# require "opal"
+# require "opal-parser"
 require "author_engine/opal"
 
 `var callback = function(){
@@ -72,18 +87,34 @@ if (
 }`
       }
 
-      builder = Opal::Builder.new
+      puts "Transpiling to JavaScript using Opal..."
+
+      opal_builder = nil
+      if build_opal?
+        puts "  Building Opal runtime..."
+
+        opal_builder = Opal::Builder.new
+        opal_builder.build("opal")
+        opal_builder.build("opal-parser")
+      else
+        puts "  Skipping Opal runtime. Already exists as v#{Opal::VERSION}..."
+      end
+
+      puts "  Building AuthorEngine runtime with project..."
+      game_builder = Opal::Builder.new
       base_path = File.expand_path("../../../..", __FILE__)
-      builder.append_paths("#{base_path}")
+      game_builder.append_paths("#{base_path}")
 
-      puts "Transpiling to JavaScript using Opal..."
+      game_builder.build_require("author_engine/opal")
 
+      opal_builder_js  = nil
+      if opal_builder
+        opal_runtime_js = opal_builder.build_str("", "(inline)").to_s
+      end
 
-      builder.build("opal")
-      builder.build("opal-parser")
-      builder.build_require("author_engine/opal")
+      author_engine_js = game_builder.build_str(program, "(inline)").to_s
 
-      builder.build_str(program, "(inline)").to_s
+      return {opal_runtime: opal_runtime_js, author_engine_runtime: author_engine_js}
     end
 
     def template
@@ -103,13 +134,23 @@ if (
       <h1>Your Browser Does Not Support HTML5 Canvas!</h1>
     </canvas>
 
+    <script src="game.js"></script>
     <script>
       // Add a small delay before loading application in order to finish loading page and show "Loading..."
       window.setTimeout(function() {
-        var script = document.createElement('script');
-        script.src = "application.js";
+        console.log("Loading Opal runtime...");
+
+        var opal_runtime = document.createElement('script');
+        opal_runtime.onload = function() {
+          console.log("Loading AuthorEngine runtime...");
 
-        document.head.appendChild(script);
+          var author_engine_runtime = document.createElement('script');
+          author_engine_runtime.src = "js/author_engine.js";
+          document.head.appendChild(author_engine_runtime);
+        }
+        opal_runtime.src = "js/runtime.js";
+
+        document.head.appendChild(opal_runtime);
       }, 500);
     </script>
   </body>
@@ -121,17 +162,28 @@ if (
       template
     end
 
-    def save(string)
+    def export_directory
       filename  = File.basename(@project_file)
       directory = File.expand_path(@project_file.sub(filename, ''))
       name      = filename.sub(".authorengine", "")
 
+      return "#{directory}/#{name}"
+    end
+
+    def save(string)
+      filename  = File.basename(@project_file)
+      directory = File.expand_path(@project_file.sub(filename, ''))
+      name      = filename.sub(".authorengine", "")
       export_path = "#{directory}/#{name}"
+
       unless File.exists?(export_path)
         Dir.mkdir(export_path)
-        unless File.exists?("#{export_path}/fonts")
-          Dir.mkdir("#{export_path}/fonts")
-        end
+      end
+      unless File.exists?("#{export_path}/fonts")
+        Dir.mkdir("#{export_path}/fonts")
+      end
+      unless File.exists?("#{export_path}/js")
+        Dir.mkdir("#{export_path}/js")
       end
 
       puts "Saving to \"#{export_path}\""
@@ -139,10 +191,20 @@ if (
         file.write(string)
       end
 
-      File.open("#{export_path}/application.js", "w") do |file|
+      hash = game_runtime
+      if hash[:opal_runtime]
+        File.open("#{export_path}/js/runtime.js", "w") do |file|
+          file.write("// #{Opal::VERSION}\n")
+          file.write(hash[:opal_runtime])
+        end
+      end
+
+      File.open("#{export_path}/game.js", "w") do |file|
         file.write(project)
-        file.write("\n\n\n")
-        file.write(game_runtime)
+      end
+
+      File.open("#{export_path}/js/author_engine.js", "w") do |file|
+        file.write(hash[:author_engine_runtime])
       end
 
       fonts_path = "#{File.expand_path("../../../../../", __FILE__)}/assets/fonts"

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

@@ -7,6 +7,8 @@ class AuthorEngine
       @instance = klass
     end
 
+    include TouchHandler
+
     attr_reader :save_file, :spritesheet, :sprites, :levels, :fps
     attr_reader :game
     def initialize(project_string)
@@ -41,6 +43,41 @@ class AuthorEngine
 
       @game.init
 
+      @show_touch_controls = false
+      @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}
+        ),
+        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}
+        )
+      )
+      touch_handler_setup
+
       return self
     end
 
@@ -57,6 +94,7 @@ 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)`
 
       @counted_frames+=1
 
@@ -68,8 +106,30 @@ class AuthorEngine
 
 
       if @sprites.size == (@spritesheet_width/@sprite_size)*(@spritesheet_height/@sprite_size)
+        width = 128 * @game.scale
+
+        # `#{@canvas_context}.setTransform(1, 0, 0, 1, 0, 0)`
+        `#{@game.canvas_context}.save()`
+        `#{@game.canvas_context}.translate(window.innerWidth/2 - #{width/2}, 0)`
+        `#{@game.canvas_context}.scale(#{@game.scale}, #{@game.scale})`
+        `#{@game.canvas_context}.save()`
+
+        region = `new Path2D()`
+        `#{region}.rect(0, 0, 128, 128)`
+        `#{@game.canvas_context}.clip(#{region})`
+        `#{@game.canvas_context}.save()`
         draw
+
+        `#{@game.canvas_context}.restore()`
+        `#{@game.canvas_context}.restore()`
+        `#{@game.canvas_context}.restore()`
+
         update
+
+        if @show_touch_controls
+          draw_touch_controls
+          update_touch_controls
+        end
       else
         @game.draw_background
         @game.text("Loading sprite #{@sprites.size}/#{(@spritesheet_width/@sprite_size)*(@spritesheet_height/@sprite_size)}.", 0, @game.height/2, 8)
@@ -78,6 +138,25 @@ class AuthorEngine
       return nil
     end
 
+    def draw_touch_controls
+      @touch_buttons.each(&: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 - active_buttons).each(&:inactive)
+    end
+
     def resize_canvas
       width  = `window.innerWidth`
       height = `window.innerHeight`
@@ -88,12 +167,11 @@ class AuthorEngine
         @game.scale = `window.innerHeight / 128.0`
       end
 
-      `#{@game.canvas}.width  = 128 * #{@game.scale}`
-      `#{@game.canvas}.height = 128 * #{@game.scale}`
-      `#{@game.canvas}.style.width  = 128 * #{@game.scale}`
-      `#{@game.canvas}.style.height = 128 * #{@game.scale}`
+      `#{@game.canvas}.width  = #{width}`
+      `#{@game.canvas}.height = #{height}`
+      `#{@game.canvas}.style.width  = #{width}`
+      `#{@game.canvas}.style.height = #{height}`
 
-      `#{@game.canvas_context}.scale(#{@game.scale}, #{@game.scale})`
       `#{@game.canvas_context}.imageSmoothingEnabled = false`
       return nil
     end
@@ -150,6 +228,11 @@ class AuthorEngine
       `document.addEventListener('keydown', (event) => { #{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."} })`
+
       `document.getElementById('loading').style.display = "none"`
       `window.requestAnimationFrame(function() {#{run_game}})`
       return nil

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

@@ -10,7 +10,7 @@ class AuthorEngine
         "y"     => "c",
       }
 
-      # Store keys state
+      # Store key states
       KEY_STATES = {
       }
 

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

@@ -0,0 +1,36 @@
+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:)
+      @label, @color, @x, @y, @width, @height = label, color, x, y, width, height
+      @side, @contact_proc, @no_contact_proc = side, contact_proc, no_contact_proc
+
+      @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 - #{height}` unless @y.is_a?(Numeric)
+    end
+
+    def draw
+      `#{@game.canvas_context}.fillStyle = #{@color}`
+      `#{@game.canvas_context}.fillRect(#{@x}, #{@y}, #{width}, #{width})`
+    end
+
+    def active
+      @contact_proc.call
+    end
+
+    def inactive
+      @no_contact_proc.call
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+class AuthorEngine
+  module TouchHandler
+    Touch = Struct.new(:x, :y)
+    def touch_handler_setup
+      @current_touches = {}
+    end
+
+    def copy_touch(touch)
+      Touch.new(`touch.pageX`, `touch.pageY`)
+    end
+
+    def handle_touch_start(event)
+      `#{event}.preventDefault()`
+
+      touches = `#{event}.changedTouches`
+      `for (var i = 0; i < #{touches}.length; i++) {
+        #{@current_touches[`touches[i].identifier`] = copy_touch(`touches[i]`)}
+      }`
+
+      return nil
+    end
+
+    def handle_touch_move(event)
+      `#{event}.preventDefault()`
+
+      touches = `#{event}.changedTouches`
+      `for (var i = 0; i < #{touches}.length; i++) {
+        #{@current_touches[`touches[i].identifier`] = copy_touch(`touches[i]`)}
+      }`
+
+      return nil
+    end
+
+    def handle_touch_cancel(event)
+      handle_touch_end(event)
+    end
+
+    def handle_touch_end(event)
+      `#{event}.preventDefault()`
+
+      touches = `#{event}.changedTouches`
+      `for (var i = 0; i < #{touches}.length; i++) {
+        #{@current_touches.delete(`touches[i].identifier`)}
+      }`
+
+      return nil
+    end
+  end
+end

data/lib/author_engine/opal.rb

@@ -12,4 +12,6 @@ require_relative "sprite"
 
 require_relative "game/game"
 require_relative "save_file"
+require_relative "game/opal/touch_handler"
+require_relative "game/opal/touch_button"
 require_relative "game/opal/game_runner"

data/lib/author_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: author_engine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2018-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -146,6 +146,8 @@ files:
 - lib/author_engine/game/opal/game_runner.rb
 - lib/author_engine/game/opal/parts/graphics.rb
 - 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/image.rb
 - lib/author_engine/level_picker.rb
 - lib/author_engine/opal.rb