gbtiles 0.0.3 → 0.1.0

data/lib/gbtiles/gbm/map/objects/map_settings.rb

@@ -5,46 +5,21 @@ module GBTiles
         class MapSettings < GBTiles::GBM::Map::Object
 
           attr_accessor :form_width
-          @form_width
-
           attr_accessor :form_height
-          @form_height
-
           attr_accessor :form_maximized
-          @form_maximized
-
           attr_accessor :info_panel
-          @info_panel
-
           attr_accessor :grid
-          @grid
-
           attr_accessor :double_markers
-          @double_markers
-
           attr_accessor :prop_colors
-          @prop_colors
-
           attr_accessor :zoom
-          @zoom
-
           attr_accessor :color_set
-          @color_set
-
           attr_accessor :bookmarks
-          @bookmarks
-
           attr_accessor :block_fill_pattern
-          @block_fill_pattern
-
           attr_accessor :block_fill_width
-          @block_fill_width
-
           attr_accessor :block_fill_height
-          @block_fill_height
 
           def initialize
-            super GBTiles::GBM::Map::ObjectType::MAP_SETTINGS
+            super GBTiles::GBM::Map::OBJECT_TYPE[:map_settings]
           end
 
           def self.initFromBitString src

data/lib/gbtiles/gbm/map/objects/map_tile_data.rb

@@ -5,10 +5,9 @@ module GBTiles
         class MapTileData < GBTiles::GBM::Map::Object
 
           attr_accessor :records
-          @records
 
           def initialize
-            super GBTiles::GBM::Map::ObjectType::MAP_TILE_DATA
+            super GBTiles::GBM::Map::OBJECT_TYPE[:map_tile_data]
 
             @records = []
           end

data/lib/gbtiles/gbm/map/objects/map_tile_data_record.rb

@@ -5,19 +5,10 @@ module GBTiles
         class MapTileDataRecord
 
           attr_accessor :tile_number
-          @tile_number
-
           attr_accessor :gbc_palette
-          @gbc_palette
-
           attr_accessor :sgb_palette
-          @sgb_palette
-
           attr_accessor :flipped_horizontally
-          @flipped_horizontally
-
           attr_accessor :flipped_vertically
-          @flipped_vertically
 
           def initialize
           end

data/lib/gbtiles/gbm/map/objects/producer.rb

@@ -5,19 +5,14 @@ module GBTiles
         class Producer < GBTiles::GBM::Map::Object
 
           attr_accessor :name
-          @name
-
           attr_accessor :version
-          @version
-          
           attr_accessor :info
-          @info
 
           def initialize
-            super GBTiles::GBM::Map::ObjectType::PRODUCER
+            super GBTiles::GBM::Map::OBJECT_TYPE[:producer]
           end
 
-          def self.initFromBitString(src)
+          def self.initFromBitString src
             object = GBTiles::GBM::Map::Objects::Producer.new
 
             object.name     = GBTiles::DataType.string!(src, 128)

data/lib/gbtiles/gbm/map/objects/unknown.rb

@@ -5,7 +5,6 @@ module GBTiles
         class Unknown < GBTiles::GBM::Map::Object
 
           attr_accessor :object_data
-          @object_data
 
         end
       end

data/lib/gbtiles/gbr/cli/convert.rb

@@ -1,29 +1,12 @@
-require "gbtiles/data_type"
-
-require "gbtiles/gbr/tile_set/tile_set"
-require "gbtiles/gbr/tile_set/object"
-require "gbtiles/gbr/tile_set/object_type"
-require "gbtiles/gbr/tile_set/split_order"
-require "gbtiles/gbr/tile_set/color_set"
-
-require "gbtiles/gbr/tile_set/objects/palettes"
-require "gbtiles/gbr/tile_set/objects/producer"
-require "gbtiles/gbr/tile_set/objects/tile_data"
-require "gbtiles/gbr/tile_set/objects/tile_export"
-require "gbtiles/gbr/tile_set/objects/tile_import"
-require "gbtiles/gbr/tile_set/objects/tile_pal"
-require "gbtiles/gbr/tile_set/objects/tile_settings"
-require "gbtiles/gbr/tile_set/objects/unknown"
-
+require "gbtiles/helpers/data_type"
 require "gbtiles/gbr/import/gbr_file"
-
 require "gbtiles/gbr/export/asm/asm"
 
 desc "Convert a file from GBR format"
 arg_name "input"
 command :convert do |c|
 
-  c.desc "Output filename (*.s)"
+  c.desc "Output filename [*.s]"
   c.flag :output
 
   c.action do |global_options,options,args|

data/lib/gbtiles/gbr/export/asm/asm.rb

@@ -8,7 +8,6 @@ module GBTiles
           include ERB::Util
 
           attr_accessor :tile_set
-          @tile_set
 
           def initialize
           end

data/lib/gbtiles/gbr/import/gbr_file.rb

@@ -1,22 +1,38 @@
+require "gbtiles/helpers/fixnum"
+
+require "gbtiles/gbr/tile_set/tile_set"
+require "gbtiles/gbr/tile_set/object"
+require "gbtiles/gbr/tile_set/object_type"
+require "gbtiles/gbr/tile_set/split_order"
+require "gbtiles/gbr/tile_set/color_set"
+
+require "gbtiles/gbr/tile_set/objects/palettes"
+require "gbtiles/gbr/tile_set/objects/producer"
+require "gbtiles/gbr/tile_set/objects/tile_data"
+require "gbtiles/gbr/tile_set/objects/tile_export"
+require "gbtiles/gbr/tile_set/objects/tile_import"
+require "gbtiles/gbr/tile_set/objects/tile_pal"
+require "gbtiles/gbr/tile_set/objects/tile_settings"
+require "gbtiles/gbr/tile_set/objects/unknown"
+
 module GBTiles
   module GBR
     module Import
       class GBRFile
-        attr_accessor :version, :tile_set
 
-        @version
-        @tile_set
+        attr_accessor :version
+        attr_accessor :tile_set
 
-        def initialize()
+        def initialize
           @tile_set = GBTiles::GBR::TileSet::TileSet.new
         end
 
-        def self.open(file)
+        def self.open file
           import = GBTiles::GBR::Import::GBRFile.new
 
           # Check to see if this is a valid file type
           if (file.read(3) != "GBO") then
-            raise "Invalid file, header does not start with GBO"
+            raise IOError, "Not a valid file (expected: GBO)"
           end
 
           # Version number
@@ -29,27 +45,27 @@ module GBTiles
             object_len  = GBTiles::DataType.long(file.read(4))
             object_data = file.read(object_len)
 
-            case object_type
-            when GBTiles::GBR::TileSet::ObjectType::PRODUCER
-              object = GBTiles::GBR::TileSet::Objects::Producer.initFromBitString object_data
+            case GBTiles::GBR::TileSet::OBJECT_TYPE.key(object_type)
+            when :producer
+              object = GBTiles::GBR::TileSet::Objects::Producer.initFromBitString(object_data)
 
-            when GBTiles::GBR::TileSet::ObjectType::TILE_DATA
-              object = GBTiles::GBR::TileSet::Objects::TileData.initFromBitString object_data
+            when :tile_data
+              object = GBTiles::GBR::TileSet::Objects::TileData.initFromBitString(object_data)
 
-            when GBTiles::GBR::TileSet::ObjectType::TILE_SETTINGS
-              object = GBTiles::GBR::TileSet::Objects::TileSettings.initFromBitString object_data
+            when :tile_settings
+              object = GBTiles::GBR::TileSet::Objects::TileSettings.initFromBitString(object_data)
 
-            when GBTiles::GBR::TileSet::ObjectType::TILE_EXPORT
-              object = GBTiles::GBR::TileSet::Objects::TileExport.initFromBitString object_data
+            when :tile_export
+              object = GBTiles::GBR::TileSet::Objects::TileExport.initFromBitString(object_data)
 
-            when GBTiles::GBR::TileSet::ObjectType::TILE_IMPORT
-              object = GBTiles::GBR::TileSet::Objects::TileImport.initFromBitString object_data
+            when :tile_import
+              object = GBTiles::GBR::TileSet::Objects::TileImport.initFromBitString(object_data)
 
-            when GBTiles::GBR::TileSet::ObjectType::PALETTES
-              object = GBTiles::GBR::TileSet::Objects::Palettes.initFromBitString object_data
+            when :palettes
+              object = GBTiles::GBR::TileSet::Objects::Palettes.initFromBitString(object_data)
 
-            when GBTiles::GBR::TileSet::ObjectType::TILE_PAL
-              object = GBTiles::GBR::TileSet::Objects::TilePal.initFromBitString object_data
+            when :tile_pal
+              object = GBTiles::GBR::TileSet::Objects::TilePal.initFromBitString(object_data)
 
             else
               object = GBTiles::GBR::TileSet::Objects::Unknown.new object_type

data/lib/gbtiles/gbr/tile_set/color_set.rb

@@ -1,12 +1,12 @@
 module GBTiles
   module GBR
     module TileSet
-      module ColorSet
-        POCKET    = 0
-        GAME_BOY  = 1
-        GBC       = 2
-        SGB       = 3
-      end
+      COLOR_SET = {
+        :pocket     => 0,
+        :game_boy   => 1,
+        :gbc        => 2,
+        :sgb        => 3
+      }
     end
   end
 end

data/lib/gbtiles/gbr/tile_set/export_type.rb

@@ -1,13 +1,13 @@
 module GBTiles
   module GBR
     module TileSet
-      module ExportType
-        RGBDS_ASSEMBLY  = 0x00
-        RGBDS_OBJECT    = 0x01
-        TASM_ASSEMBLY   = 0x02
-        GBDK_C          = 0x03
-        BINARY          = 0x04
-      end
+      EXPORT_TYPE = {
+        :rgbds_assembly   => 0x00,
+        :rgbds_object     => 0x01,
+        :tasm_assembly    => 0x02,
+        :gbdk_c           => 0x03,
+        :binary           => 0x04
+      }
     end
   end
 end

