From 795cb85e284d6adc83d8a8770e1e2406322f4034 Mon Sep 17 00:00:00 2001 From: realtradam Date: Sat, 12 Jun 2021 03:15:59 -0400 Subject: file cleanup --- components/00_renderable.rb | 19 -------- components/01_sprite.rb | 57 ----------------------- components/02_label.rb | 32 ------------- components/03_player_control.rb | 26 ----------- components/04_map.rb | 21 --------- components/05_interactable.rb | 16 ------- components/06_collidable.rb | 22 --------- components/07_battle.rb | 4 -- components/07_indoor.rb | 4 -- components/07_overworld.rb | 16 ------- components/debug_singleton.rb | 13 ------ deprecated/components/00_renderable.rb | 19 ++++++++ deprecated/components/01_sprite.rb | 57 +++++++++++++++++++++++ deprecated/components/02_label.rb | 32 +++++++++++++ deprecated/components/03_player_control.rb | 26 +++++++++++ deprecated/components/04_map.rb | 21 +++++++++ deprecated/components/05_interactable.rb | 16 +++++++ deprecated/components/06_collidable.rb | 22 +++++++++ deprecated/components/07_battle.rb | 4 ++ deprecated/components/07_indoor.rb | 4 ++ deprecated/components/07_overworld.rb | 16 +++++++ deprecated/components/debug_singleton.rb | 13 ++++++ deprecated/helpers/00_tileset.rb | 56 ++++++++++++++++++++++ deprecated/helpers/01_component.rb | 74 ++++++++++++++++++++++++++++++ deprecated/systems/00_update_levels.rb | 34 ++++++++++++++ deprecated/systems/10_player.rb | 41 +++++++++++++++++ deprecated/systems/99_render.rb | 37 +++++++++++++++ docs/FelFlame.html | 2 +- docs/FelFlame/Components.html | 2 +- docs/FelFlame/Entities.html | 2 +- docs/FelFlame/Helper.html | 2 +- docs/FelFlame/Helper/ComponentManager.html | 2 +- docs/FelFlame/Systems.html | 2 +- docs/_index.html | 2 +- docs/file.README.html | 5 +- docs/index.html | 5 +- docs/top-level-namespace.html | 2 +- felflame.rb | 8 ++-- helpers/00_tileset.rb | 56 ---------------------- helpers/01_component.rb | 74 ------------------------------ systems/00_update_levels.rb | 34 -------------- systems/10_player.rb | 41 ----------------- systems/99_render.rb | 37 --------------- 43 files changed, 491 insertions(+), 487 deletions(-) delete mode 100644 components/00_renderable.rb delete mode 100644 components/01_sprite.rb delete mode 100644 components/02_label.rb delete mode 100644 components/03_player_control.rb delete mode 100644 components/04_map.rb delete mode 100644 components/05_interactable.rb delete mode 100644 components/06_collidable.rb delete mode 100644 components/07_battle.rb delete mode 100644 components/07_indoor.rb delete mode 100644 components/07_overworld.rb delete mode 100644 components/debug_singleton.rb create mode 100644 deprecated/components/00_renderable.rb create mode 100644 deprecated/components/01_sprite.rb create mode 100644 deprecated/components/02_label.rb create mode 100644 deprecated/components/03_player_control.rb create mode 100644 deprecated/components/04_map.rb create mode 100644 deprecated/components/05_interactable.rb create mode 100644 deprecated/components/06_collidable.rb create mode 100644 deprecated/components/07_battle.rb create mode 100644 deprecated/components/07_indoor.rb create mode 100644 deprecated/components/07_overworld.rb create mode 100644 deprecated/components/debug_singleton.rb create mode 100644 deprecated/helpers/00_tileset.rb create mode 100644 deprecated/helpers/01_component.rb create mode 100644 deprecated/systems/00_update_levels.rb create mode 100644 deprecated/systems/10_player.rb create mode 100644 deprecated/systems/99_render.rb delete mode 100644 helpers/00_tileset.rb delete mode 100644 helpers/01_component.rb delete mode 100644 systems/00_update_levels.rb delete mode 100644 systems/10_player.rb delete mode 100644 systems/99_render.rb diff --git a/components/00_renderable.rb b/components/00_renderable.rb deleted file mode 100644 index 1d34fbb..0000000 --- a/components/00_renderable.rb +++ /dev/null @@ -1,19 +0,0 @@ -FelFlame::Components.new('Renderable', z: 0) -=begin -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 -=end diff --git a/components/01_sprite.rb b/components/01_sprite.rb deleted file mode 100644 index c02a51b..0000000 --- a/components/01_sprite.rb +++ /dev/null @@ -1,57 +0,0 @@ - -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 - -=begin -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 -=end diff --git a/components/02_label.rb b/components/02_label.rb deleted file mode 100644 index f73b12c..0000000 --- a/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/components/03_player_control.rb b/components/03_player_control.rb deleted file mode 100644 index f48b155..0000000 --- a/components/03_player_control.rb +++ /dev/null @@ -1,26 +0,0 @@ - -FelFlame::Components.new :PlayerControl, north: 'up', south: 'down', east: 'right', - west: 'left', interact: 'space', menu: 'enter' -=begin -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 -=end diff --git a/components/04_map.rb b/components/04_map.rb deleted file mode 100644 index 7700e9f..0000000 --- a/components/04_map.rb +++ /dev/null @@ -1,21 +0,0 @@ -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/components/05_interactable.rb b/components/05_interactable.rb deleted file mode 100644 index 636a216..0000000 --- a/components/05_interactable.rb +++ /dev/null @@ -1,16 +0,0 @@ -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| - self.send "#{key}=", value - end - end - end -end diff --git a/components/06_collidable.rb b/components/06_collidable.rb deleted file mode 100644 index 76ce51e..0000000 --- a/components/06_collidable.rb +++ /dev/null @@ -1,22 +0,0 @@ -class Components - # If an entity can be rendered on screen - class Collidable < Helper::BaseComponent - class < 1 + return {} + end + + json_tiles = self.get_json_tiles(json_name) + raise Exception.new "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 new file mode 100644 index 0000000..2065d0c --- /dev/null +++ b/deprecated/helpers/01_component.rb @@ -0,0 +1,74 @@ +class FelFlame + class Helper + +=begin + # Unused: + class Level < FelFlame::Helper::ComponentManager + class <= Components::Map.data[key].json['tilesets'].count + end + unless 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 + end +end diff --git a/docs/FelFlame.html b/docs/FelFlame.html index b49faea..1dba2dc 100644 --- a/docs/FelFlame.html +++ b/docs/FelFlame.html @@ -193,7 +193,7 @@ diff --git a/docs/FelFlame/Components.html b/docs/FelFlame/Components.html index 9c6c0c7..54946ae 100644 --- a/docs/FelFlame/Components.html +++ b/docs/FelFlame/Components.html @@ -403,7 +403,7 @@ diff --git a/docs/FelFlame/Entities.html b/docs/FelFlame/Entities.html index 38898a8..7669d53 100644 --- a/docs/FelFlame/Entities.html +++ b/docs/FelFlame/Entities.html @@ -1230,7 +1230,7 @@ diff --git a/docs/FelFlame/Helper.html b/docs/FelFlame/Helper.html index 2dbcd7a..497de3a 100644 --- a/docs/FelFlame/Helper.html +++ b/docs/FelFlame/Helper.html @@ -132,7 +132,7 @@ diff --git a/docs/FelFlame/Helper/ComponentManager.html b/docs/FelFlame/Helper/ComponentManager.html index acb1cf8..7f6e857 100644 --- a/docs/FelFlame/Helper/ComponentManager.html +++ b/docs/FelFlame/Helper/ComponentManager.html @@ -1067,7 +1067,7 @@ diff --git a/docs/FelFlame/Systems.html b/docs/FelFlame/Systems.html index 2dd4534..cfb3a95 100644 --- a/docs/FelFlame/Systems.html +++ b/docs/FelFlame/Systems.html @@ -124,7 +124,7 @@ diff --git a/docs/_index.html b/docs/_index.html index 0ae242d..2c11d39 100644 --- a/docs/_index.html +++ b/docs/_index.html @@ -164,7 +164,7 @@ diff --git a/docs/file.README.html b/docs/file.README.html index c1e498b..98047e1 100644 --- a/docs/file.README.html +++ b/docs/file.README.html @@ -61,7 +61,8 @@

