author_engine 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdf3e00f6f0e8840311bc2fb5c77c7dfe56c0bf9de8efa7cb310468b649d4ff4
-  data.tar.gz: b32cfb362b8bdfe3c408ac8e113082c94c68faaa2475afbc91b8e97ffdee2ffe
+  metadata.gz: f4708e029c91cdcb46645b45bf91a957c24a0fa5f9526a4160da593d0a1ac109
+  data.tar.gz: 5270d1b8af030bf17c53a8d332e8e07dfd84b70aaf505580a52c094856bd69c3
 SHA512:
-  metadata.gz: 0ddf727d607cd61cf2aa34551c8489cc8af8af44c26c263eed9faac1f0ac7ff0563ccbe8ea400a4762d050f08f6a76e40d874484770ee833d28340de3bdb66fd
-  data.tar.gz: 91335c5c61622bb198535bb62bd15b5ad3db5eb10f2aa290dfc3b7ff7bc05e96b5ed270834eca6ee25721d1ace97bd30c9587746eabaa3f4217cfd236a8d7560
+  metadata.gz: d2f1290dd9488db2e3fbb6c7af5ba34e1b2f2ea441f76cc8bb22b3ae6f42040d6230e68c514a7a05677b1f0336574ab4e6207f33bb4d47f49a690a7a8ff46b1d
+  data.tar.gz: 584f14bc9da7a63e19cbd633f65a8c6e1fc6d05e2b5aa9c152dc05d67bf7c09031c01db94cd0543848c10d828fb220452be1db583c4fa70b780aaa84d973aa62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    author_engine (0.6.0)
+    author_engine (0.6.1)
       coderay (~> 1.1.2)
       gosu (~> 0.14.4)
       opal (~> 0.11.4)
@@ -11,9 +11,9 @@ GEM
   specs:
     ast (2.4.0)
     coderay (1.1.2)
-    gosu (0.14.4)
+    gosu (0.14.5)
     hike (1.2.3)
-    minitest (5.11.3)
+    minitest (5.13.0)
     opal (0.11.4)
       ast (>= 2.3.0)
       hike (~> 1.2)
@@ -34,4 +34,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/lib/author_engine/cli.rb

@@ -10,6 +10,15 @@ class AuthorEngine
           puts "author_engine export project [exported_name]"
         end
 
+      elsif ARGV[0] && ARGV[0] == "inflate"
+        if ARGV[1] && ARGV[1].end_with?(".authorengine")
+          if File.exists?(ARGV[1])
+            savefile = SaveFile.new(ARGV[1])
+            savefile.inflate!
+            puts "Inflated #{ARGV[1]}"
+          end
+        end
+
       elsif ARGV[0] && ARGV[0].end_with?(".authorengine")
         # The Loader Container handles loading projects
         AuthorEngine::Window.new.show

data/lib/author_engine/collision_detection/collision_detection.rb

@@ -3,7 +3,7 @@ class AuthorEngine
     Color = Struct.new(:red, :green, :blue, :alpha)
     BoundingBox = Struct.new(:x, :y, :width, :height)
 
-    def initialize(game_sprites, game_levels)
+    def initialize(game_sprites, game_levels, spritesheet)
       @game_sprites = game_sprites
       @game_levels  = game_levels
 
@@ -11,21 +11,30 @@ class AuthorEngine
       @levels = []
 
       @known_collisions = []
+
+      spritesheet_blob = RUBY_ENGINE == "opal" ? spritesheet.to_blob.each_slice(4).to_a : spritesheet.to_blob.bytes.each_slice(4).to_a
+      (spritesheet.rows / 16).times do |y|
+        (spritesheet.columns / 16).times do |x|
+          blob = []
+
+          16.times do |sy|
+            16.times do |sx|
+              blob << spritesheet_blob[(y * 16 + sy) * spritesheet.columns + (x * 16 + sx)]
+            end
+          end
+
+          add_sprite(blob.flatten!)
+        end
+      end
+
+      @game_levels.each { |level| add_level(level) }
     end
 
     def clear
       @known_collisions.clear
     end
 
-    def add_sprite(image_or_blob)
-      blob = nil
-      if RUBY_ENGINE != "opal"
-        blob = image_or_blob.to_blob
-      else
-        blob = []
-        `#{image_or_blob}.forEach(function(value) {#{blob << `value`}})`#.each {|n| blob << n}
-      end
-
+    def add_sprite(blob)
       @sprites << {blob: blob, box: bounding_box(blob)}
     end
 
