diff options
| author | realtradam <[email protected]> | 2022-02-17 07:55:00 -0500 |
|---|---|---|
| committer | realtradam <[email protected]> | 2022-02-17 07:55:00 -0500 |
| commit | fcd25e47987a8fd35a1712201dcc035707fd462c (patch) | |
| tree | 74e5513a0859bc9ed2e0843071c341730a992260 /deprecated | |
| parent | 99ebe846c1f2aeb63d21eb2a0ddebcf751d28aae (diff) | |
| download | FelECS-fcd25e47987a8fd35a1712201dcc035707fd462c.tar.gz FelECS-fcd25e47987a8fd35a1712201dcc035707fd462c.zip | |
fix code climate and remove deprecated files
Diffstat (limited to 'deprecated')
| -rw-r--r-- | deprecated/components/00_renderable.rb | 19 | ||||
| -rw-r--r-- | deprecated/components/01_sprite.rb | 56 | ||||
| -rw-r--r-- | deprecated/components/02_label.rb | 32 | ||||
| -rw-r--r-- | deprecated/components/03_player_control.rb | 25 | ||||
| -rw-r--r-- | deprecated/components/04_map.rb | 22 | ||||
| -rw-r--r-- | deprecated/components/05_interactable.rb | 18 | ||||
| -rw-r--r-- | deprecated/components/06_collidable.rb | 20 | ||||
| -rw-r--r-- | deprecated/components/07_battle.rb | 6 | ||||
| -rw-r--r-- | deprecated/components/07_indoor.rb | 6 | ||||
| -rw-r--r-- | deprecated/components/07_overworld.rb | 18 | ||||
| -rw-r--r-- | deprecated/components/debug_singleton.rb | 15 | ||||
| -rw-r--r-- | deprecated/helpers/00_tileset.rb | 58 | ||||
| -rw-r--r-- | deprecated/helpers/01_component.rb | 67 | ||||
| -rw-r--r-- | deprecated/systems/00_update_levels.rb | 36 | ||||
| -rw-r--r-- | deprecated/systems/10_player.rb | 43 | ||||
| -rw-r--r-- | deprecated/systems/99_render.rb | 47 |
16 files changed, 0 insertions, 488 deletions
diff --git a/deprecated/components/00_renderable.rb b/deprecated/components/00_renderable.rb deleted file mode 100644 index 32c93b6..0000000 --- a/deprecated/components/00_renderable.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -FelFlame::Components.new('Renderable', z: 0) -# class Components -# # If an entity can be rendered on screen -# class Renderable < Helper::BaseComponent -# attr_accessor :z -# -# def initialize -# @z = 0 -# end -# -# def set(**opts) -# opts.each do |key, value| -# self.send "#{key}=", value -# end -# end -# end -# end diff --git a/deprecated/components/01_sprite.rb b/deprecated/components/01_sprite.rb deleted file mode 100644 index 4ae6713..0000000 --- a/deprecated/components/01_sprite.rb +++ /dev/null @@ -1,56 +0,0 @@ -# frozen_string_literal: true - -FelFlame::Components.new('Sprite', :x, :y, :w, :h, :path, :angle, :a, :r, :g, :b, - :source_x, :source_y, :source_w, :source_h, - :tile_x, :tile_y, :tile_w, :tile_h, - :flip_horizontally, :flip_vertically, - :angle_anchor_x, :angle_anchor_y, primative_marker: :sprite) - -# Components::Sprite.define_method('primative_marker') do -# :sprite -# end - -# class Components -# # If an entity can be rendered on screen -# class Sprite < Helper::BaseComponent -# -# attr_accessor :x, :y, :w, :h, :path, :angle, :a, :r, :g, :b, -# :source_x, :source_y, :source_w, :source_h, -# :tile_x, :tile_y, :tile_w, :tile_h, -# :flip_horizontally, :flip_vertically, -# :angle_anchor_x, :angle_anchor_y -# -# def set(x: @x, y: @y, w: @w, h: @h, path: @path, angle: @angle, a: @a, r: @r, g: @g, b: @b, -# source_x: @source_x, source_y: @source_y, source_w: @source_w, source_h: @source_h, -# tile_x: @tile_x, tile_y: @tile_y, tile_w: @tile_w, tile_h: @tile_h, -# flip_horizontally: @flip_horizontally, flip_vertically: @flip_vertically, -# angle_anchor_x: @angle_anchor_x, angle_anchor_y: @angle_anchor_y) -# {x: @x = x, -# y: @y = y, -# w: @w = w, -# h: @h = h, -# path: @path = path, -# angle: @angle = angle, -# a: @a = a, -# r: @r = r, -# g: @g = g, -# b: @b = b, -# source_x: @source_x = source_x, -# source_y: @source_y = source_y, -# source_w: @source_w = source_w, -# source_h: @source_h = source_h, -# tile_x: @tile_x = tile_x, -# tile_y: @tile_y = tile_y, -# tile_w: @tile_w = tile_w, -# tile_h: @tile_h = tile_h, -# flip_horizontally: @flip_horizontally = flip_horizontally, -# flip_vertically: @flip_vertically = flip_vertically, -# angle_anchor_x: @angle_anchor_x = angle_anchor_x, -# angle_anchor_y: @angle_anchor_y = angle_anchor_y} -# end -# -# def primative_marker -# :sprite -# end -# end -# end diff --git a/deprecated/components/02_label.rb b/deprecated/components/02_label.rb deleted file mode 100644 index f73b12c..0000000 --- a/deprecated/components/02_label.rb +++ /dev/null @@ -1,32 +0,0 @@ - -FelFlame::Components.new :Label, :x, :y, :text, :size_enum, :alignment_enum, - :a, :r, :g, :b, :font, :vertical_alignment_enum, primative_marker: :label -=begin -class Components - # A dragonruby label wrapper - class Label < Helper::BaseComponent - - attr_accessor :x, :y, :text, :size_enum, :alignment_enum, - :a, :r, :g, :b, :font, :vertical_alignment_enum - - def set(x: @x, y: @y, text: @text, size_enum: @size_enum, alignment_enum: @alignment_enum, - a: @a, r: @r, g: @g, b: @b, font: @font, vertical_alignment_enum: @vertical_alignment_enum) - {x: @x = x, - y: @y = y, - text: @text = text, - size_enum: @size_enum = size_enum, - alignment_enum: @alignment_enum = alignment_enum, - r: @r = r, - g: @g = g, - b: @b = b, - a: @a = a, - font: @font = font, - vertical_alignment_enum: @vertical_alignment_enum = vertical_alignment_enum } - end - - def primative_marker - :label - end - end -end -end diff --git a/deprecated/components/03_player_control.rb b/deprecated/components/03_player_control.rb deleted file mode 100644 index 6414547..0000000 --- a/deprecated/components/03_player_control.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -FelFlame::Components.new :PlayerControl, north: 'up', south: 'down', east: 'right', - west: 'left', interact: 'space', menu: 'enter' -# class Components -# # Gives control(keyboard or otherwise) over an object -# class PlayerControl < Helper::BaseComponent -# attr_accessor :north, :south, :east, :west, :interact, :menu -# -# def initialize -# @north = 'up' -# @south = 'down' -# @east = 'right' -# @west = 'left' -# @interact = 'space' -# @menu = 'enter' -# end -# -# def set(**opts) -# opts.each do |key, value| -# send "#{key}=", value -# end -# end -# end -# end diff --git a/deprecated/components/04_map.rb b/deprecated/components/04_map.rb deleted file mode 100644 index 5d110f0..0000000 --- a/deprecated/components/04_map.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class Components - # dragonruby label wrapper - class Map < Helper::BaseComponent - attr_accessor :json_name, :json, :x, :y, :tilewidth, :tileheight, :a, :r, :g, :b - - def set(json_name: @json_name, x: @x, y: @y, tilewidth: @tilewidth, - tileheight: @tileheight, a: @a, r: @r, g: @g, b: @b) - { json_name: @json_name = json_name, - json: @json = Helper.get_json_tiles(json_name), - x: @x = x, - y: @y = y, - tilewidth: @tilewidth = tilewidth, - tileheight: @tileheight = tileheight, - r: @r = r, - g: @g = g, - b: @b = b, - a: @a = a } - end - end -end diff --git a/deprecated/components/05_interactable.rb b/deprecated/components/05_interactable.rb deleted file mode 100644 index bee91f6..0000000 --- a/deprecated/components/05_interactable.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -class Components - # If an entity can be rendered on screen - class Interactable < Helper::BaseComponent - attr_accessor :z - - def initialize - @z = z - end - - def set(**opts) - opts.each do |key, value| - send "#{key}=", value - end - end - end -end diff --git a/deprecated/components/06_collidable.rb b/deprecated/components/06_collidable.rb deleted file mode 100644 index 4fde638..0000000 --- a/deprecated/components/06_collidable.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -class Components - # If an entity can be rendered on screen - class Collidable < Helper::BaseComponent - class << self - end - attr_accessor :grid - - def initialize - @grid = [[]] - end - - def set(**opts) - opts.each do |key, value| - send "#{key}=", value - end - end - end -end diff --git a/deprecated/components/07_battle.rb b/deprecated/components/07_battle.rb deleted file mode 100644 index 996c03c..0000000 --- a/deprecated/components/07_battle.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -class Components - class Battle < Helper::Level - end -end diff --git a/deprecated/components/07_indoor.rb b/deprecated/components/07_indoor.rb deleted file mode 100644 index 762c239..0000000 --- a/deprecated/components/07_indoor.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -class Components - class Indoor < Helper::Level - end -end diff --git a/deprecated/components/07_overworld.rb b/deprecated/components/07_overworld.rb deleted file mode 100644 index cea11f5..0000000 --- a/deprecated/components/07_overworld.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -class Components - class Overworld < Helper::Level - attr_accessor :x, :y - - def initialize - @x = 0 - @y = 0 - end - - def set(**opts) - opts.each do |key, value| - send "#{key}=", value - end - end - end -end diff --git a/deprecated/components/debug_singleton.rb b/deprecated/components/debug_singleton.rb deleted file mode 100644 index e667191..0000000 --- a/deprecated/components/debug_singleton.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -class Components - # If an entity can be rendered on screen - class DebugSingleton - class << self - @data = false - attr_accessor :data - - def id - 0 - end - end - end -end diff --git a/deprecated/helpers/00_tileset.rb b/deprecated/helpers/00_tileset.rb deleted file mode 100644 index 9d727f9..0000000 --- a/deprecated/helpers/00_tileset.rb +++ /dev/null @@ -1,58 +0,0 @@ -# frozen_string_literal: true - -# Coverage Ignored because the functionality of this -# code will not be used for the core of FelFlame. -# It will most likely be released as a seperate package -# The code will most likely be kept here until it -# eventually will be migrated to a new git repo -# :nocov: -class Helper - # Returns a loaded map and its dependecies(images,json) - # If any are missing then it will load them from files - - @json_data = {} - class << self - attr_accessor :json_data - - def get_json_tiles(json_name, hitbox: false) - return nil if !hitbox && (json_name == 'hitbox' && !Components::DebugSingleton.data) - - if json_data[json_name].nil? - json_data[json_name] = $gtk.parse_json_file "assets/json/#{json_name}.json" - raise StandardError, "#{json_name} is null and not loaded. Cannot get json tile" if json_data[json_name].nil? - - if json_data[json_name]['type'] == 'map' # json_name.split("_").first == 'map' - json_data[json_name]['tilesets'].each do |tileset| - tileset = Helper.get_json_tiles(tileset['source'].split('/').last.delete_suffix('.tsx')) - # download tileset here - # $gtk.args.gtk.http_get 'https://mysite.net/#{tileset['name']}.png' - end - end - end - json_data[json_name] - end - - def get_tile(json_name:, tile_index:) - if json_name == 'hitbox' && !Components::DebugSingleton.data - return tile_index - 1 if tile_index > 1 - - return {} - end - - json_tiles = get_json_tiles(json_name) - raise StandardError, 'Error, json file not a tileset' unless json_tiles['type'] == 'tileset' - return tile_index - json_tiles['tilecount'] if tile_index > json_tiles['tilecount'] - - source_height_tiles = (tile_index.to_i / json_tiles['columns'].to_i).to_i # * json_tiles['tileheight'] - { w: json_tiles['tilewidth'], - h: json_tiles['tileheight'], - path: json_tiles['image'].split('mygame/').last.delete('\\'), - source_x: [((tile_index % json_tiles['columns']) - 1) * json_tiles['tilewidth'], 0].max, - # source_y gets special treatment - source_y: [json_tiles['imageheight'] - ((source_height_tiles + 1) * json_tiles['tileheight']), 0].max, - source_w: json_tiles['tilewidth'], - source_h: json_tiles['tileheight'] } - end - end -end -# :nocov: diff --git a/deprecated/helpers/01_component.rb b/deprecated/helpers/01_component.rb deleted file mode 100644 index 12cce09..0000000 --- a/deprecated/helpers/01_component.rb +++ /dev/null @@ -1,67 +0,0 @@ -# frozen_string_literal: true - -class FelFlame - class Helper - # # Unused: - # class Level < FelFlame::Helper::ComponentManager - # class <<self - # def data - # @data ||= { add: [], remove: [], grid: FelFlame::Helper::Array2D.new } - # end - # - # def add(entity_id) - # super - # data[:add].push entity_id - # end - # - # def remove(entity_id) - # data[:remove].push entity_id - # super - # end - # end - # end - # class Array2D < Array - # def [](val) - # unless val.nil? - # return self[val] = [] if super.nil? - # end - # super - # end - # end - # class ArrayOfHashes < Array - # def [](val) - # unless val.nil? - # return self[val] = {} if super.nil? - # end - # super - # end - # end - - # module ComponentHelper - # class <<self - # def up? char - # char == char.upcase - # end - # - # def down? char - # char == char.downcase - # end - # - # def underscore(input) - # output = input[0].downcase - # (1...(input.length - 1)).each do |iter| - # if down?(input[iter]) && up?(input[iter + 1]) - # output += "#{input[iter].downcase}_" - # elsif up?(input[iter - 1]) && up?(input[iter]) && down?(input[iter + 1]) - # output += "_#{input[iter].downcase}" - # else - # output += input[iter].downcase - # end - # end - # output += input[-1].downcase unless input.length == 1 - # output - # end - # end - # end - end -end diff --git a/deprecated/systems/00_update_levels.rb b/deprecated/systems/00_update_levels.rb deleted file mode 100644 index 5805123..0000000 --- a/deprecated/systems/00_update_levels.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -class Systems - class UpdateLevels - @co = Components::Overworld - def self.run - @co.data[:add].each do |id| - @co.data[:add].delete(id) - if !(Components::Sprite.id & Entity.signatures[id]).zero? - @co.data[:grid][@co.data[id].x][@co.data[id].y] = {} if @co.data[:grid][@co.data[id].x][@co.data[id].y].nil? - # @co.data[:grid][@co.data[id].x][@co.data[id].y].merge!({ player: true }) - puts @co.data[:grid][@co.data[id].x][@co.data[id].y].inspect - elsif !(Components::Map.id & Entity.signatures[id]).zero? - if Components::Map.data[id].json['tilesets'].last['source'].split('/').last.delete('\\').delete_suffix('.tsx') == 'hitbox' - Components::Map.data[id].json['layers'].each do |layer| - layer['chunks'].each do |chunk| - chunk['data'].each_slice(chunk['width']).with_index do |row, row_index| - row.each_with_index do |tile, column_index| - if tile.to_i == Components::Map.data[id].json['tilesets'].last['firstgid'].to_i - @co.data[:grid][column_index][row_index] = {} if @co.data[:grid][column_index][row_index].nil? - @co.data[:grid][column_index][row_index].merge!({ hitbox: true }) - end - end - end - end - end - end - end - puts @co.data[:grid] - end - Components::Overworld.data[:remove].each do |id| - Components::Overworld.data[:remove].delete(id) - end - end - end -end diff --git a/deprecated/systems/10_player.rb b/deprecated/systems/10_player.rb deleted file mode 100644 index ae8564d..0000000 --- a/deprecated/systems/10_player.rb +++ /dev/null @@ -1,43 +0,0 @@ -# frozen_string_literal: true - -class Systems - class Player - @co = Components::Overworld - def self.run - Components::PlayerControl.data.each do |id, data| - puts6 "Right: #{@co.data[:grid][@co.data[id].x + 1][@co.data[id].y]}" - puts6 "Left #{@co.data[:grid][@co.data[id].x - 1][@co.data[id].y]}" - puts6 "Down #{@co.data[:grid][@co.data[id].x][@co.data[id].y + 1]}" - puts6 "Up #{@co.data[:grid][@co.data[id].x][@co.data[id].y - 1]}" - # puts6 @co.data[:grid][@co.data[id].x + 1][@co.data[id].y][:hitbox].nil? - - unless (Components::Sprite.id & Entity.signatures[id]).zero? - if $gtk.args.inputs.keyboard.key_down.send(data.north) && \ - (@co.data[:grid][@co.data[id].x][@co.data[id].y - 1].nil? || \ - @co.data[:grid][@co.data[id].x][@co.data[id].y - 1][:hitbox].nil?) - Components::Sprite.data[id].y -= 64 - @co.data[id].y -= 1 - elsif $gtk.args.inputs.keyboard.key_down.send(data.south) && \ - (@co.data[:grid][@co.data[id].x][@co.data[id].y + 1].nil? || \ - @co.data[:grid][@co.data[id].x][@co.data[id].y + 1][:hitbox].nil?) - Components::Sprite.data[id].y += 64 - @co.data[id].y += 1 - elsif $gtk.args.inputs.keyboard.key_down.send(data.east) && \ - (@co.data[:grid][@co.data[id].x + 1][@co.data[id].y].nil? || \ - @co.data[:grid][@co.data[id].x + 1][@co.data[id].y][:hitbox].nil?) - Components::Sprite.data[id].x += 64 - @co.data[id].x += 1 - elsif $gtk.args.inputs.keyboard.key_down.send(data.west) && \ - (@co.data[:grid][@co.data[id].x - 1][@co.data[id].y].nil? || @co.data[:grid][@co.data[id].x - 1][@co.data[id].y][:hitbox].nil?) - Components::Sprite.data[id].x -= 64 - @co.data[id].x -= 1 - end - # Components::Sprite.data[id].y -= 64 if $gtk.args.inputs.keyboard.key_down.send(data.north) - # Components::Sprite.data[id].y += 64 if $gtk.args.inputs.keyboard.key_down.send(data.south) - # Components::Sprite.data[id].x += 64 if $gtk.args.inputs.keyboard.key_down.send(data.east) - # Components::Sprite.data[id].x -= 64 if $gtk.args.inputs.keyboard.key_down.send(data.west) - end - end - end - end -end diff --git a/deprecated/systems/99_render.rb b/deprecated/systems/99_render.rb deleted file mode 100644 index dc1092e..0000000 --- a/deprecated/systems/99_render.rb +++ /dev/null @@ -1,47 +0,0 @@ -# frozen_string_literal: true - -class Systems - class Render - def self.run - Components::Renderable.data.sort_by { |v| v[1].z }.each do |key, _data| - if !(Components::Sprite.id & Entity.signatures[key]).zero? - $gtk.args.outputs.sprites << Components::Sprite.data[key].set - elsif !(Components::Label.id & Entity.signatures[key]).zero? - $gtk.args.outputs.labels << Components::Label.data[key].set - elsif !(Components::Map.id & Entity.signatures[key]).zero? - Components::Map.data[key].json['layers'].each do |layer| - layer['chunks'].each do |chunk| - chunk['data'].each_slice(chunk['width']).with_index do |row, row_index| - row.each_with_index do |tile, column_index| - next if tile.zero? - - iter = 0 - loop do - tile = Helper.get_tile( - json_name: Components::Map.data[key].json['tilesets'][iter]['source'].split('/').last.delete('\\').delete_suffix('.tsx'), tile_index: tile - ) - break if tile.is_a?(Hash) - - if (iter += 1) >= Components::Map.data[key].json['tilesets'].count - raise StandardError, - "#{Components::Map.data[key].json["json_name"]} not valid map, exceeded tile range" - end - end - next if tile.empty? - - tile[:x] = - Components::Map.data[key].x + (Components::Map.data[key].tilewidth * column_index) + chunk['x'] - tile[:y] = - Components::Map.data[key].y + (Components::Map.data[key].tileheight * row_index) + chunk['y'] - tile[:w] = Components::Map.data[key].tilewidth - tile[:h] = Components::Map.data[key].tileheight - $gtk.args.outputs.sprites << tile - end - end - end - end - end - end - end - end -end |
