minits progress

armorpaint/Sources/make_material.ts

@@ -262,7 +262,7 @@ function make_material_bake_node_previews() {
 	}
 	make_material_traverse_nodes(ui_nodes_get_canvas_material().nodes, null, []);
 
-	let keys: string[] = map_keys_to_array(context_raw.node_previews);
+	let keys: string[] = map_keys(context_raw.node_previews);
 	for (let i: i32 = 0; i < keys.length; ++i) {
 		let key: string = keys[i];
 		if (array_index_of(context_raw.node_previews_used, key) == -1) {

armorpaint/Sources/tab_layers.ts

@@ -230,7 +230,7 @@ function tab_layers_init_layer_map(): map_t<slot_layer_t, i32> {
 
 function tab_layers_fill_layer_map(map: map_t<slot_layer_t, i32>): map_t<i32, i32> {
 	let res: map_t<i32, i32> = map_create();
-	let keys: string[] = map_keys_to_array(map);
+	let keys: string[] = map_keys(map);
 	for (let i: i32 = 0; i < keys.length; ++i) {
 		let l: string = keys[i];
 		map_set(res, map_get(map, l), array_index_of(project_layers, l) > -1 ? array_index_of(project_layers, l) : 9999);

armorsculpt/Sources/make_material.ts

@@ -263,7 +263,7 @@ function make_material_bake_node_previews() {
 	}
 	make_material_traverse_nodes(ui_nodes_get_canvas_material().nodes, null, []);
 
-	let keys: string[] = map_keys_to_array(context_raw.node_previews);
+	let keys: string[] = map_keys(context_raw.node_previews);
 	for (let i: i32 = 0; i < keys.length; ++i) {
 		let key: string = keys[i];
 		if (array_index_of(context_raw.node_previews_used, key) == -1) {

armorsculpt/Sources/tab_layers.ts

@@ -112,7 +112,7 @@ function tab_layers_init_layer_map(): map_t<slot_layer_t, i32> {
 
 function tab_layers_fill_layer_map(map: map_t<slot_layer_t, i32>): map_t<i32, i32> {
 	let res: map_t<i32, i32> = map_create();
-	let keys: string[] = map_keys_to_array(map);
+	let keys: string[] = map_keys(map);
 	for (let i: i32 = 0; i < keys.length; ++i) {
 		let l = keys[i];
 		map_set(res, map_get(map, l), array_index_of(project_layers, l) > -1 ? array_index_of(project_layers, l) : 9999);

base/Sources/box_preferences.ts

@@ -614,7 +614,7 @@ function box_preferences_show() {
 
 			let index: i32 = 0;
 			ui.changed = false;
-			let keys: string[] = map_keys_to_array(config_keymap);
+			let keys: string[] = map_keys(config_keymap);
 			for (let i: i32 = 0; i < keys.length; ++i) {
 				let key: string = keys[i];
 				let h: zui_handle_t = zui_nest(zui_handle(__ID__), index++);

base/Sources/box_projects.ts

@@ -5,7 +5,7 @@ let box_projects_icon_map: map_t<string, image_t> = null;
 
 function box_projects_show() {
 	if (box_projects_icon_map != null) {
-		let keys: string[] = map_keys_to_array(box_projects_icon_map);
+		let keys: string[] = map_keys(box_projects_icon_map);
 		for (let i: i32 = 0; i < keys.length; ++i) {
 			let handle: string = keys[i];
 			data_delete_image(handle);

base/Sources/config.ts

@@ -185,7 +185,7 @@ function config_load_keymap() {
 	if (config_raw.keymap != "default.json") {
 		let blob: buffer_t = data_get_blob("keymap_presets/" + config_raw.keymap);
 		let new_keymap: map_t<string, string> = json_parse_to_map(sys_buffer_to_string(blob));
-		let keys: string[] = map_keys_to_array(new_keymap);
+		let keys: string[] = map_keys(new_keymap);
 		for (let i: i32 = 0; i < keys.length; ++i) {
 			let key: string = keys[i];
 			map_set(config_keymap, key, map_get(new_keymap, key));

base/Sources/node_shader.ts

@@ -309,9 +309,9 @@ function node_shader_get_hlsl(raw: node_shader_t, shared_sampler: string): strin
 		s += "SamplerState " + shared_sampler + ";\n";
 	}
 
-	let values: string[] = map_to_array(raw.functions);
-	for (let i: i32 = 0; i < values.length; ++i) {
-		let f: string = values[i];
+	let keys: string[] = map_keys(raw.functions);
+	for (let i: i32 = 0; i < keys.length; ++i) {
+		let f: string = map_get(raw.functions, keys[i]);
 		s += f + "\n";
 	}
 
@@ -512,9 +512,9 @@ function node_shader_get_msl(raw: node_shader_t, shared_sampler: string): string
 		s += "};\n";
 	}
 
-	let values: string[] = map_to_array(raw.functions);
-	for (let i: i32 = 0; i < values.length; ++i) {
-		let f: string = values[i];
+	let keys: string[] = map_keys(raw.functions);
+	for (let i: i32 = 0; i < keys.length; ++i) {
+		let f: string = map_get(raw.functions, keys[i]);
 		s += f + "\n";
 	}
 
@@ -669,9 +669,9 @@ function node_shader_get_glsl(raw: node_shader_t, shared_sampler: string, versio
 		let a: string = raw.shared_samplers[i];
 		s += "uniform " + a + ";\n";
 	}
-	let values: string[] = map_to_array(raw.functions);
-	for (let i: i32 = 0; i < values.length; ++i) {
-		let f: string = values[i];
+	let keys: string[] = map_keys(raw.functions);
+	for (let i: i32 = 0; i < keys.length; ++i) {
+		let f: string = map_get(raw.functions, keys[i]);
 		s += f + "\n";
 	}
 	s += "void main() {\n";

base/Sources/operator.ts

@@ -13,7 +13,7 @@ function operator_run(name: string) {
 
 function operator_update() {
 	if (mouse_started_any() || keyboard_started_any()) {
-		let keys: string[] = map_keys_to_array(config_keymap);
+		let keys: string[] = map_keys(config_keymap);
 		for (let i: i32 = 0; i < keys.length; ++i) {
 			let op: string = keys[i];
 			if (operator_shortcut(map_get(config_keymap, op))) {

base/Sources/physics_world.ts

@@ -41,9 +41,9 @@ function physics_world_create(): physics_world_t {
 }
 
 function physics_world_reset(pw: physics_world_t) {
-	let values: physics_body_t[] = map_to_array(pw.body_map);
-	for (let i: i32 = 0; i < values.length; ++i) {
-		let body: physics_body_t = values[i];
+	let keys: string[] = map_keys(pw.body_map);
+	for (let i: i32 = 0; i < keys.length; ++i) {
+		let body: physics_body_t = map_get(pw.body_map, keys[i]);
 		physics_world_remove_body(pw, body);
 	}
 }
@@ -125,9 +125,9 @@ function physics_world_late_update(pw: physics_world_t) {
 
 	pw.world.stepSimulation(pw.time_step, pw.max_steps, t);
 	physics_world_update_contacts(pw);
-	let values: physics_body_t[] = map_to_array(pw.body_map);
-	for (let i: i32 = 0; i < values.length; ++i) {
-		let body: physics_body_t = values[i];
+	let keys: string[] = map_keys(pw.body_map);
+	for (let i: i32 = 0; i < keys.length; ++i) {
+		let body: physics_body_t = map_get(pw.body_map, keys[i]);
 		physics_body_physics_update(body);
 	}
 }

base/Sources/render_path_base.ts

@@ -40,9 +40,9 @@ function render_path_base_init_voxels(target_name: string = "voxels") {
 function render_path_base_apply_config() {
 	if (render_path_base_super_sample != config_raw.rp_supersample) {
 		render_path_base_super_sample = config_raw.rp_supersample;
-		let values: render_target_t[] = map_to_array(render_path_render_targets);
-		for (let i: i32 = 0; i < values.length; ++i) {
-			let rt: render_target_t = values[i];
+		let keys: string[] = map_keys(render_path_render_targets);
+		for (let i: i32 = 0; i < keys.length; ++i) {
+			let rt: render_target_t = map_get(render_path_render_targets, keys[i]);
 			if (rt.width == 0 && rt.scale != null) {
 				rt.scale = render_path_base_super_sample;
 			}

base/Sources/tab_plugins.ts

@@ -19,9 +19,9 @@ function tab_plugins_draw(htab: zui_handle_t) {
 		zui_end_sticky();
 
 		// Draw plugins
-		let values: plugin_t[] = map_to_array(plugin_map);
-		for (let i: i32 = 0; i < values.length; ++i) {
-			let p: plugin_t = values[i];
+		let keys: string[] = map_keys(plugin_map);
+		for (let i: i32 = 0; i < keys.length; ++i) {
+			let p: plugin_t = map_get(plugin_map, keys[i]);
 			if (p.draw_ui != null) {
 				p.draw_ui(ui);
 			}

base/Sources/translator.ts

@@ -22,10 +22,9 @@ function tr(id: string, vars: map_t<string, string> = null): string {
 	}
 
 	if (vars != null) {
-		let keys: string[] = map_keys_to_array(vars);
-		let values: string[] = map_to_array(vars);
+		let keys: string[] = map_keys(vars);
 		for (let i: i32 = 0; i < keys.length; ++i) {
-			translation = string_replace_all(translation, "{" + keys[i] + "}", any_to_string(values[i]));
+			translation = string_replace_all(translation, "{" + keys[i] + "}", any_to_string(map_get(vars, keys[i])));
 		}
 	}
 
@@ -69,7 +68,7 @@ function translator_load_translations(new_locale: string) {
 		let translation_json: string = sys_buffer_to_string(krom_load_blob("data/locale/" + config_raw.locale + ".json"));
 
 		let data: map_t<string, string> = json_parse_to_map(translation_json);
-		let keys: string[] = map_keys_to_array(data);
+		let keys: string[] = map_keys(data);
 		for (let i: i32 = 0; i < keys.length; ++i) {
 			let field: string = keys[i];
 			map_set(translator_translations, field, map_get(data, field));
@@ -81,9 +80,9 @@ function translator_load_translations(new_locale: string) {
 
 	// Push additional char codes contained in translation file
 	let cjk: bool = false;
-	let values: string[] = map_to_array(translator_translations);
-	for (let i: i32 = 0; i < values.length; ++i) {
-		let s: string = values[i];
+	let keys: string[] = map_keys(translator_translations);
+	for (let i: i32 = 0; i < keys.length; ++i) {
+		let s: string = map_get(translator_translations, keys[i]);
 		for (let i: i32 = 0; i < s.length; ++i) {
 			// Assume cjk in the > 1119 range for now
 			if (char_code_at(s, i) > 1119 && array_index_of(_g2_font_glyphs, char_code_at(s, i)) == -1) {

base/Sources/ui_base.ts

@@ -228,9 +228,9 @@ function ui_base_update() {
 	ui_base_update_ui();
 	operator_update();
 
-	let values: plugin_t[] = map_to_array(plugin_map);
-	for (let i: i32 = 0; i < values.length; ++i) {
-		let p: plugin_t = values[i];
+	let keys: string[] = map_keys(plugin_map);
+	for (let i: i32 = 0; i < keys.length; ++i) {
+		let p: plugin_t = map_get(plugin_map, keys[i]);
 		if (p.update != null) {
 			p.update();
 		}
@@ -888,7 +888,7 @@ function ui_base_operator_search() {
 		let count: i32 = 0;
 		let BUTTON_COL: i32 = ui.ops.theme.BUTTON_COL;
 
-		let keys: string[] = map_keys_to_array(config_keymap);
+		let keys: string[] = map_keys(config_keymap);
 		for (let i: i32 = 0; i < keys.length; ++i) {
 			let n: string = keys[i];
 			if (string_index_of(n, search) >= 0) {

base/Sources/uniforms_ext.ts

@@ -134,7 +134,7 @@ function uniforms_ext_f32_link(object: object_t, mat: material_data_t, link: str
 	///end
 
 	if (parser_material_script_links != null) {
-		let keys: string[] = map_keys_to_array(parser_material_script_links);
+		let keys: string[] = map_keys(parser_material_script_links);
 		for (let i: i32 = 0; i < keys.length; ++i) {
 			let key: string = keys[i];
 			let asciprt_links: any = parser_material_script_links;