author_engine 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e0cf77555ac655bee109b3681e36f866779c24609dd450c178ea12088c3c12c
-  data.tar.gz: 37ac43dbfb944219f24af1a8c50ef592d1a640d32ae73e3546cb84a354a4728c
+  metadata.gz: bd123dfe082801721b5f3a559180fb97ce3fea894f63e0f0d6c7694eb0cc2d5f
+  data.tar.gz: 945932ed00bb9287b2bb50e6f7135a35583e1a8d50624b1ea01632d7b76dcf62
 SHA512:
-  metadata.gz: d82bf5325058010870fc12bb021d92bd83d15e969d8ccfa88bdc46ee50070ed59081036cf9238e4951cdb0f43cfe75e0772c0c1100123e39188f0d41ebc6e861
-  data.tar.gz: d85204b91769adaf42d054a852d2792bbef29f2630b5c9774a373fac726844804b33a43d2dcbdc970dd4aa1842135ad7b583e27eba1bc7dc3ed4312cf143d7c9
+  metadata.gz: 9bde94c152e1f5722d047b1488a64e1126d58028dee38af826bbce70f2ce1153b31d71e85a5b2b9ae8fe2dfe6109bff92bd4685f4ef1145386de349cbce8951e
+  data.tar.gz: 3b6fa209262f49671634e9fcb0b2fea2556f1a893dd23950e9db634e8173f7c14f6aa8a018bd20acbe9323f72504a1d2348e3e48febcfc09b71a6ad0199fe361

data/README.md