Maintainability Test Coverage -Documentation Coverage

+Inline docs +Documentation Coverage

What is this?

@@ -353,7 +354,7 @@ complete I will use a more verbose explanation as below to help users of the fra diff --git a/docs/index.html b/docs/index.html index 1d9dc01..44132ea 100644 --- a/docs/index.html +++ b/docs/index.html @@ -61,7 +61,8 @@

Maintainability Test Coverage -Documentation Coverage

+Inline docs +Documentation Coverage

What is this?

@@ -353,7 +354,7 @@ complete I will use a more verbose explanation as below to help users of the fra diff --git a/docs/top-level-namespace.html b/docs/top-level-namespace.html index 869c856..804d156 100644 --- a/docs/top-level-namespace.html +++ b/docs/top-level-namespace.html @@ -127,7 +127,7 @@ diff --git a/felflame.rb b/felflame.rb index d6a1be4..005cfcb 100644 --- a/felflame.rb +++ b/felflame.rb @@ -4,9 +4,6 @@ require_relative './system_manager.rb' require_relative './scene_manager.rb' require_relative './stage_manager.rb' -require_relative './helpers/00_tileset.rb' -require_relative './helpers/01_component.rb' - class FelFlame # Creates and manages Entities. Allows accessing Entities using their {FelFlame::Entities#id ID} # @@ -28,13 +25,18 @@ end # An alias for {FelFlame} FF = FelFlame + # An alias for {FelFlame::Entities} FF::Ent = FelFlame::Entities + # An alias for {FelFlame::Components} FF::Cmp = FelFlame::Components + # An alias for {FelFlame::Systems} FF::Sys = FelFlame::Systems + # An alias for {FelFlame::Scenes} #FF::Sce = FelFlame::Scenes +# # An alias for {FelFlame::Stage} #FF::Stg = FelFlame::Stage diff --git a/helpers/00_tileset.rb b/helpers/00_tileset.rb deleted file mode 100644 index c4293cb..0000000 --- a/helpers/00_tileset.rb +++ /dev/null @@ -1,56 +0,0 @@ -# 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 < 1 - return {} - end - - json_tiles = self.get_json_tiles(json_name) - raise Exception.new "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/helpers/01_component.rb b/helpers/01_component.rb deleted file mode 100644 index 2065d0c..0000000 --- a/helpers/01_component.rb +++ /dev/null @@ -1,74 +0,0 @@ -class FelFlame - class Helper - -=begin - # Unused: - class Level < FelFlame::Helper::ComponentManager - class <= Components::Map.data[key].json['tilesets'].count - end - unless 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 - end -end -- cgit v1.2.3