From 004604ad0146268c6d3d0d69ab6e5fb01ee74b06 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 3 Mar 2021 19:31:11 +0000 Subject: convert all 2d graphics in titledemo --- tools/nitrogfx/json.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'tools/nitrogfx/json.c') diff --git a/tools/nitrogfx/json.c b/tools/nitrogfx/json.c index fa9f9e5e..7804a2ba 100644 --- a/tools/nitrogfx/json.c +++ b/tools/nitrogfx/json.c @@ -174,6 +174,7 @@ struct JsonToScreenOptions *ParseNSCRJson(char *path) cJSON *layer = NULL; cJSON *layers = cJSON_GetObjectItemCaseSensitive(json, "layers"); + int palette = 0; cJSON_ArrayForEach(layer, layers) { cJSON *tile = NULL; @@ -181,9 +182,19 @@ struct JsonToScreenOptions *ParseNSCRJson(char *path) int i = 0; cJSON_ArrayForEach(tile, data) { - options->data[i] = (short)(GetInt(tile) - 1); //TODO horizontal and vertical flips + int tileInt = GetInt(tile) - 1; + if (tileInt != -1) + { + bool vFlip = tileInt >> 30; + bool hFlip = tileInt >> 31; + tileInt |= vFlip << 11; + tileInt |= hFlip << 10; + tileInt |= palette << 12; + options->data[i] = (short) (tileInt & 0xFFFF); + } i++; } + palette++; } cJSON_Delete(json); -- cgit v1.2.3