@@ -94,7 +103,7 @@ class AuthorEngine
     def render_bounding_box(sprite_index, box, sprite_x, sprite_y, edges = {}, z = Float::INFINITY, color = 0xc800ff00, collision_color = 0xc8ff00ff)
       if RUBY_ENGINE == "opal"
         color = "green"
-        collision_color = "red"
+        collision_color = "purple"
       end
       paint_color = color
       # EDGE: TOP
@@ -158,14 +167,14 @@ class AuthorEngine
     def solid_at?(blob, x, y)
       width = 16
 
-      blob[(y * width + x) * 4 + 3].ord
+      blob[(y * width + x) * 4 + 3].ord > 0
     end
 
     def bounding_box(blob, size = 16)
       box = BoundingBox.new(size, size, 0, 0)
       size.times do |y|
         size.times do |x|
-          if solid_at?(blob, x, y) > 0
+          if solid_at?(blob, x, y)
             box.x = x if x < box.x
             box.y = y if y < box.y
             box.width  = x if x > box.width

data/lib/author_engine/game/game.rb

@@ -32,10 +32,7 @@ class AuthorEngine
         size = 16
         @levels.each {|level| level.each {|sprite| sprite.x = sprite.x * size; sprite.y = sprite.y * size}}
 
-        @collision_detection = CollisionDetection.new(@sprites, @levels)
-
-        @sprites.each {|sprite| @collision_detection.add_sprite(sprite) }
-        @levels.each {|level| @collision_detection.add_level(level) }
+        @collision_detection = CollisionDetection.new(@sprites, @levels, Window.instance.container.savefile.sprites)
       end
 
       @background_color = black

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

@@ -45,7 +45,7 @@ body {
   // cursor: none;
 }
 #loading {
-  font-family: Connection, sans serif;
+  font-family: Connection, sans-serif;
   color: white;
   text-align: center;
 