@@ -22,7 +22,7 @@ A virtual console¹ that you code in Ruby.
 ## Sprite Editor
 ![sprite_editor_view](https://raw.githubusercontent.com/cyberarm/author_engineV2/master/screenshots/sprite_editor.png)
 ## Level Editor
-![level_editor_view](#)
+![level_editor_view](https://raw.githubusercontent.com/cyberarm/author_engineV2/master/screenshots/level_editor.png)
 ## Code Editor
 ![code_editor_view](https://raw.githubusercontent.com/cyberarm/author_engineV2/master/screenshots/code_editor.png)
 

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

@@ -1,5 +1,6 @@
 require "opal"
 require "fileutils"
+require_relative "../../version"
 
 class AuthorEngine
   class OpalExporter
@@ -14,7 +15,7 @@ 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
+    # Rebuild opal runtime if it doesn't exist or if its out of date
     def build_opal?
       opal_runtime = "#{export_directory}/js/runtime.js"
 
@@ -29,6 +30,21 @@ class AuthorEngine
       end
     end
 
+    # Rebuild author_engine runtime if it doesn't exist or if its out of date
+    def build_authorengine?
+      authorengine_runtime = "#{export_directory}/js/author_engine.js"
+
+      if File.exists?(authorengine_runtime)
+        file = File.open(authorengine_runtime)
+        version = file.first.gsub("/", "").strip
+        file.close
+
+        AuthorEngine::VERSION != version
+      else
+        true
+      end
+    end
+
     def stylesheet
       %{
 @font-face { font-family: Connection; src: url('fonts/Connection.otf'); }
@@ -42,7 +58,7 @@ body {
 #canvas {
   display: block;
   margin: 0 auto;
-  // cursor: none;
+  cursor: none;
 }
 #loading {
   font-family: Connection, sans-serif;
@@ -71,8 +87,6 @@ var projectString = `#{file}`;
 
     def game_runtime
       program = %{
-# require "opal"
-# require "opal-parser"
 require "author_engine/opal"
 
 `var callback = function(){
@@ -99,22 +113,31 @@ if (
         opal_builder.build("opal")
         opal_builder.build("opal-parser")
       else
-        puts "  Skipping Opal runtime. Already exists as v#{Opal::VERSION}..."
+        puts "  Skipping Opal runtime. Already exists and up to date (v#{Opal::VERSION})..."
       end
 
-      puts "  Building AuthorEngine runtime with project..."
-      game_builder = Opal::Builder.new
-      base_path = File.expand_path("../../../..", __FILE__)
-      game_builder.append_paths("#{base_path}")
+      author_engine_builder = nil
+      if build_authorengine?
+        puts "  Building AuthorEngine runtime..."
 
-      game_builder.build_require("author_engine/opal")
+        author_engine_builder = Opal::Builder.new
+        base_path = File.expand_path("../../../..", __FILE__)
+        author_engine_builder.append_paths("#{base_path}")
+
+        author_engine_builder.build_require("author_engine/opal")
+      else
+        puts "  Skipping AuthorEngine runtime. Already exists and up to date (v#{AuthorEngine::VERSION})..."
+      end
 
       opal_builder_js  = nil
       if opal_builder
         opal_runtime_js = opal_builder.build_str("", "(inline)").to_s
       end
 
-      author_engine_js = game_builder.build_str(program, "(inline)").to_s
+      author_engine_js = nil
+      if author_engine_builder
+        author_engine_js = author_engine_builder.build_str(program, "(inline)").to_s
+      end
 
       return {opal_runtime: opal_runtime_js, author_engine_runtime: author_engine_js}
     end
@@ -124,6 +147,7 @@ if (
 <!doctype html5>
 <html>
   <head>
+    <meta content="width=device-width, initial-scale=1" name="viewport" />
     <meta charset="utf-8" />
     <title>#{project_name} | AuthorEngine</title>
   </head>
@@ -201,12 +225,16 @@ if (
         end
       end
 
+      puts "  Building game..."
       File.open("#{export_path}/game.js", "w") do |file|
         file.write(project)
       end
 
-      File.open("#{export_path}/js/author_engine.js", "w") do |file|
-        file.write(hash[:author_engine_runtime])
+      if hash[:author_engine_runtime]
+        File.open("#{export_path}/js/author_engine.js", "w") do |file|
+          file.write("// #{AuthorEngine::VERSION}\n")
+          file.write(hash[:author_engine_runtime])
+        end
       end
 
       fonts_path = "#{File.expand_path("../../../../../", __FILE__)}/assets/fonts"

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

@@ -34,7 +34,6 @@ class AuthorEngine
 
       @game = Game.new(code: @save_file.code)
       build_spritesheet_and_sprites_list
-      resize_canvas
 
       @collision_detection = AuthorEngine::CollisionDetection.new(@sprites, @levels, @save_file.sprites)
       @game.authorengine_collision_detection = @collision_detection
@@ -42,19 +41,20 @@ class AuthorEngine
       @game.init
 
       @show_touch_controls = false
-      @touch_joystick = TouchJoystick.new(x: 100, radius: 50, side: :left)
+      @touch_joystick = TouchJoystick.new(radius: 50)
       @touch_buttons = []
       @touch_buttons.push(
         TouchButton.new(
-          label: "X", color: @game.red, x: 50, width: 50, height: 50, side: :right, for_key: "x"
+          label: "X", color: @game.red, width: 50, height: 50, for_key: "x"
           ),
         TouchButton.new(
-          label: "Y", color: @game.yellow, x: 125, width: 50, height: 50, side: :right, for_key: "y"
+          label: "Y", color: @game.yellow, width: 50, height: 50, for_key: "y"
         )
       )
 
-      @fullscreen_button = TouchButton.new(label: "Fullscreen", color: @game.black, x: 50, y: 10, width: 100, height: 50, side: :right)
+      @fullscreen_button = TouchButton.new(label: "Fullscreen", color: @game.black, width: 100, height: 50)
       touch_handler_setup
+      resize_canvas
 
       return self
     end
@@ -72,9 +72,14 @@ 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.authorengine_canvas_context}.clearRect(0,0, window.innerWidth, window.innerHeight)`
-      `#{@game.authorengine_canvas_context}.fillStyle = "#222"`
-      `#{@game.authorengine_canvas_context}.fillRect(0,0, window.innerWidth, window.innerHeight)`
+      width  = `window.innerWidth`
+      height = `window.innerHeight`
+      game_width = 128 * @game.authorengine_scale
+      game_height = 128 * @game.authorengine_scale
+
+      area_width  = (`window.innerWidth` - game_width) / 2
+
+      `#{@game.authorengine_canvas_context}.clearRect(#{area_width},0, #{game_width}, #{game_height})`
 
       @counted_frames+=1
 
@@ -86,11 +91,9 @@ class AuthorEngine
 
 
       if @sprites.size == (@spritesheet_width/@sprite_size)*(@spritesheet_height/@sprite_size)
-        width = 128 * @game.authorengine_scale
-
         # `#{@game.authorengine_canvas_context}.setTransform(1, 0, 0, 1, 0, 0)`
         `#{@game.authorengine_canvas_context}.save()`
-        `#{@game.authorengine_canvas_context}.translate(window.innerWidth/2 - #{width/2}, 0)`
+        `#{@game.authorengine_canvas_context}.translate(window.innerWidth/2 - #{game_height/2}, 0)`
         `#{@game.authorengine_canvas_context}.scale(#{@game.authorengine_scale}, #{@game.authorengine_scale})`
         `#{@game.authorengine_canvas_context}.save()`
 
@@ -130,6 +133,59 @@ class AuthorEngine
     end
 
     def reposition_touch_controls
+      return nil unless @touch_joystick
+
+      width  = `window.innerWidth`
+      height = `window.innerHeight`
+      game_width = 128 * @game.authorengine_scale
+      game_height = 128 * @game.authorengine_scale
+
+      # place controls under game
+      if width < height
+        area_width  = width
+        area_height = height - game_height
+
+        puts "space: width #{area_width} x height #{area_height}"
+
+        @touch_joystick.x = @touch_joystick.radius + @touch_joystick.radius
+        @touch_joystick.y = game_height + area_height / 2
+
+        padding = 10
+        last_x = 20
+        @touch_buttons.reverse.each do |button|
+          button.x = width - (last_x + button.width)
+          button.y = (height - area_height) + area_height / 2 - button.height / 2
+
+          last_x += button.width + padding
+        end
+
+        @fullscreen_button.x = width - (width / 2 + @fullscreen_button.width / 2)
+        @fullscreen_button.y = height - @fullscreen_button.height
+
+      # place controls beside game
+      else
+        area_width  = (`window.innerWidth` - game_width) / 2
+        area_height = game_height
+
+        puts "space: width #{area_width} x height #{area_height}"
+
+        @touch_joystick.x = @touch_joystick.radius + @touch_joystick.radius
+        @touch_joystick.y = game_height / 2
+
+        padding = 10
+        last_x = 50
+        @touch_buttons.reverse.each do |button|
+          button.x = width - (last_x + button.width)
+          button.y = game_height / 2 - button.height / 2
+
+          last_x += button.width + padding
+        end
+
+        @fullscreen_button.x = width - @fullscreen_button.width
+        @fullscreen_button.y = 0
+      end
+
+      return nil
     end
 
     def resize_canvas
@@ -137,9 +193,9 @@ class AuthorEngine
       height = `window.innerHeight`
 
       if width < height
-        @game.authorengine_scale = `window.innerWidth / 128.0`
+        @game.authorengine_scale = `#{width} / 128.0`
       else
-        @game.authorengine_scale = `window.innerHeight / 128.0`
+        @game.authorengine_scale = `#{height} / 128.0`
       end
 
       `#{@game.authorengine_canvas}.width  = #{width}`
@@ -150,6 +206,7 @@ class AuthorEngine
       `#{@game.authorengine_canvas_context}.imageSmoothingEnabled = false`
 
       reposition_touch_controls
+      `#{@game.authorengine_canvas_context}.clearRect(0, 0, window.innerWidth, window.innerHeight)`
       return nil
     end
 

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

@@ -1,9 +1,10 @@
 class AuthorEngine
   class TouchButton
-    attr_reader :x, :y, :width, :height
-    def initialize(label:, color:, x:, y: nil, width:, height:, side:, for_key: nil, &block)
+    attr_accessor :x, :y
+    attr_reader :width, :height
+    def initialize(label:, color:, x: 0, y: 0, width:, height:, for_key: nil, &block)
       @label, @color, @x, @y, @width, @height = label, color, x, y, width, height
-      @side, @for_key = side, for_key
+      @for_key = for_key
       @block = block
 
       @buttons    = AuthorEngine::Part::OpalInput::BUTTONS
@@ -12,16 +13,6 @@ class AuthorEngine
       @game       = AuthorEngine::GameRunner.instance.game
       @game_width = 128 * @game.authorengine_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/2}` unless @y.is_a?(Numeric)
     end
 
     def draw

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

@@ -1,7 +1,8 @@
 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
+    attr_accessor :x, :y, :radius
+    def initialize(x: 0, y: 0, radius:, background: nil, color: nil)
+      @x, @y, @radius, @background, @color = x, y, radius, background, color
 
       @buttons    = AuthorEngine::Part::OpalInput::BUTTONS
       @key_states = AuthorEngine::Part::OpalInput::KEY_STATES
@@ -10,15 +11,6 @@ class AuthorEngine
       @game_width = 128 * @game.authorengine_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
 
@@ -26,6 +18,10 @@ class AuthorEngine
     end
 
     def draw
+      #Clear
+      combo = @radius + @joystick_radius
+      `#{@game.authorengine_canvas_context}.clearRect(#{@x - combo}, #{@y - combo}, #{combo + combo}, #{combo + combo})`
+
       # Background
       `#{@game.authorengine_canvas_context}.fillStyle = #{@background}`
       `#{@game.authorengine_canvas_context}.beginPath()`

data/lib/author_engine/version.rb

@@ -1,3 +1,3 @@
 class AuthorEngine
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/author_engine/window.rb

@@ -30,6 +30,8 @@ class AuthorEngine
 
       @close_counter = 0
 
+      @cursor = AuthorEngine::Image.new("assets/ui/cursor.png", retro: true)
+
       calculate_scale
       setup
     end
@@ -56,16 +58,13 @@ class AuthorEngine
 
     def draw
       @container.draw
+      @cursor.draw(mouse_x, mouse_y, Float::INFINITY, @square_scale, @square_scale) if @show_cursor
     end
 
     def update
       @container.update
     end
 
-    def needs_cursor?
-      @show_cursor
-    end
-
     def lighten(color, amount = 25)
       if defined?(color.alpha)
         return Gosu::Color.rgba(color.red+amount, color.green+amount, color.blue+amount, color.alpha)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: author_engine
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-03 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -117,6 +117,7 @@ files:
 - assets/fonts/SIL Open Font License.txt
 - assets/ui/bucket_icon.png
 - assets/ui/code_icon.png
+- assets/ui/cursor.png
 - assets/ui/error_icon.png
 - assets/ui/level_icon.png
 - assets/ui/loading_icon.png
@@ -166,6 +167,7 @@ files:
 - lib/author_engine/views/sprite_editor.rb
 - lib/author_engine/window.rb
 - screenshots/code_editor.png
+- screenshots/level_editor.png
 - screenshots/play.png
 - screenshots/sprite_editor.png
 homepage: https://github.com/cyberarm/author_engineV2