data/lib/gbtiles/gbr/tile_set/object.rb

@@ -4,10 +4,7 @@ module GBTiles
       class Object
 
         attr_accessor :object_id
-        @object_id
-
         attr_accessor :object_type
-        @object_type
 
         def initialize object_type
           @object_type = object_type

data/lib/gbtiles/gbr/tile_set/object_type.rb

@@ -1,16 +1,16 @@
 module GBTiles
   module GBR
     module TileSet
-      module ObjectType
-        PRODUCER      = 0x01
-        TILE_DATA     = 0x02
-        TILE_SETTINGS = 0x03
-        TILE_EXPORT   = 0x04
-        TILE_IMPORT   = 0x05
-        PALETTES      = 0x0D
-        TILE_PAL      = 0x0E
-        DELETED       = 0xFF
-      end
+      OBJECT_TYPE = {
+        :producer       => 0x01,
+        :tile_data      => 0x02,
+        :tile_settings  => 0x03,
+        :tile_export    => 0x04,
+        :tile_import    => 0x05,
+        :palettes       => 0x0D,
+        :tile_pal       => 0x0E,
+        :deleted        => 0xFF
+      }
     end
   end
 end

data/lib/gbtiles/gbr/tile_set/objects/palettes.rb

@@ -5,22 +5,13 @@ module GBTiles
         class Palettes < GBTiles::GBR::TileSet::Object
 
           attr_accessor :id
-          @id
-
           attr_accessor :count
-          @count
-
           attr_accessor :colors
-          @colors
-
           attr_accessor :sgb_count
-          @sgb_count
-
           attr_accessor :sgb_colors
-          @sgb_colors
 
           def initialize
-            super GBTiles::GBR::TileSet::ObjectType::PALETTES
+            super GBTiles::GBR::TileSet::OBJECT_TYPE[:palettes]
           end
 
           def self.initFromBitString src

data/lib/gbtiles/gbr/tile_set/objects/producer.rb

@@ -5,16 +5,11 @@ module GBTiles
         class Producer < GBTiles::GBR::TileSet::Object
 
           attr_accessor :name
-          @name
-
           attr_accessor :version
-          @version
-
           attr_accessor :info
-          @info
 
           def initialize
-            super GBTiles::GBR::TileSet::ObjectType::PRODUCER
+            super GBTiles::GBR::TileSet::OBJECT_TYPE[:producer]
           end
 
           def self.initFromBitString src

data/lib/gbtiles/gbr/tile_set/objects/tile_data.rb

@@ -5,25 +5,14 @@ module GBTiles
         class TileData < GBTiles::GBR::TileSet::Object
 
           attr_accessor :name
-          @name
-
           attr_accessor :width
-          @width
-
           attr_accessor :height
-          @height
-
           attr_accessor :count
-          @count
-
           attr_accessor :color_set
-          @color_set
-
           attr_accessor :data
-          @data
 
           def initialize
-            super GBTiles::GBR::TileSet::ObjectType::TILE_DATA
+            super GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_data]
           end
 
           def self.initFromBitString src
@@ -39,7 +28,7 @@ module GBTiles
             object
           end
 
-          def render_tile(tile_index)
+          def render_tile tile_index
             tile = []
 
             tile_data = @data.slice(

data/lib/gbtiles/gbr/tile_set/objects/tile_export.rb

@@ -5,70 +5,29 @@ module GBTiles
         class TileExport < GBTiles::GBR::TileSet::Object
 
           attr_accessor :tile_id
-          @tile_id
-
           attr_accessor :file_name
-          @file_name
-
           attr_accessor :file_type
-          @file_type
-
           attr_accessor :section_name
-          @section_name
-
           attr_accessor :label_name
-          @label_name
-
           attr_accessor :bank
-          @bank
-
           attr_accessor :tile_array
-          @tile_array
-
           attr_accessor :format
-          @format
-
           attr_accessor :counter
-          @counter
-
           attr_accessor :from
-          @from
-
           attr_accessor :upto
-          @upto
-
           attr_accessor :compression
-          @compression
-
           attr_accessor :include_colors
-          @include_colors
-
           attr_accessor :sgb_palettes
-          @sgb_palettes
-
           attr_accessor :gbc_palettes
-          @gbc_palettes
-
           attr_accessor :make_meta_tiles
-          @make_meta_tiles
-
           attr_accessor :meta_offset
-          @meta_offset
-
           attr_accessor :meta_counter
-          @meta_counter
-
           attr_accessor :split
-          @split
-
           attr_accessor :block_size
-          @block_size
-
           attr_accessor :sel_tab
-          @sel_tab
 
           def initialize
-            super GBTiles::GBR::TileSet::ObjectType::TILE_EXPORT
+            super GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_export]
           end
 
           def self.initFromBitString src