@@ -62,8 +62,10 @@ body {
     end
 
     def project
+      file = File.read(@project_file)
+
       %{
-var projectString = `#{File.open(@project_file).read}`;
+var projectString = `#{file}`;
       }
     end
 

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

@@ -36,11 +36,9 @@ class AuthorEngine
       build_spritesheet_and_sprites_list
       resize_canvas
 
-      @collision_detection = AuthorEngine::CollisionDetection.new(@sprites, @levels)
+      @collision_detection = AuthorEngine::CollisionDetection.new(@sprites, @levels, @save_file.sprites)
       @game.collision_detection = @collision_detection
 
-      @levels.each {|level| @collision_detection.add_level(level) }
-
       @game.init
 
       @show_touch_controls = false
@@ -191,7 +189,6 @@ class AuthorEngine
         (width/size).times do |x|
           `#{temp_canvas_context}.clearRect(0,0, #{size}, #{size})`
           `#{temp_canvas_context}.drawImage(#{@spritesheet}, #{x * size}, #{y * size}, #{size}, #{size}, 0, 0, #{size}, #{size})`
-          @collision_detection.add_sprite(`#{temp_canvas_context}.getImageData(0,0, #{size}, #{size}).data`)
 
           `createImageBitmap(#{@spritesheet}, #{x * size}, #{y * size}, #{size}, #{size}).then(sprite => { #{@sprites.push(`sprite`)} })`
         end

data/lib/author_engine/level_picker.rb

@@ -54,7 +54,7 @@ class AuthorEngine
 
       @buttons << Button.new(label: ">", x: @buttons.last.x + @buttons.last.width + @offset, y: @y + @offset*2, z: 18, tooltip: "→ Next Level", color: Gosu::Color::GRAY) do
         @active_level+=1
-        @active_level = 0 if @active_level >= LevelEditor.instance.levels.size - 1
+        @active_level = 0 unless @active_level < LevelEditor.instance.levels.size
       end
     end
 

data/lib/author_engine/save_file.rb

@@ -15,11 +15,12 @@ class AuthorEngine
       end
     end
 
-    attr_reader :file
+    attr_reader :file, :mode
     attr_reader :code, :sprites, :levels
     def initialize(file)
       @file = file
       @buffer = ""
+      @mode = :compact # or :inflated
 
       @code, @sprites, @levels = nil, nil, nil
 
@@ -27,6 +28,7 @@ class AuthorEngine
     end
 
     def save
+      @buffer = "# inflated\n" if inflated?
       save_code
       save_spritesheet
       save_levels
@@ -39,16 +41,58 @@ class AuthorEngine
       puts "Saved #{file}"
     end
 
-    def save_code
-      @buffer+= "___CODE___\n"
-      @buffer+= CodeEditor.instance.code
+    def inflate!
+      load
+      @mode = :inflated
+      save_code(@code)
+      save_spritesheet(Gosu::Image.new(@sprites, retro: true))
+
+      file = File.read(@file)
+      unless file.lines.first.include?("# inflated")
+        File.open(@file, "w") do |f|
+          f.write "# inflated\n"
+          f.write file
+        end
+      end
+
+    end
+
+    def inflated?
+      @mode == :inflated
+    end
+
+    def project_name
+      File.basename(@file, ".authorengine")
+    end
+
+    def project_path
+      File.expand_path(@file).sub(File.basename(@file), "")
+    end
+
+    # code is a String
+    def save_code(code = CodeEditor.instance.code)
+      if inflated?
+        @buffer+= "___CODE___?#{project_path}#{project_name}.rb\n"
+        File.write("#{project_path}#{project_name}.rb", code)
+        puts "Saved code to #{project_path}#{project_name}.rb"
+      else
+        @buffer+= "___CODE___\n"
+      end
+      @buffer+= code
       # @buffer+="\n" # CodeEditor always has this newline
     end
 
-    def save_spritesheet
-      sheet = SpriteEditor.instance.spritesheet
+    # sheet is a Gosu::Image
+    def save_spritesheet(sheet = SpriteEditor.instance.spritesheet)
+
+      if inflated?
+        @buffer+= "___SPRITES___?#{project_path}#{project_name}.png\n"
+        sheet.save("#{project_path}#{project_name}.png")
+        puts "Saved spritesheet to #{project_path}#{project_name}.png"
+      else
+        @buffer+= "___SPRITES___\n"
+      end
 
-      @buffer+= "___SPRITES___\n"
       @buffer+="#{sheet.width}x#{sheet.height}"
       @buffer+="\n"
 
@@ -78,16 +122,32 @@ class AuthorEngine
         string = data
       end
 
+      identify_mode(string)
+
       load_code(string)
       load_spritesheet(string)
       load_levels(string)
     end
 
+    def identify_mode(string)
+      if RUBY_ENGINE != "opal" && string.lines.size > 0 && string.lines.first.include?("# inflated")
+        @mode = :inflated
+      else
+        @mode = :compact
+      end
+    end
+
     def load_code(string)
       buffer = ""
       in_code= false
       string.each_line do |line|
         if line.start_with?("___CODE___")
+          if line.strip.include?("?") && inflated?
+            # load from file
+            puts "Loading code from: #{line.strip.split("?").last}"
+            buffer = File.read(line.strip.split("?").last)
+            break
+          end
           in_code = true
           next
         end
@@ -109,6 +169,14 @@ class AuthorEngine
 
       string.each_line do |line|
         if line.strip.start_with?("___SPRITES___")
+          if line.strip.include?("?") && inflated?
+            # load from file
+            puts "Loading spritesheet from: #{line.strip.split("?").last}"
+            image  = Gosu::Image.new(line.strip.split("?").last, retro: true)
+            buffer = image.to_blob
+            width, height = image.width, image.height
+            break
+          end
           in_sprites = true
           next
         end
@@ -131,7 +199,11 @@ class AuthorEngine
 
       stream = nil
       if RUBY_ENGINE != "opal"
-        stream = buffer.scan(/../).map { |x| x.hex }.pack('c*')
+        if inflated?
+          stream = buffer
+        else
+          stream = buffer.scan(/../).map { |x| x.hex }.pack('c*')
+        end
       else
         stream = buffer.scan(/../).map { |x| Integer(x.hex) }
       end
@@ -145,6 +217,12 @@ class AuthorEngine
 
       string.each_line do |line|
         if line.start_with?("___LEVELS___")
+          # if line.strip.start_with?("__LEVELS___?")
+          #   # load from file
+          #   puts "Loading level data from: #{line.strip.split("?").last}"
+
+          #   break
+          # end
           in_level = true
           next
         end

data/lib/author_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: author_engine
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-26 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -189,8 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A virtual console that you code in Ruby.