Config + fetching/writing paths
This commit is contained in:
parent
384b5fab35
commit
d33c4607e5
2 changed files with 1296 additions and 1288 deletions
36
main.odin
36
main.odin
|
|
@ -248,8 +248,8 @@ resource_path_is_type :: proc(path: string, type: ResourceType) -> bool {
|
||||||
return path[0] == resource_type_folder_names[type]
|
return path[0] == resource_type_folder_names[type]
|
||||||
}
|
}
|
||||||
|
|
||||||
resource_room_layer_create_instance :: proc(version, resource_version, object_name: string, x, y: f64, allocator := context.allocator) -> json.Object {
|
resource_room_layer_create_instance :: proc(version, resource_version, object_name: string, x, y: f64, path: string, allocator := context.allocator) -> json.Object {
|
||||||
instance_id_number := math.clamp(rand.uint32(), 0x10000000, 0xffffffff)
|
instance_id_number := rand.uint32() % (0xffffffff - 0x10000000) + 0x10000000
|
||||||
instance_id_hex_buffer: [8]byte
|
instance_id_hex_buffer: [8]byte
|
||||||
instance_id_hex := strconv.write_uint(instance_id_hex_buffer[:], u64(instance_id_number), 16)
|
instance_id_hex := strconv.write_uint(instance_id_hex_buffer[:], u64(instance_id_number), 16)
|
||||||
instance_id := strings.concatenate({"inst_", instance_id_hex}, allocator)
|
instance_id := strings.concatenate({"inst_", instance_id_hex}, allocator)
|
||||||
|
|
@ -271,7 +271,7 @@ resource_room_layer_create_instance :: proc(version, resource_version, object_na
|
||||||
|
|
||||||
object_id := make(json.Object, allocator)
|
object_id := make(json.Object, allocator)
|
||||||
object_id["name"] = object_name
|
object_id["name"] = object_name
|
||||||
object_id["path"] = "" // todo get object resource path
|
object_id["path"] = path
|
||||||
instance["objectId"] = object_id
|
instance["objectId"] = object_id
|
||||||
|
|
||||||
instance["properties"] = json.Array({})
|
instance["properties"] = json.Array({})
|
||||||
|
|
@ -395,7 +395,7 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
||||||
}
|
}
|
||||||
|
|
||||||
jmap_name_to_gamemaker_instance_map := make(map[string]^GameMakerInstanceDefinition)
|
jmap_name_to_gamemaker_instance_map := make(map[string]^GameMakerInstanceDefinition)
|
||||||
for &binding in jmap_instance_to_gamemaker_binding_map {
|
for key, &binding in jmap_instance_to_gamemaker_binding_map {
|
||||||
jmap_name_to_gamemaker_instance_map[binding.jmap_object_name] = &binding
|
jmap_name_to_gamemaker_instance_map[binding.jmap_object_name] = &binding
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -409,16 +409,22 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
||||||
fmt.eprintln("WARNING: Binding for jmap object '", key, "' does not exist", sep = "")
|
fmt.eprintln("WARNING: Binding for jmap object '", key, "' does not exist", sep = "")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
binding.changed = true
|
||||||
resource := resource_project_find_asset(yyp_project_json.(json.Object), binding.object_name, .Object)
|
jmap_name_to_gamemaker_instance_map[key].object_name = value.(json.Object)["object_name"].(json.String)
|
||||||
if resource == nil {
|
|
||||||
fmt.eprintln("WARNING: Binding for jmap object '", key, "' for '",binding.object_name ,"' was provided in jmap config but couldn't be found in project file", sep = "")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
fmt.println(resource.(json.Object))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for key, &binding in jmap_instance_to_gamemaker_binding_map {
|
||||||
|
resource := resource_project_find_asset(yyp_project_json.(json.Object), 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 = "")
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
binding.path = resource.(json.Object)["id"].(json.Object)["path"].(json.String)
|
||||||
|
}
|
||||||
|
|
||||||
room_resource := &room_resource_json.(json.Object)
|
room_resource := &room_resource_json.(json.Object)
|
||||||
room_layers := &(&room_resource["layers"]).(json.Array)
|
room_layers := &(&room_resource["layers"]).(json.Array)
|
||||||
|
|
||||||
|
|
@ -433,8 +439,8 @@ program :: proc(yyp_project_path, room_resource_path, jmap_path, jmap_config_pat
|
||||||
room_layer_instances := &((&room_layer["instances"]).(json.Array))
|
room_layer_instances := &((&room_layer["instances"]).(json.Array))
|
||||||
|
|
||||||
for jmap_instance in jmap_instance_list {
|
for jmap_instance in jmap_instance_list {
|
||||||
definition := jmap_instance_to_gamemaker_binding_map[jmap_instance.object_index]
|
binding := jmap_instance_to_gamemaker_binding_map[jmap_instance.object_index]
|
||||||
instance := resource_room_layer_create_instance("v4", "2.0", "something", 32, 32, context.allocator)
|
instance := resource_room_layer_create_instance("v4", "2.0", binding.object_name, 32, 32, binding.path, context.allocator)
|
||||||
append(room_layer_instances, instance)
|
append(room_layer_instances, instance)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -529,11 +535,13 @@ jmap_config_get_from_json :: proc(root: json.Value) -> (_config: JmapImportConfi
|
||||||
jmap_object_map_reverse: map[string]int
|
jmap_object_map_reverse: map[string]int
|
||||||
|
|
||||||
GameMakerInstanceDefinition :: struct {
|
GameMakerInstanceDefinition :: struct {
|
||||||
|
changed: bool,
|
||||||
object_name: string,
|
object_name: string,
|
||||||
jmap_object_name: string,
|
jmap_object_name: string,
|
||||||
|
path: string,
|
||||||
}
|
}
|
||||||
|
|
||||||
jmap_instance_to_gamemaker_binding_map := []GameMakerInstanceDefinition {
|
jmap_instance_to_gamemaker_binding_map := map[int]GameMakerInstanceDefinition {
|
||||||
1 = {object_name = "objBlock", jmap_object_name = "block"},
|
1 = {object_name = "objBlock", jmap_object_name = "block"},
|
||||||
2 = {object_name = "objMiniBlock", jmap_object_name = "mini_block"},
|
2 = {object_name = "objMiniBlock", jmap_object_name = "mini_block"},
|
||||||
3 = {object_name = "objSpikeUp", jmap_object_name = "spike_up"},
|
3 = {object_name = "objSpikeUp", jmap_object_name = "spike_up"},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue