parse properly
This commit is contained in:
parent
316fc8e0c8
commit
7c810460d9
4 changed files with 135 additions and 17 deletions
22
main.odin
22
main.odin
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
package main
|
||||
|
||||
import "core:encoding/json"
|
||||
import "base:runtime"
|
||||
import "core:os"
|
||||
import "core:math/rand"
|
||||
import "core:fmt"
|
||||
import "core:encoding/json"
|
||||
import "core:strings"
|
||||
import "core:strconv"
|
||||
import "core:mem"
|
||||
|
|
@ -395,6 +395,7 @@ ProgramErrorError :: enum {
|
|||
ProgramErrorType :: union {
|
||||
ProgramErrorError,
|
||||
JmapObjectListError,
|
||||
ResourceError,
|
||||
os.Error,
|
||||
json.Error,
|
||||
json.Marshal_Error,
|
||||
|
|
@ -411,26 +412,16 @@ program_error_create :: proc(error: ProgramErrorType, message: string, loc := #c
|
|||
}
|
||||
|
||||
program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_path: string, program_config: ProgramConfig) -> Maybe(ProgramError) {
|
||||
yyp_project_string, yyp_project_read_error := os.read_entire_file_from_path(yyp_project_path, context.allocator)
|
||||
yyp_project_root, yyp_project_read_error := resource_read(yyp_project_path)
|
||||
if yyp_project_read_error != nil {
|
||||
return program_error_create(yyp_project_read_error, fmt.tprint("Couldn't open Gamemaker project at '", yyp_project_path, "'", sep = ""))
|
||||
}
|
||||
|
||||
yyp_project_json, yyp_project_parse_error := json.parse_bytes(yyp_project_string, allocator = context.allocator)
|
||||
if yyp_project_parse_error != nil {
|
||||
return program_error_create(yyp_project_parse_error, "Couldn't parse Gamemaker project json")
|
||||
}
|
||||
|
||||
room_resource_string, room_resource_read_error := os.read_entire_file_from_path(room_resource_path, context.allocator)
|
||||
room_resource, room_resource_read_error := resource_read(room_resource_path)
|
||||
if room_resource_read_error != nil {
|
||||
return program_error_create(room_resource_read_error, fmt.tprint("Couldn't open GameMaker room resource at '", room_resource_path, "'", sep = ""))
|
||||
}
|
||||
|
||||
room_resource_json, room_resource_parse_error := json.parse_bytes(room_resource_string, allocator = context.allocator)
|
||||
if room_resource_parse_error != nil {
|
||||
return program_error_create(room_resource_parse_error ,"Failed to parse yyp project json")
|
||||
}
|
||||
|
||||
jmap_json, jmap_read_error := os.read_entire_file_from_path(jmap_path, context.allocator)
|
||||
if jmap_read_error != nil {
|
||||
return program_error_create(jmap_read_error, fmt.tprint("Couldn't open jmap path at '", jmap_path, "'", sep = ""))
|
||||
|
|
@ -485,7 +476,7 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
|||
}
|
||||
|
||||
for key, &binding in jmap_instance_to_gamemaker_binding_map {
|
||||
resource := resource_project_find_asset(yyp_project_json.(json.Object), binding.object_name, .Object)
|
||||
resource := resource_project_find_asset(yyp_project_root, binding.object_name, .Object)
|
||||
if resource == nil {
|
||||
if binding.changed {
|
||||
fmt.eprintln("WARNING: Resource for jmap object '", binding.jmap_object_name, "' couldn't be found in project file (looked for '", binding.object_name, "')", sep = "")
|
||||
|
|
@ -495,7 +486,6 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
|||
binding.path = resource.(json.Object)["id"].(json.Object)["path"].(json.String)
|
||||
}
|
||||
|
||||
room_resource := &room_resource_json.(json.Object)
|
||||
room_layers := &(&room_resource["layers"]).(json.Array)
|
||||
|
||||
room_layer, room_layer_found := resource_room_get_by_name(room_layers, jmap_config.layer)
|
||||
|
|
@ -535,7 +525,7 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
|||
append(room_layer_instances, instance)
|
||||
}
|
||||
|
||||
room_resource_after, room_resource_after_marshal_error := json.marshal(room_resource_json, GAMEMAKER_RESOURCE_JSON5_MARSHAL_OPTIONS)
|
||||
room_resource_after, room_resource_after_marshal_error := json.marshal(room_resource, GAMEMAKER_RESOURCE_JSON5_MARSHAL_OPTIONS)
|
||||
if room_resource_after_marshal_error != nil {
|
||||
return program_error_create(room_resource_after_marshal_error, "Failed to convert marshal room data to resource")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue