author_engine 0.1.0 → 0.3.0

data/lib/author_engine/views/level_editor.rb

@@ -1,7 +1,168 @@
 class AuthorEngine
   class LevelEditor < View
+
+    attr_reader :levels
+    def setup
+      @sprites_picker = SpritePicker.new(y: 0)
+      @sprites_picker.y = window.height - (@sprites_picker.height+(@sprites_picker.offset*2))
+
+      @level_picker = LevelPicker.new(y: self.y + 4)
+
+      @show_sprite_picker = true
+      @show_level_picker  = true
+      @show_coordinates   = true
+
+      if window.container.savefile.levels.size > 0
+        @levels = window.container.savefile.levels
+      else
+        @levels = [ [] ]
+      end
+
+      @viewport_x, @viewport_y = 0, 0
+
+      @scale = (self.height.to_f / AuthorEngine::Window::VIEW_HEIGHT)
+      @editor_x, @editor_y = self.width / 2 - ((AuthorEngine::Window::VIEW_HEIGHT * @scale) / 2), self.y
+
+      @sprite_size =  window.sprite_size
+      @coordinates = AuthorEngine::Text.new(z: 18)
+    end
+
     def focus
       window.caption = "Level Editor"
     end
+
+    def draw
+      super
+      @sprites_picker.draw if @show_sprite_picker
+      @level_picker.draw if @show_level_picker
+
+
+      Gosu.draw_rect(@editor_x - 4, @editor_y, (128 * @scale) + 8, (128 * @scale), white)
+      Gosu.clip_to(@editor_x, @editor_y, 128 * @scale,128 * @scale) do
+        Gosu.draw_rect(@editor_x, @editor_y, 128 * @scale,128 * @scale, Gosu::Color::BLACK)
+
+        Gosu.translate(@viewport_x, @viewport_y) do
+          Gosu.scale(@scale, @scale, @editor_x, @editor_y) do
+            if @levels[@level_picker.active_level]
+              @levels[@level_picker.active_level].each do |s|
+                SpriteEditor.instance.sprites[s.sprite].draw(
+                  ((s.x) * @sprite_size) + @editor_x,
+                  ((s.y) * @sprite_size) + @editor_y,
+                  s.z
+                )
+              end
+            end
+
+            SpriteEditor.instance.sprites[@sprites_picker.active_sprite].draw(
+              (normalize((window.mouse_x - @viewport_x) - @editor_x) * @sprite_size) + @editor_x,
+              (normalize((window.mouse_y - @viewport_y) - @editor_y) * @sprite_size) + @editor_y,
+              0, 1,1,
+              Gosu::Color.rgba(255,255,255, 150)
+            )
+          end
+        end
+      end
+
+      @coordinates.draw if @show_coordinates
+    end
+
+    def update
+      super
+
+      if mouse_over?(@sprites_picker) && @show_sprite_picker
+        @show_sprite_picker = true
+      else
+        @show_sprite_picker = false
+        if window.mouse_x.between?(@sprites_picker.x, @sprites_picker.x + @sprites_picker.width) &&
+          window.mouse_y.between?(window.height - (@sprites_picker.offset*2+4), window.height)
+          @show_sprite_picker = true
+        end
+      end
+
+      if mouse_over?(@level_picker) && @show_level_picker
+        @show_level_picker = true
+      else
+        @show_level_picker = false
+        if window.mouse_x.between?(@level_picker.x, @level_picker.x + @level_picker.width) &&
+          window.mouse_y.between?(self.y, self.y + (@level_picker.offset*2+4))
+          @show_level_picker = true
+        end
+      end
+
+      if mouse_inside_view?
+        if (!@show_sprite_picker && !@show_level_picker)
+          @show_coordinates = true
+          @coordinates.message = "x: #{normalize((window.mouse_x - @viewport_x) - @editor_x)}, y: #{normalize((window.mouse_y - @viewport_y) - @editor_y)}"
+          @coordinates.x = window.mouse_x
+          @coordinates.y = window.mouse_y - window.square_scale*16
+          move_viewport
+        else
+          @show_coordinates = false
+        end
+      end
+
+      # puts "X: #{normalize(window.mouse_x - @editor_x)} y: #{normalize(window.mouse_y - @editor_y)}"
+    end
+
+    def place_or_remove_tile(button)
+      return unless mouse_inside_view?
+
+      case button
+      when Gosu::MsLeft
+        place(normalize((window.mouse_x - @viewport_x) - @editor_x), normalize((window.mouse_y - @viewport_y) - @editor_y), @level_picker.active_layer, :add)
+      when Gosu::MsRight
+        place(normalize((window.mouse_x - @viewport_x) - @editor_x), normalize((window.mouse_y - @viewport_y) - @editor_y), @level_picker.active_layer, :remove)
+      end
+    end
+
+    def move_viewport
+      if window.button_down?(Gosu::KbUp)
+        @viewport_y += 1 * @scale
+      elsif window.button_down?(Gosu::KbDown)
+        @viewport_y -= 1 * @scale
+      elsif window.button_down?(Gosu::KbLeft)
+        @viewport_x += 1 * @scale
+      elsif window.button_down?(Gosu::KbRight)
+        @viewport_x -= 1 * @scale
+      elsif window.button_down?(Gosu::Kb0)
+        @viewport_x, @viewport_y = 0, 0
+      end
+    end
+
+    def normalize(int)
+      i = (int.to_f / (@sprite_size * @scale)).floor
+
+      return i
+    end
+
+    def place(x, y, z, mode)
+      sprite = @levels[@level_picker.active_level].detect do |s|
+        s.x == x && s.y == y && s.z == z
+      end
+
+      case mode
+      when :add
+        new_sprite = Sprite.new(@sprites_picker.active_sprite, x, y, z)
+        if sprite
+          @levels[@level_picker.active_level][@levels[@level_picker.active_level].index(sprite)] = new_sprite
+        else
+          @levels[@level_picker.active_level] << new_sprite
+        end
+      when :remove
+        @levels[@level_picker.active_level].delete(sprite) if sprite
+      else
+        raise
+      end
+    end
+
+    def button_up(id)
+      super
+      @sprites_picker.button_up(id) if @show_sprite_picker
+      @level_picker.button_up(id)   if @show_level_picker
+
+      if (!@show_sprite_picker && !@show_level_picker)
+        place_or_remove_tile(id)
+      end
+    end
   end
 end

