Implemented basic .wdz file opening and verified that JSON files can be read in chiventure #800
Conversation
(haven't tested on actual files yet)
| @@ -6,7 +6,6 @@ | |||
| #define INCLUDE_ATTRIBUTES_H | |||
| #define MAXLEN_ID 60 // ID strings for objects | |||
|
|
|||
| typedef struct obj object_t; // forward declaration so attribute_t can use | |||
There was a problem hiding this comment.
I agree with this change as attributes.c doesn't use object_ts
src/wdl/src/load_game.c
Outdated
| @@ -17,6 +19,21 @@ | |||
| */ | |||
| game_t *load_wdl(char *path_to_yaml) | |||
| { | |||
|
|
|||
| // WDZ loading monkeypatch. | |||
There was a problem hiding this comment.
This should be a block comment
src/wdl/src/load_wdz_common.c
Outdated
| } | ||
| else if (json_object_is_type(j_value, json_type_object)) | ||
| { | ||
| // The only file with an object-type value as top-level |
There was a problem hiding this comment.
This hsould be a block comment
src/wdl/src/load_wdz_lzip.c
Outdated
|
|
||
| #include "wdl/load_wdz_internal.h" | ||
|
|
||
| // maximum buffer size for json file, in bytes. This is currently set to 2 MiB. |
src/wdl/src/load_wdz_lzip.c
Outdated
| return NULL; | ||
| } | ||
|
|
||
| // Don't try to JSON-parse files that don't have a .json extension. |
src/wdl/src/load_wdz_lzip.c
Outdated
| return NULL; | ||
| } | ||
|
|
||
| // buf now contains the raw JSON. Use parser to convert into json obj. |
|
|
||
| // buf now contains the raw JSON. Use parser to convert into json obj. | ||
| // print out behind the main chiventure executable for debug and demo. | ||
| printf("%s\n", (char *)buf); |
There was a problem hiding this comment.
why are these printing directly to stdout?
There was a problem hiding this comment.
It was for debug purposes and to not disrupt the UI of chiventure when it loads up. Is there a better place for me to output this? Since it will also be how we'll showcase that our code loads the zip file and reads the json files properly.
src/wdl/src/load_wdz_lzip.c
Outdated
| if (j_obj) // This is NULL if the path doesn't end in .json | ||
| { | ||
| load_game_objects_from_json_object(obj_store, j_obj); | ||
| // increment the current number of json files. |
There was a problem hiding this comment.
this comment should go on the same line as count++;
…ago-cs/chiventure into wdl/parsing-wdz-stabledemo
|
Successfully merged some basic .wdz zip opening and JSON reading functionality into chiventure. This can be invoked by running the main chiventure executable, passing in a file that ends in .wdz with the right directory structure, and quitting out of the main chiventure UI (with Ctrl+D); the contents of all the json files in the .wdz archive should have been printed out onto stdout. This PR introduces libzip and json-c dependencies into the chiventure codebase, and also serves as a foundation for the more complete implementation of object imports later on. |
|
Issue Score: ✔️++ Comments: |
(a reopen of #798 with the correct branch this time)
The branch implements some basic wdz file loading and prints out the contents of the JSON files contained inside to the terminal behind chiventure's main UI. This serves as both a demo for the team, a first introduction of libzip and json-c dependencies to the chiventure codebase, and a proof of concept that the .wdz file loading functionality is on the right track.
This does not, however, convert the parsed JSON objects into game objects, which should be implemented later. (in branch wdl/parsing-wdz-namanh).
Addresses #529 but does not fulfill it completely. We will make a separate backlog issue for final conversion of json objects into game objects.