diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic deleted file mode 100644 index 6ba7203d..00000000 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic +++ /dev/null @@ -1,108 +0,0 @@ -O1;net.drinkingtea.ox.DescriptorType;1;{ - "fieldList" : - [ - { - "fieldName" : "bpp", - "type" : - { - "fieldList" : [], - "length" : 1, - "primitiveType" : 1, - "typeName" : "B:int8_t" - } - }, - { - "fieldName" : "rows", - "type" : - { - "fieldList" : [], - "length" : 4, - "primitiveType" : 1, - "typeName" : "B:int32_t" - } - }, - { - "fieldName" : "columns", - "typeName" : "B:int32_t" - }, - { - "fieldName" : "defaultPalette", - "type" : - { - "fieldList" : - [ - { - "fieldName" : "type", - "typeName" : "B:int8_t" - }, - { - "fieldName" : "data", - "type" : - { - "fieldList" : - [ - { - "fieldName" : "path", - "type" : - { - "fieldList" : [], - "primitiveType" : 4, - "typeName" : "B:string" - } - }, - { - "fieldName" : "constPath", - "typeName" : "B:string" - }, - { - "fieldName" : "inode", - "type" : - { - "fieldList" : [], - "length" : 8, - "typeName" : "B:uint64_t" - } - } - ], - "primitiveType" : 6, - "typeName" : "net.drinkingtea.ox.FileAddress.Data" - } - } - ], - "primitiveType" : 5, - "typeName" : "net.drinkingtea.ox.FileAddress" - } - }, - { - "fieldName" : "pal", - "type" : - { - "fieldList" : - [ - { - "fieldName" : "colors", - "type" : - { - "fieldList" : [], - "length" : 2, - "typeName" : "B:uint16_t" - } - } - ], - "primitiveType" : 5, - "typeName" : "net.drinkingtea.nostalgia.core.NostalgiaPalette" - } - }, - { - "fieldName" : "pixels", - "type" : - { - "fieldList" : [], - "length" : 1, - "typeName" : "B:uint8_t" - } - } - ], - "primitiveType" : 5, - "typeName" : "net.drinkingtea.nostalgia.core.NostalgiaGraphic" -} diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaPalette b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaPalette deleted file mode 100644 index cfb86842..00000000 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaPalette +++ /dev/null @@ -1,16 +0,0 @@ -O1;net.drinkingtea.ox.DescriptorType;1;{ - "fieldList" : - [ - { - "fieldName" : "colors", - "type" : - { - "fieldList" : [], - "length" : 2, - "typeName" : "B:uint16_t" - } - } - ], - "primitiveType" : 5, - "typeName" : "net.drinkingtea.nostalgia.core.NostalgiaPalette" -} diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet index a90a9331..2137fde6 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet @@ -3,103 +3,15 @@ O1;net.drinkingtea.ox.DescriptorType;1;{ [ { "fieldName" : "bpp", - "type" : - { - "fieldList" : [], - "length" : 1, - "primitiveType" : 1, - "typeName" : "B:int8_t" - } + "typeName" : "B:int8_t" }, { "fieldName" : "defaultPalette", - "type" : - { - "fieldList" : - [ - { - "fieldName" : "type", - "typeName" : "B:int8_t" - }, - { - "fieldName" : "data", - "type" : - { - "fieldList" : - [ - { - "fieldName" : "path", - "type" : - { - "fieldList" : [], - "primitiveType" : 4, - "typeName" : "B:string" - } - }, - { - "fieldName" : "constPath", - "typeName" : "B:string" - }, - { - "fieldName" : "inode", - "type" : - { - "fieldList" : [], - "length" : 8, - "typeName" : "B:uint64_t" - } - } - ], - "primitiveType" : 6, - "typeName" : "net.drinkingtea.ox.FileAddress.Data" - } - } - ], - "primitiveType" : 5, - "typeName" : "net.drinkingtea.ox.FileAddress" - } + "typeName" : "net.drinkingtea.ox.FileAddress" }, { "fieldName" : "subsheet", - "type" : - { - "fieldList" : - [ - { - "fieldName" : "name", - "typeName" : "B:string" - }, - { - "fieldName" : "rows", - "type" : - { - "fieldList" : [], - "length" : 4, - "primitiveType" : 1, - "typeName" : "B:int32_t" - } - }, - { - "fieldName" : "columns", - "typeName" : "B:int32_t" - }, - { - "fieldName" : "subsheets", - "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet" - }, - { - "fieldName" : "pixels", - "type" : - { - "fieldList" : [], - "length" : 1, - "typeName" : "B:uint8_t" - } - } - ], - "primitiveType" : 5, - "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet" - } + "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet" } ], "primitiveType" : 5, diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet new file mode 100644 index 00000000..39b9101b --- /dev/null +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet @@ -0,0 +1,27 @@ +O1;net.drinkingtea.ox.DescriptorType;1;{ + "fieldList" : + [ + { + "fieldName" : "name", + "typeName" : "B:string" + }, + { + "fieldName" : "rows", + "typeName" : "B:int32_t" + }, + { + "fieldName" : "columns", + "typeName" : "B:int32_t" + }, + { + "fieldName" : "subsheets", + "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet" + }, + { + "fieldName" : "pixels", + "typeName" : "B:uint8_t" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet" +} diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress new file mode 100644 index 00000000..5ca39075 --- /dev/null +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress @@ -0,0 +1,14 @@ +O1;net.drinkingtea.ox.DescriptorType;1;{ + "fieldList" : + [ + { + "fieldName" : "type", + "typeName" : "B:int8_t" + }, + { + "fieldName" : "data" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.ox.FileAddress" +} diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data new file mode 100644 index 00000000..ca616968 --- /dev/null +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data @@ -0,0 +1,18 @@ +O1;net.drinkingtea.ox.DescriptorType;1;{ + "fieldList" : + [ + { + "fieldName" : "path" + }, + { + "fieldName" : "constPath", + "typeName" : "B:string" + }, + { + "fieldName" : "inode", + "typeName" : "B:uint64_t" + } + ], + "primitiveType" : 6, + "typeName" : "net.drinkingtea.ox.FileAddress.Data" +} diff --git a/sample_project/Palettes/Charset.npal b/sample_project/Palettes/Charset.npal index c9e15bcc..a36ba8e9 100644 Binary files a/sample_project/Palettes/Charset.npal and b/sample_project/Palettes/Charset.npal differ diff --git a/sample_project/Palettes/Dirt.npal b/sample_project/Palettes/Dirt.npal index 99468746..8be698b1 100644 --- a/sample_project/Palettes/Dirt.npal +++ b/sample_project/Palettes/Dirt.npal @@ -1 +1 @@ -M2;net.drinkingtea.nostalgia.core.NostalgiaPalette;1;ûÿ³Ö +M2;net.drinkingtea.nostalgia.core.Palette;1;ûÿ³Ö \ No newline at end of file diff --git a/sample_project/TileSheets/Charset.ng b/sample_project/TileSheets/Charset.ng index 487bb983..797a97e0 100644 Binary files a/sample_project/TileSheets/Charset.ng and b/sample_project/TileSheets/Charset.ng differ diff --git a/sample_project/TileSheets/Dirt.ng b/sample_project/TileSheets/Dirt.ng index 7f79822a..8fa39b53 100644 Binary files a/sample_project/TileSheets/Dirt.ng and b/sample_project/TileSheets/Dirt.ng differ