data/lib/author_engine/views/play_viewer.rb

@@ -110,6 +110,7 @@ class AuthorEngine
       # super
       if @running
         catch_error do
+          @game.collision_detection.clear
           update_game
         end
       else

data/lib/author_engine.rb

@@ -1,10 +1,12 @@
 require "gosu"
 require "coderay"
 
-require_relative "author_engine/game/parts/common"
-require_relative "author_engine/game/parts/graphics"
-require_relative "author_engine/game/parts/colors"
-require_relative "author_engine/game/parts/input"
+require_relative "author_engine/game/common/parts/collision_detection"
+
+require_relative "author_engine/game/gosu/parts/common"
+require_relative "author_engine/game/gosu/parts/graphics"
+require_relative "author_engine/game/gosu/parts/colors"
+require_relative "author_engine/game/gosu/parts/input"
 
 require_relative "author_engine/window"
 require_relative "author_engine/support"
@@ -14,10 +16,13 @@ require_relative "author_engine/button"
 require_relative "author_engine/text"
 require_relative "author_engine/sprite"
 require_relative "author_engine/sprite_picker"
+require_relative "author_engine/level_picker"
 require_relative "author_engine/palette"
 require_relative "author_engine/image"
 require_relative "author_engine/save_file"
 
+
+require_relative "author_engine/collision_detection/collision_detection"
 require_relative "author_engine/game/game"
 
 require_relative "author_engine/code_editor/cursor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: author_engine
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: opal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,17 +129,28 @@ files:
 - bin/author_engine
 - lib/author_engine.rb
 - lib/author_engine/button.rb
+- lib/author_engine/cli.rb
 - lib/author_engine/code_editor/cursor.rb
 - lib/author_engine/code_editor/highlighting.rb
+- lib/author_engine/collision_detection/collision_detection.rb
 - lib/author_engine/container.rb
 - lib/author_engine/containers/editor.rb
 - lib/author_engine/containers/loader.rb
+- lib/author_engine/game/common/parts/collision_detection.rb
 - lib/author_engine/game/game.rb
-- lib/author_engine/game/parts/colors.rb
-- lib/author_engine/game/parts/common.rb
-- lib/author_engine/game/parts/graphics.rb
-- lib/author_engine/game/parts/input.rb
+- lib/author_engine/game/gosu/parts/colors.rb
+- lib/author_engine/game/gosu/parts/common.rb
+- lib/author_engine/game/gosu/parts/graphics.rb
+- lib/author_engine/game/gosu/parts/input.rb
+- lib/author_engine/game/opal/exporter.rb
+- lib/author_engine/game/opal/game_runner.rb
+- lib/author_engine/game/opal/parts/colors.rb
+- lib/author_engine/game/opal/parts/common.rb
+- lib/author_engine/game/opal/parts/graphics.rb
+- lib/author_engine/game/opal/parts/input.rb
 - lib/author_engine/image.rb
+- lib/author_engine/level_picker.rb
+- lib/author_engine/opal.rb
 - lib/author_engine/palette.rb
 - lib/author_engine/save_file.rb
 - lib/author_engine/sprite.rb
@@ -139,8 +164,9 @@ files:
 - lib/author_engine/views/play_viewer.rb
 - lib/author_engine/views/sprite_editor.rb
 - lib/author_engine/window.rb
-- test_3.authorengine
-- testing.authorengine
+- screenshots/code_editor.png
+- screenshots/play.png
+- screenshots/sprite_editor.png
 homepage: https://github.com/cyberarm/author_engineV2
 licenses:
 - MIT
@@ -150,6 +176,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- assets
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -162,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A virtual console that you code in Ruby.