From 313e60c3d896ab49f892b2c32f4b1a6f01790b9b Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 29 May 2022 01:21:21 -0500 Subject: [PATCH] [nostalgia/sample_project] Update type descriptors --- .../net.drinkingtea.nostalgia.core.Palette | 11 +++++++++++ .../net.drinkingtea.nostalgia.core.TileSheet | 14 +++++++++++++- ...t.drinkingtea.nostalgia.core.TileSheet.SubSheet | 2 +- .../net.drinkingtea.ox.FileAddress | 5 +++-- .../net.drinkingtea.ox.FileAddress.Data | 5 +++-- 5 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette new file mode 100644 index 00000000..62ffcff7 --- /dev/null +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette @@ -0,0 +1,11 @@ +O1;net.drinkingtea.ox.DescriptorType;2;{ + "fieldList" : + [ + { + "fieldName" : "colors", + "typeName" : "B:uint16_t" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.nostalgia.core.Palette" +} 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 2137fde6..753f2599 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet @@ -1,6 +1,18 @@ -O1;net.drinkingtea.ox.DescriptorType;1;{ +O1;net.drinkingtea.ox.DescriptorType;2;{ "fieldList" : [ + { + "fieldName" : "bpp", + "typeName" : "B:int8_t" + }, + { + "fieldName" : "defaultPalette", + "typeName" : "net.drinkingtea.ox.FileAddress" + }, + { + "fieldName" : "subsheet", + "typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet" + }, { "fieldName" : "bpp", "typeName" : "B:int8_t" 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 index 39b9101b..c785adca 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet @@ -1,4 +1,4 @@ -O1;net.drinkingtea.ox.DescriptorType;1;{ +O1;net.drinkingtea.ox.DescriptorType;2;{ "fieldList" : [ { diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress index 5ca39075..0a310c0c 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress @@ -1,4 +1,4 @@ -O1;net.drinkingtea.ox.DescriptorType;1;{ +O1;net.drinkingtea.ox.DescriptorType;2;{ "fieldList" : [ { @@ -6,7 +6,8 @@ O1;net.drinkingtea.ox.DescriptorType;1;{ "typeName" : "B:int8_t" }, { - "fieldName" : "data" + "fieldName" : "data", + "typeName" : "net.drinkingtea.ox.FileAddress.Data" } ], "primitiveType" : 5, diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data index ca616968..35a5bc88 100644 --- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data +++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data @@ -1,8 +1,9 @@ -O1;net.drinkingtea.ox.DescriptorType;1;{ +O1;net.drinkingtea.ox.DescriptorType;2;{ "fieldList" : [ { - "fieldName" : "path" + "fieldName" : "path", + "typeName" : "B:string" }, { "fieldName" : "constPath",