From 26cb0fb86f5810fca1410352ee28a8e603482afd Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Wed, 6 Jul 2022 18:03:25 -0400 Subject: [PATCH 01/19] update tiled importer and fix camera bounds to work with it --- godot/addons/vnen.tiled_importer/plugin.cfg | 2 +- .../tiled_import_plugin.gd | 8 ++- .../vnen.tiled_importer/tiled_map_reader.gd | 49 ++++++++++++------- .../tiled_tileset_import_plugin.gd | 7 ++- .../vnen.tiled_importer/tiled_xml_to_dict.gd | 4 +- godot/project.godot | 5 ++ src/CameraLimit.cpp | 2 +- 7 files changed, 47 insertions(+), 30 deletions(-) diff --git a/godot/addons/vnen.tiled_importer/plugin.cfg b/godot/addons/vnen.tiled_importer/plugin.cfg index 40a544f..e0b9ec7 100644 --- a/godot/addons/vnen.tiled_importer/plugin.cfg +++ b/godot/addons/vnen.tiled_importer/plugin.cfg @@ -3,6 +3,6 @@ config_version=3 name="Tiled Map Importer" description="Importer for TileMaps and TileSets made on Tiled Map Editor" -version="2.3" +version="2.4" author="George Marques" script="vnen.tiled_importer.gd" diff --git a/godot/addons/vnen.tiled_importer/tiled_import_plugin.gd b/godot/addons/vnen.tiled_importer/tiled_import_plugin.gd index 9c65d99..774b65d 100644 --- a/godot/addons/vnen.tiled_importer/tiled_import_plugin.gd +++ b/godot/addons/vnen.tiled_importer/tiled_import_plugin.gd @@ -46,7 +46,7 @@ func get_priority(): return 1 func get_import_order(): - return 100 + return 101 func get_resource_type(): return "PackedScene" @@ -73,9 +73,9 @@ func get_import_options(preset): "name": "uv_clip", "default_value": true }, - { + { "name": "y_sort", - "default_value": false + "default_value": true }, { "name": "image_flags", @@ -119,8 +119,6 @@ func get_option_visibility(option, options): func import(source_file, save_path, options, r_platform_variants, r_gen_files): var map_reader = TiledMapReader.new() - # Offset is only optional for importing TileSets - options.apply_offset = true var scene = map_reader.build(source_file, options) if typeof(scene) != TYPE_OBJECT: diff --git a/godot/addons/vnen.tiled_importer/tiled_map_reader.gd b/godot/addons/vnen.tiled_importer/tiled_map_reader.gd index aa0d3e1..7f0a019 100644 --- a/godot/addons/vnen.tiled_importer/tiled_map_reader.gd +++ b/godot/addons/vnen.tiled_importer/tiled_map_reader.gd @@ -50,6 +50,8 @@ const whitelist_properties = [ "infinite", "margin", "name", + "offsetx", + "offsety", "orientation", "probability", "spacing", @@ -227,10 +229,8 @@ func make_layer(layer, parent, root, data): tilemap.mode = map_mode tilemap.cell_half_offset = map_offset tilemap.format = 1 - tilemap.cell_custom_transform = Transform2D(Vector2(cell_size.x, 0), Vector2(0, cell_size.y), Vector2(0, 0)) tilemap.cell_clip_uv = options.uv_clip tilemap.cell_y_sort = options.y_sort - tilemap.cell_tile_origin = TileMap.TILE_ORIGIN_TOP_LEFT tilemap.collision_layer = options.collision_layer tilemap.collision_mask = options.collision_mask tilemap.z_index = z_index @@ -282,7 +282,7 @@ func make_layer(layer, parent, root, data): var gid = int_id & ~(FLIPPED_HORIZONTALLY_FLAG | FLIPPED_VERTICALLY_FLAG | FLIPPED_DIAGONALLY_FLAG) var cell_x = cell_offset.x + chunk.x + (count % int(chunk.width)) - var cell_y = cell_offset.y + chunk.y + int(count / chunk.width) + 1 + var cell_y = cell_offset.y + chunk.y + int(count / chunk.width) tilemap.set_cell(cell_x, cell_y, gid, flipped_h, flipped_v, flipped_d) count += 1 @@ -695,7 +695,13 @@ func build_tileset_for_scene(tilesets, source_path, options): imagesize = Vector2(int(ts.imagewidth), int(ts.imageheight)) var tilesize = Vector2(int(ts.tilewidth), int(ts.tileheight)) - var tilecount = int(ts.tilecount) + + var tilecount + if not "tilecount" in ts: + tilecount = make_tilecount(tilesize, imagesize, margin, spacing) + else: + tilecount = int(ts.tilecount) + var gid = firstgid @@ -705,6 +711,7 @@ func build_tileset_for_scene(tilesets, source_path, options): var i = 0 var column = 0 + # Needed to look up textures for animations var tileRegions = [] while i < tilecount: @@ -752,8 +759,6 @@ func build_tileset_for_scene(tilesets, source_path, options): else: result.tile_set_texture(gid, image) result.tile_set_region(gid, region) - if options.apply_offset: - result.tile_set_texture_offset(gid, Vector2(0, -tilesize.y)) elif not rel_id in ts.tiles: gid += 1 continue @@ -778,8 +783,6 @@ func build_tileset_for_scene(tilesets, source_path, options): # Error happened return image result.tile_set_texture(gid, image) - if options.apply_offset: - result.tile_set_texture_offset(gid, Vector2(0, -image.get_height())) if "tiles" in ts and rel_id in ts.tiles and "objectgroup" in ts.tiles[rel_id] \ and "objects" in ts.tiles[rel_id].objectgroup: @@ -792,8 +795,6 @@ func build_tileset_for_scene(tilesets, source_path, options): return shape var offset = Vector2(float(object.x), float(object.y)) - if options.apply_offset: - offset += result.tile_get_texture_offset(gid) if "width" in object and "height" in object: offset += Vector2(float(object.width) / 2, float(object.height) / 2) @@ -818,6 +819,11 @@ func build_tileset_for_scene(tilesets, source_path, options): if not gid in tile_meta: tile_meta[gid] = {} tile_meta[gid][property] = ts.tiles[rel_id][property] + # If tile has a custom property called 'name', set the tile's name + if property == "name": + result.tile_set_name(gid, ts.tiles[rel_id].properties.name) + + gid += 1 i += 1 @@ -876,13 +882,14 @@ func load_image(rel_path, source_path, options): var image = null if embed: + var img = Image.new() + img.load(total_path) image = ImageTexture.new() - image.load(total_path) + image.create_from_image(img, flags) else: image = ResourceLoader.load(total_path, "ImageTexture") - - if image != null: - image.set_flags(flags) + if image != null: + image.set_flags(flags) return image @@ -1128,6 +1135,17 @@ func object_sorter(first, second): return first.id < second.id return first.y < second.y +# Create the tilecount for the TileSet if not present. +# Based on the image and tile dimensions. +func make_tilecount(tilesize, imagesize, margin, spacing): + var horizontal_tile_size = int(tilesize.x + margin * 2 + spacing) + var vertical_tile_size = int(tilesize.y + margin * 2 + spacing) + + var horizontal_tile_count = int(imagesize.x) / horizontal_tile_size; + var vertical_tile_count = int(imagesize.y) / vertical_tile_size; + + return horizontal_tile_count * vertical_tile_count + # Validates the map dictionary content for missing or invalid keys # Returns an error code func validate_map(map): @@ -1170,9 +1188,6 @@ func validate_tileset(tileset): elif not "tileheight" in tileset or not str(tileset.tileheight).is_valid_integer(): print_error("Missing or invalid tileheight tileset property.") return ERR_INVALID_DATA - elif not "tilecount" in tileset or not str(tileset.tilecount).is_valid_integer(): - print_error("Missing or invalid tilecount tileset property.") - return ERR_INVALID_DATA if not "image" in tileset: for tile in tileset.tiles: if not "image" in tileset.tiles[tile]: diff --git a/godot/addons/vnen.tiled_importer/tiled_tileset_import_plugin.gd b/godot/addons/vnen.tiled_importer/tiled_tileset_import_plugin.gd index c7f4561..9a86758 100644 --- a/godot/addons/vnen.tiled_importer/tiled_tileset_import_plugin.gd +++ b/godot/addons/vnen.tiled_importer/tiled_tileset_import_plugin.gd @@ -42,6 +42,9 @@ func get_recognized_extensions(): func get_save_extension(): return "res" +func get_import_order(): + return 100 + func get_resource_type(): return "TileSet" @@ -77,10 +80,6 @@ func get_import_options(preset): "name": "save_tiled_properties", "default_value": false }, - { - "name": "apply_offset", - "default_value": false - }, { "name": "post_import_script", "default_value": "", diff --git a/godot/addons/vnen.tiled_importer/tiled_xml_to_dict.gd b/godot/addons/vnen.tiled_importer/tiled_xml_to_dict.gd index a800f0b..9064b90 100644 --- a/godot/addons/vnen.tiled_importer/tiled_xml_to_dict.gd +++ b/godot/addons/vnen.tiled_importer/tiled_xml_to_dict.gd @@ -247,7 +247,7 @@ func parse_tile_data(parser): var prop_data = parse_properties(parser) data["properties"] = prop_data.properties data["propertytypes"] = prop_data.propertytypes - + elif parser.get_node_name() == "animation": var frame_list = [] var err2 = parser.read() @@ -265,7 +265,7 @@ func parse_tile_data(parser): if parser.get_node_name() == "animation": break err2 = parser.read() - + data["animation"] = frame_list err = parser.read() diff --git a/godot/project.godot b/godot/project.godot index 52b2be8..b52d977 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -90,6 +90,11 @@ right={ , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } +Send={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} [layer_names] diff --git a/src/CameraLimit.cpp b/src/CameraLimit.cpp index ca0dae6..95858b2 100644 --- a/src/CameraLimit.cpp +++ b/src/CameraLimit.cpp @@ -32,7 +32,7 @@ void CameraLimit::_ready() if (middle_ground != NULL) { auto used_rect = middle_ground->get_used_rect(); - auto bounds = Vector2(used_rect.position.x + used_rect.size.x, used_rect.position.y + used_rect.size.y - 1); + auto bounds = Vector2(used_rect.position.x + used_rect.size.x, used_rect.position.y + used_rect.size.y); node = get_tree()->get_root()->find_node("Camera2D", true, false); auto camera = cast_to(node); if (camera != NULL) From d79864c05d2214f2af1b86abd8cee3744bf96b7b Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 17 Jun 2022 16:20:57 -0400 Subject: [PATCH 02/19] start monitor scene --- godot/monitor/Monitor.tscn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 godot/monitor/Monitor.tscn diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn new file mode 100644 index 0000000..94361cb --- /dev/null +++ b/godot/monitor/Monitor.tscn @@ -0,0 +1,5 @@ +[gd_scene format=2] + +[node name="Monitor" type="Node"] + +[node name="Sender" type="Node" parent="."] From 9f3e78fa946d9e41f650d6bbddd1353a7eaa95d8 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Wed, 29 Jun 2022 13:29:11 -0400 Subject: [PATCH 03/19] Get monitor working and communicating with backend --- godot/Main.tscn | 5 +- godot/monitor/Monitor.gd | 250 +++++++++++++++++++++++++++++++++++++ godot/monitor/Monitor.tscn | 8 +- src/Main.cpp | 12 ++ src/Main.h | 25 ++++ src/player/Player.cpp | 36 +++++- 6 files changed, 332 insertions(+), 4 deletions(-) create mode 100644 godot/monitor/Monitor.gd diff --git a/godot/Main.tscn b/godot/Main.tscn index a9c8579..24b4abe 100644 --- a/godot/Main.tscn +++ b/godot/Main.tscn @@ -1,8 +1,11 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://Main.gdns" type="Script" id=1] [ext_resource path="res://levels/Level2.tscn" type="PackedScene" id=2] +[ext_resource path="res://monitor/Monitor.tscn" type="PackedScene" id=3] [node name="Main" type="Node"] script = ExtResource( 1 ) level = ExtResource( 2 ) + +[node name="Monitor" parent="." instance=ExtResource( 3 )] diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd new file mode 100644 index 0000000..88dfdfc --- /dev/null +++ b/godot/monitor/Monitor.gd @@ -0,0 +1,250 @@ +extends Node + + +export var development_url: String = "http://localhost:4050/api/v1" +var url_real: String = "https://alai.cromer.cl/api/v1" +export var use_development_url: bool = false +onready var url: String = development_url if use_development_url else url_real + +var player: Dictionary = {} +var level_id: int = 2 # PrototypeR +var os_id: int = 0 +var godot_version: Dictionary = Engine.get_version_info() +var processor_count: int = OS.get_processor_count() +var screen_count: int = OS.get_screen_count() +var screen_dpi: int = OS.get_screen_dpi() +var screen_size: Vector2 = OS.get_screen_size() +var machine_id: String = OS.get_unique_id() +var locale: String = OS.get_locale() +var game_version: String +var won: bool = false +var timestamp: int = OS.get_unix_time() +var frames: Array = [] + +var coins: int = 0 +var points: int = 0 +onready var start_time: int = OS.get_ticks_msec() +var objects: Array = [] + +const empty_object: Dictionary = { + "name": "Object Name", + "state": "Object State", + "position_x": 0, + "position_y": 0, + "velocity_x": 0, + "velocity_y": 0 +} +const empty_frame: Dictionary = { + "coins": 0, + "points": 0, + "fps": 0, + "elapsed_time": 0, + "objects": [], +} + +# The game dictionary holds all data to be sent to the server +var game: Dictionary = {} + + +func _ready() -> void: + game_version = get_parent().game_version + + player["rut"] = "23.660.457-8" + player["name"] = "Chris Cromer" + player["email"] = "chris@cromer.cl" + + var os_name = OS.get_name() + if os_name == "Android": + os_id = 1 + elif os_name == "iOS": + os_id = 2 + elif os_name == "HTML5": + os_id = 3 + elif os_name == "OSX": + os_id = 4 + elif os_name == "Server": + os_id = 5 + elif os_name == "Windows": + os_id = 6 + elif os_name == "UWP": + os_id = 7 + elif os_name == "X11": + os_id = 8 + else: + os_id = 0 + + player["rut"] = clean_rut(player["rut"]) + + game["player"] = player + game["level_id"] = level_id + game["os_id"] = os_id + game["godot_version"] = godot_version + game["processor_count"] = processor_count + game["machine_id"] = machine_id + game["locale"] = locale + game["screen_count"] = screen_count + game["screen_dpi"] = screen_dpi + game["screen_size"] = screen_size + game["game_version"] = game_version + game["won"] = won + game["timestamp"] = timestamp + game["frames"] = frames + + var err = $HTTPRequest.connect("request_completed", self, "_on_request_completed") + if err != OK: + print(err) + + +func _physics_process(_delta: float) -> void: + var frame = empty_frame.duplicate(true) + frame["coins"] = coins + frame["points"] = points + frame["fps"] = Engine.get_frames_per_second() + frame["elapsed_time"] = OS.get_ticks_msec() - start_time + + var frame_objects = objects.duplicate() + frame["objects"] = frame_objects + + frames.append(frame) + + if Input.is_action_just_pressed("Send"): + send_data() + + +func _object_created(name: String, state: String, position: Vector2, velocity: Vector2) -> void: + add_object(name, state, position, velocity) + + +func _object_updated(name: String, state: String, position: Vector2, velocity: Vector2) -> void: + remove_object(name) + add_object(name, state, position, velocity) + + +func _object_removed(name: String) -> void: + remove_object(name) + + +func add_object(name: String, state: String, position: Vector2, velocity: Vector2) -> void: + var object = empty_object.duplicate(true) + object["name"] = name + object["state"] = state + object["position_x"] = position.x + object["position_y"] = position.y + object["velocity_x"] = velocity.x + object["velocity_y"] = velocity.y + + objects.append(object) + + +func remove_object(name: String) -> void: + for i in range(0, objects.size()): + if objects[i]["name"] == name: + objects.remove(i) + + +func _on_coin_update(amount: int) -> void: + coins = coins + amount + + +func _on_request_completed(result: int, response_code: int, headers: PoolStringArray, body: PoolByteArray) -> void: + if result != HTTPRequest.RESULT_SUCCESS: + print_debug("Error: Failed to connect with error code: " + str(result)) + return + + if response_code != HTTPClient.RESPONSE_OK: + print_debug("Error: Failed response with error code: " + str(response_code)) + + print_debug(headers) + if body.size() > 0: + var json = JSON.parse(body.get_string_from_utf8()) + print_debug(JSON.print(json.result, "\t")) + + +func send_data() -> void: + var json = JSON.print(game) + var headers = ["Content-Type: application/json", "Content-Encoding: gzip", "Content-Transfer-Encoding: base64"] + + var body = compress_payload(json) + + print("JSON B: " + String(json.length())) + print("JSON MB: " + String(json.length() / pow(2, 20))) + print("Body B: " + String(body.length())) + print("Body MB: " + String(body.length() / pow(2, 20))) + + $HTTPRequest.request(url + "/game", headers, false, HTTPClient.METHOD_POST, body) + + +func compress_payload(payload: String) -> String: + var bytes = payload.to_utf8() + var compressed = bytes.compress(File.COMPRESSION_GZIP) + + var new_payload = Marshalls.raw_to_base64(compressed) + + return new_payload + + +func clean_rut(rut: String) -> String: + rut = rut.strip_escapes() + rut = rut.strip_edges(true, true) + rut = rut.to_lower() + rut = rut.replace(".", "") + rut = rut.replace("-", "") + return rut + + +func is_rut_valid(rut: String) -> bool: + rut = clean_rut(rut) + if rut.length() < 8 or rut.length() > 9: + print_debug("RUT length is invalid!") + return false + + var rutTemp: String = rut.substr(0, rut.length() - 1) + var verifier: String = rut.substr(rut.length() - 1, 1) + print("Rut: " + rutTemp) + print("Verifier: " + verifier) + + if not rutTemp.is_valid_integer(): + print_debug("RUT isn't a valid integer!") + return false + + if rutTemp.to_int() > 50000000: + print_debug("RUT is too large, that is a company!") + return false + + if verifier != generate_verifier(rut): + return false + + return true + + +func generate_verifier(rut: String) -> String: + if not rut.is_valid_integer(): + print_debug("RUT isn't a valid integer!") + return "" + + var multiplier: int = 2 + var sum: int = 0 + var remainder: int = 0 + var division: int = 0 + var rutLength: int = rut.length() + + var i: int = rutLength - 1 + while i >= 0: + sum = sum + rut.substr(i, i + 1).to_int() * multiplier + multiplier = multiplier + 1 + if multiplier == 8: + multiplier = 2 + i = i - 1 + + var tempSum: float = int(sum) + division = int(floor(tempSum / 11)) + division = division * 11 + remainder = sum - division + + if remainder != 0: + remainder = 11 - remainder + + if remainder == 10: + return "k" + else: + return String(remainder) diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn index 94361cb..736faa8 100644 --- a/godot/monitor/Monitor.tscn +++ b/godot/monitor/Monitor.tscn @@ -1,5 +1,9 @@ -[gd_scene format=2] +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://monitor/Monitor.gd" type="Script" id=1] [node name="Monitor" type="Node"] +script = ExtResource( 1 ) +use_development_url = true -[node name="Sender" type="Node" parent="."] +[node name="HTTPRequest" type="HTTPRequest" parent="."] diff --git a/src/Main.cpp b/src/Main.cpp index 4f91c0c..59f5378 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -9,6 +9,7 @@ void Main::_register_methods() { register_method("_ready", &Main::_ready); register_method("_physics_process", &Main::_physics_process); + register_property("game_version", &Main::set_game_version, &Main::get_game_version, String(main::game_version.c_str())); register_property>("level", &Main::set_level, &Main::get_level, NULL, GODOT_METHOD_RPC_MODE_DISABLED, GODOT_PROPERTY_USAGE_DEFAULT, GODOT_PROPERTY_HINT_RESOURCE_TYPE, String("PackedScene")); register_property("full_screen", &Main::set_full_screen, &Main::get_full_screen, main::full_screen); register_property("window_size", &Main::set_window_size, &Main::get_window_size, main::window_size); @@ -28,6 +29,7 @@ void Main::_init() _os = OS::get_singleton(); _input = Input::get_singleton(); + game_version = String(main::game_version.c_str()); full_screen = main::full_screen; window_size = main::window_size; launch_screen = main::launch_screen; @@ -71,6 +73,16 @@ Ref Main::get_level() return this->level; } +void Main::set_game_version(String game_version) +{ + this->game_version = game_version; +} + +String Main::get_game_version() +{ + return this->game_version; +} + void Main::set_full_screen(bool full_screen) { this->full_screen = full_screen; diff --git a/src/Main.h b/src/Main.h index d89c5c9..b9270a9 100644 --- a/src/Main.h +++ b/src/Main.h @@ -1,6 +1,7 @@ #ifndef ALAI_MAIN_H #define ALAI_MAIN_H +#include #include #include #include @@ -21,6 +22,11 @@ namespace godot */ namespace main { + /** + * @brief The default value for the game version. + * + */ + const std::string game_version = "0.1.0"; /** * @brief The default value for if the game should start in full screen. * @@ -64,6 +70,11 @@ namespace godot * */ Ref level; + /** + * @brief The current version of the game. + * + */ + String game_version; /** * @brief If the window is full screen or not. * @@ -137,6 +148,20 @@ namespace godot */ Ref get_level(); + /** + * @brief Set the game version object. + * + * @param[in] game_version The new version fo the game. + */ + void set_game_version(String game_version); + + /** + * @brief Get the game version object. + * + * @return String The current version of the game. + */ + String get_game_version(); + /** * @brief Set the full screen object. * diff --git a/src/player/Player.cpp b/src/player/Player.cpp index 843043b..b820fdf 100644 --- a/src/player/Player.cpp +++ b/src/player/Player.cpp @@ -5,6 +5,7 @@ #include #include #include +#include using namespace godot; using namespace player; @@ -21,6 +22,9 @@ void Player::_register_methods() register_property("gravity", &Player::set_gravity, &Player::get_gravity, player::gravity); register_property("run_speed", &Player::set_run_speed, &Player::get_run_speed, player::run_speed); register_property("double_jump", &Player::set_double_jump, &Player::get_double_jump, player::double_jump); + register_signal("object_created", "name", GODOT_VARIANT_TYPE_STRING, "state", GODOT_VARIANT_TYPE_STRING, "position", GODOT_VARIANT_TYPE_VECTOR2, "velocity", GODOT_VARIANT_TYPE_VECTOR2); + register_signal("object_updated", "name", GODOT_VARIANT_TYPE_STRING, "state", GODOT_VARIANT_TYPE_STRING, "position", GODOT_VARIANT_TYPE_VECTOR2, "velocity", GODOT_VARIANT_TYPE_VECTOR2); + register_signal("object_removed", "name", GODOT_VARIANT_TYPE_STRING); } Player::Player() @@ -58,7 +62,6 @@ void Player::_ready() //animated_sprite->set_sprite_frames(sprite_frames); auto node = get_parent()->find_node("Middleground"); - if (node != nullptr) { auto tile_map = Object::cast_to(node); @@ -69,6 +72,27 @@ void Player::_ready() { WARN_PRINT("Middleground not found!"); } + + auto object_node = get_tree()->get_root()->get_node("Main")->find_node("Monitor"); + if (object_node != nullptr) + { + auto state = get_node("StateMachine")->get_child(0); + if (state != nullptr) + { + connect("object_created", object_node, "_object_created"); + connect("object_updated", object_node, "_object_updated"); + connect("object_removed", object_node, "_object_removed"); + emit_signal("object_created", this->get_name(), state->get_name(), get_global_position(), velocity); + } + else + { + WARN_PRINT("State not found!"); + } + } + else + { + WARN_PRINT("Data not found!"); + } } void Player::_physics_process(float delta) @@ -110,6 +134,16 @@ void Player::_physics_process(float delta) } } } + + auto state = get_node("StateMachine")->get_child(0); + if (state != nullptr) + { + emit_signal("object_updated", this->get_name(), state->get_name(), get_global_position(), velocity); + } + else + { + WARN_PRINT("State not found!"); + } } void Player::set_sprite_frames(Ref sprite_frames) From f582a3212466b74b557ed6b8c2e89a9838cbb3f3 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Mon, 4 Jul 2022 11:12:08 -0400 Subject: [PATCH 04/19] allow starting and stopping the monitor via signal --- godot/monitor/Monitor.gd | 46 +++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd index 88dfdfc..a29fb8a 100644 --- a/godot/monitor/Monitor.gd +++ b/godot/monitor/Monitor.gd @@ -1,11 +1,15 @@ extends Node +export var enabled: bool = false export var development_url: String = "http://localhost:4050/api/v1" var url_real: String = "https://alai.cromer.cl/api/v1" export var use_development_url: bool = false onready var url: String = development_url if use_development_url else url_real +var start_time: int = 0 +var started: bool = false + var player: Dictionary = {} var level_id: int = 2 # PrototypeR var os_id: int = 0 @@ -23,7 +27,6 @@ var frames: Array = [] var coins: int = 0 var points: int = 0 -onready var start_time: int = OS.get_ticks_msec() var objects: Array = [] const empty_object: Dictionary = { @@ -96,32 +99,45 @@ func _ready() -> void: func _physics_process(_delta: float) -> void: - var frame = empty_frame.duplicate(true) - frame["coins"] = coins - frame["points"] = points - frame["fps"] = Engine.get_frames_per_second() - frame["elapsed_time"] = OS.get_ticks_msec() - start_time + if enabled and started: + var frame = empty_frame.duplicate(true) + frame["coins"] = coins + frame["points"] = points + frame["fps"] = Engine.get_frames_per_second() + frame["elapsed_time"] = OS.get_ticks_msec() - start_time - var frame_objects = objects.duplicate() - frame["objects"] = frame_objects + var frame_objects = objects.duplicate() + frame["objects"] = frame_objects - frames.append(frame) + frames.append(frame) - if Input.is_action_just_pressed("Send"): - send_data() + if Input.is_action_just_pressed("Send"): + send_data() func _object_created(name: String, state: String, position: Vector2, velocity: Vector2) -> void: - add_object(name, state, position, velocity) + if enabled and started: + add_object(name, state, position, velocity) func _object_updated(name: String, state: String, position: Vector2, velocity: Vector2) -> void: - remove_object(name) - add_object(name, state, position, velocity) + if enabled and started: + remove_object(name) + add_object(name, state, position, velocity) func _object_removed(name: String) -> void: - remove_object(name) + if enabled and started: + remove_object(name) + + +func start_monitor() -> void: + start_time = OS.get_ticks_msec() + started = true + + +func stop_monitor() -> void: + started = false func add_object(name: String, state: String, position: Vector2, velocity: Vector2) -> void: From cf20410bc8bb1dc7e4e900e4b3c4bcc309bb65c1 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Mon, 4 Jul 2022 11:13:11 -0400 Subject: [PATCH 05/19] add player node which will be used to capture their info from the HUD --- godot/monitor/Monitor.tscn | 6 +++++- godot/monitor/Player.gd | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 godot/monitor/Player.gd diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn index 736faa8..c2280ca 100644 --- a/godot/monitor/Monitor.tscn +++ b/godot/monitor/Monitor.tscn @@ -1,9 +1,13 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://monitor/Monitor.gd" type="Script" id=1] +[ext_resource path="res://monitor/Player.gd" type="Script" id=2] [node name="Monitor" type="Node"] script = ExtResource( 1 ) use_development_url = true +[node name="Player" type="Node" parent="."] +script = ExtResource( 2 ) + [node name="HTTPRequest" type="HTTPRequest" parent="."] diff --git a/godot/monitor/Player.gd b/godot/monitor/Player.gd new file mode 100644 index 0000000..ea4456b --- /dev/null +++ b/godot/monitor/Player.gd @@ -0,0 +1,14 @@ +extends Node + + +var player: Dictionary + + +func _ready() -> void: + pass + + +func _on_set_player(player_info: Dictionary) -> void: + player["name"] = player_info["name"] + player["rut"] = player_info["rut"] + player["email"] = player_info["email"] From 298298359b083f4f13f389ce74057d1a586d27ea Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 7 Jul 2022 13:01:47 -0400 Subject: [PATCH 06/19] move code into the start monitor function instead of setting it during initialization --- godot/Main.tscn | 1 + godot/monitor/Monitor.gd | 40 +++++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/godot/Main.tscn b/godot/Main.tscn index 24b4abe..0896dfd 100644 --- a/godot/Main.tscn +++ b/godot/Main.tscn @@ -9,3 +9,4 @@ script = ExtResource( 1 ) level = ExtResource( 2 ) [node name="Monitor" parent="." instance=ExtResource( 3 )] +enabled = true diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd index a29fb8a..391df9b 100644 --- a/godot/monitor/Monitor.gd +++ b/godot/monitor/Monitor.gd @@ -11,7 +11,6 @@ var start_time: int = 0 var started: bool = false var player: Dictionary = {} -var level_id: int = 2 # PrototypeR var os_id: int = 0 var godot_version: Dictionary = Engine.get_version_info() var processor_count: int = OS.get_processor_count() @@ -21,8 +20,6 @@ var screen_size: Vector2 = OS.get_screen_size() var machine_id: String = OS.get_unique_id() var locale: String = OS.get_locale() var game_version: String -var won: bool = false -var timestamp: int = OS.get_unix_time() var frames: Array = [] var coins: int = 0 @@ -79,7 +76,7 @@ func _ready() -> void: player["rut"] = clean_rut(player["rut"]) game["player"] = player - game["level_id"] = level_id + game["level_id"] = 0 game["os_id"] = os_id game["godot_version"] = godot_version game["processor_count"] = processor_count @@ -89,8 +86,8 @@ func _ready() -> void: game["screen_dpi"] = screen_dpi game["screen_size"] = screen_size game["game_version"] = game_version - game["won"] = won - game["timestamp"] = timestamp + game["won"] = false + game["timestamp"] = OS.get_unix_time() game["frames"] = frames var err = $HTTPRequest.connect("request_completed", self, "_on_request_completed") @@ -99,20 +96,25 @@ func _ready() -> void: func _physics_process(_delta: float) -> void: - if enabled and started: - var frame = empty_frame.duplicate(true) - frame["coins"] = coins - frame["points"] = points - frame["fps"] = Engine.get_frames_per_second() - frame["elapsed_time"] = OS.get_ticks_msec() - start_time + if enabled: + if started: + var frame = empty_frame.duplicate(true) + frame["coins"] = coins + frame["points"] = points + frame["fps"] = Engine.get_frames_per_second() + frame["elapsed_time"] = OS.get_ticks_msec() - start_time - var frame_objects = objects.duplicate() - frame["objects"] = frame_objects + var frame_objects = objects.duplicate() + frame["objects"] = frame_objects - frames.append(frame) + frames.append(frame) - if Input.is_action_just_pressed("Send"): - send_data() + if Input.is_action_just_pressed("Send"): + stop_monitor() + send_data() + else: + if Input.is_action_just_pressed("Send"): + start_monitor() func _object_created(name: String, state: String, position: Vector2, velocity: Vector2) -> void: @@ -132,6 +134,10 @@ func _object_removed(name: String) -> void: func start_monitor() -> void: + frames.clear() + game["level_id"] = 2 # PrototypeR + game["won"] = false + game["timestamp"] = OS.get_unix_time() start_time = OS.get_ticks_msec() started = true From 0d2b9cb67f92632d9b443f6f72065dea068ea9cd Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 8 Jul 2022 00:56:45 -0400 Subject: [PATCH 07/19] remove player script --- godot/monitor/Player.gd | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 godot/monitor/Player.gd diff --git a/godot/monitor/Player.gd b/godot/monitor/Player.gd deleted file mode 100644 index ea4456b..0000000 --- a/godot/monitor/Player.gd +++ /dev/null @@ -1,14 +0,0 @@ -extends Node - - -var player: Dictionary - - -func _ready() -> void: - pass - - -func _on_set_player(player_info: Dictionary) -> void: - player["name"] = player_info["name"] - player["rut"] = player_info["rut"] - player["email"] = player_info["email"] From 0d1613a7efb517b86b7b244b065b809f707973d0 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 8 Jul 2022 00:57:12 -0400 Subject: [PATCH 08/19] add pixel operator fonts --- godot/assets/fonts/data/PixelOperator-Bold.tres | 4 ++++ godot/assets/fonts/data/PixelOperator.tres | 4 ++++ godot/assets/fonts/ttf/PixelOperator-Bold.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperator.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperator8-Bold.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperator8.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorHB.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorHB8.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorMono-Bold.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorMono.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorMono8-Bold.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorMono8.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorMonoHB.ttf | 3 +++ godot/assets/fonts/ttf/PixelOperatorMonoHB8.ttf | 3 +++ 14 files changed, 44 insertions(+) create mode 100644 godot/assets/fonts/data/PixelOperator-Bold.tres create mode 100644 godot/assets/fonts/data/PixelOperator.tres create mode 100644 godot/assets/fonts/ttf/PixelOperator-Bold.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperator.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperator8-Bold.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperator8.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorHB.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorHB8.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorMono-Bold.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorMono.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorMono8-Bold.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorMono8.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorMonoHB.ttf create mode 100644 godot/assets/fonts/ttf/PixelOperatorMonoHB8.ttf diff --git a/godot/assets/fonts/data/PixelOperator-Bold.tres b/godot/assets/fonts/data/PixelOperator-Bold.tres new file mode 100644 index 0000000..4860407 --- /dev/null +++ b/godot/assets/fonts/data/PixelOperator-Bold.tres @@ -0,0 +1,4 @@ +[gd_resource type="DynamicFontData" format=2] + +[resource] +font_path = "res://assets/fonts/ttf/PixelOperator8-Bold.ttf" diff --git a/godot/assets/fonts/data/PixelOperator.tres b/godot/assets/fonts/data/PixelOperator.tres new file mode 100644 index 0000000..8817659 --- /dev/null +++ b/godot/assets/fonts/data/PixelOperator.tres @@ -0,0 +1,4 @@ +[gd_resource type="DynamicFontData" format=2] + +[resource] +font_path = "res://assets/fonts/ttf/PixelOperatorHB8.ttf" diff --git a/godot/assets/fonts/ttf/PixelOperator-Bold.ttf b/godot/assets/fonts/ttf/PixelOperator-Bold.ttf new file mode 100644 index 0000000..5f4d9f0 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperator-Bold.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1963fa21043a357212e0a9e8ae1986bc375c1759e68bd3533c4f71b164614b0 +size 16984 diff --git a/godot/assets/fonts/ttf/PixelOperator.ttf b/godot/assets/fonts/ttf/PixelOperator.ttf new file mode 100644 index 0000000..7eeeec2 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperator.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d805274eaf227855147153182a96a86ff395ddbc7d2d378095af8831b764a3e +size 17272 diff --git a/godot/assets/fonts/ttf/PixelOperator8-Bold.ttf b/godot/assets/fonts/ttf/PixelOperator8-Bold.ttf new file mode 100644 index 0000000..3f95f88 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperator8-Bold.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b46a109cdac6c2f7acb4a57451dc3c8f7e2d391b871500270eadf139f0ac906e +size 18624 diff --git a/godot/assets/fonts/ttf/PixelOperator8.ttf b/godot/assets/fonts/ttf/PixelOperator8.ttf new file mode 100644 index 0000000..6dd6601 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperator8.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cccb9ef6cf18977b6e5721d49a1a6e78dd6a6f1c4f69537470f7dc1dc829ffc +size 19944 diff --git a/godot/assets/fonts/ttf/PixelOperatorHB.ttf b/godot/assets/fonts/ttf/PixelOperatorHB.ttf new file mode 100644 index 0000000..a141a96 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorHB.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fba7efcd1595f795e7ced3dd88bcac890a4fd00a3d7a2212ec0ba67f9d7bff49 +size 17204 diff --git a/godot/assets/fonts/ttf/PixelOperatorHB8.ttf b/godot/assets/fonts/ttf/PixelOperatorHB8.ttf new file mode 100644 index 0000000..5ac3f34 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorHB8.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3569a5481727cc277be02ffa72348d40bf3ad9f03b9687b0da3b19fb717d00c8 +size 19076 diff --git a/godot/assets/fonts/ttf/PixelOperatorMono-Bold.ttf b/godot/assets/fonts/ttf/PixelOperatorMono-Bold.ttf new file mode 100644 index 0000000..7c8738f --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorMono-Bold.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b8a5f6cfd5fdb06ddac7d976935babf05afa5ef7bf6b8c1b8cf919b481d33e1 +size 16744 diff --git a/godot/assets/fonts/ttf/PixelOperatorMono.ttf b/godot/assets/fonts/ttf/PixelOperatorMono.ttf new file mode 100644 index 0000000..ee4e92c --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorMono.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e171000f12d196e7a8a1a91c1a429ef3264a0ff007d5f62fa3dc44ef8df51226 +size 16972 diff --git a/godot/assets/fonts/ttf/PixelOperatorMono8-Bold.ttf b/godot/assets/fonts/ttf/PixelOperatorMono8-Bold.ttf new file mode 100644 index 0000000..90af97f --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorMono8-Bold.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11704bf2bddcde0996909166ad9d10a7ff38eb311a59cb07991f63e5f0185f76 +size 18624 diff --git a/godot/assets/fonts/ttf/PixelOperatorMono8.ttf b/godot/assets/fonts/ttf/PixelOperatorMono8.ttf new file mode 100644 index 0000000..2fc70fa --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorMono8.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b627505e178c0c51b0ce7d432f2974fdc2064339f17fb5242b7237becad3c467 +size 19872 diff --git a/godot/assets/fonts/ttf/PixelOperatorMonoHB.ttf b/godot/assets/fonts/ttf/PixelOperatorMonoHB.ttf new file mode 100644 index 0000000..11d13d2 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorMonoHB.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7eda40c2fb15e3672a79dee3860d13ab62b3e25f0cccee770b3f45b84c4955 +size 17120 diff --git a/godot/assets/fonts/ttf/PixelOperatorMonoHB8.ttf b/godot/assets/fonts/ttf/PixelOperatorMonoHB8.ttf new file mode 100644 index 0000000..56b4a78 --- /dev/null +++ b/godot/assets/fonts/ttf/PixelOperatorMonoHB8.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cc07440ab17ad773fb2814c028d8fe70ecab835f2a577c081a3d226b256be92 +size 19020 From 10bf1fd27061df039ef30e37628d6ebafcfe7c0f Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 8 Jul 2022 00:57:46 -0400 Subject: [PATCH 09/19] add GUI to get player info --- godot/monitor/EnterButton.gd | 16 +++ godot/monitor/GUI.tscn | 238 +++++++++++++++++++++++++++++++++++ godot/monitor/Monitor.gd | 64 +++++++++- godot/monitor/Monitor.tscn | 5 +- godot/monitor/Rut.gd | 13 ++ godot/monitor/Text.gd | 14 +++ 6 files changed, 344 insertions(+), 6 deletions(-) create mode 100644 godot/monitor/EnterButton.gd create mode 100644 godot/monitor/GUI.tscn create mode 100644 godot/monitor/Rut.gd create mode 100644 godot/monitor/Text.gd diff --git a/godot/monitor/EnterButton.gd b/godot/monitor/EnterButton.gd new file mode 100644 index 0000000..2430822 --- /dev/null +++ b/godot/monitor/EnterButton.gd @@ -0,0 +1,16 @@ +extends Button + + +signal input_validated(player) + + +func _on_Button_pressed() -> void: + var name = get_node("%Name") + var rut = get_node("%Rut") + var email = get_node("%Email") + var player: Dictionary = { + "name" : name.text, + "rut" : rut.text, + "email" : email.text + } + emit_signal("input_validated", player) diff --git a/godot/monitor/GUI.tscn b/godot/monitor/GUI.tscn new file mode 100644 index 0000000..85a6faa --- /dev/null +++ b/godot/monitor/GUI.tscn @@ -0,0 +1,238 @@ +[gd_scene load_steps=18 format=2] + +[ext_resource path="res://assets/fonts/data/PixelOperator.tres" type="DynamicFontData" id=1] +[ext_resource path="res://assets/fonts/data/PixelOperator-Bold.tres" type="DynamicFontData" id=2] +[ext_resource path="res://monitor/Rut.gd" type="Script" id=3] +[ext_resource path="res://monitor/Text.gd" type="Script" id=4] +[ext_resource path="res://monitor/EnterButton.gd" type="Script" id=5] + +[sub_resource type="DynamicFont" id=1] +font_data = ExtResource( 1 ) + +[sub_resource type="DynamicFont" id=2] +size = 12 +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=3] +size = 12 +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=4] +size = 12 +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=9] +size = 8 +extra_spacing_top = 2 +font_data = ExtResource( 1 ) + +[sub_resource type="StyleBoxFlat" id=5] +content_margin_left = 5.0 +content_margin_right = 5.0 +bg_color = Color( 0.313726, 0.290196, 0.290196, 0.752941 ) +border_blend = true +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="DynamicFont" id=10] +size = 8 +extra_spacing_top = 2 +font_data = ExtResource( 1 ) + +[sub_resource type="StyleBoxFlat" id=6] +content_margin_left = 5.0 +content_margin_right = 5.0 +bg_color = Color( 0.313726, 0.290196, 0.290196, 0.752941 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="DynamicFont" id=8] +size = 8 +extra_spacing_top = 2 +font_data = ExtResource( 1 ) + +[sub_resource type="StyleBoxFlat" id=7] +content_margin_left = 5.0 +content_margin_right = 5.0 +bg_color = Color( 0.313726, 0.290196, 0.290196, 0.752941 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="DynamicFont" id=11] +size = 12 +extra_spacing_top = 2 +extra_spacing_bottom = 2 +extra_spacing_char = 2 +extra_spacing_space = 2 +font_data = ExtResource( 2 ) + +[sub_resource type="StyleBoxFlat" id=12] +content_margin_left = 5.0 +content_margin_right = 5.0 +content_margin_top = 5.0 +content_margin_bottom = 5.0 +bg_color = Color( 0.313726, 0.290196, 0.290196, 0.752941 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[node name="MonitorGUI" type="CanvasLayer"] +pause_mode = 2 + +[node name="ColorRect" type="ColorRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +rect_min_size = Vector2( 512, 288 ) +color = Color( 0.0117647, 0.00784314, 0.00784314, 0.376471 ) + +[node name="GUI" type="Control" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +rect_min_size = Vector2( 512, 0 ) + +[node name="VBoxContainer" type="VBoxContainer" parent="GUI"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="CenterContainer" type="CenterContainer" parent="GUI/VBoxContainer"] +margin_right = 512.0 +margin_bottom = 96.0 +rect_min_size = Vector2( 0, 96 ) +size_flags_horizontal = 3 + +[node name="Label" type="Label" parent="GUI/VBoxContainer/CenterContainer"] +margin_top = 30.0 +margin_right = 512.0 +margin_bottom = 65.0 +rect_min_size = Vector2( 512, 0 ) +custom_fonts/font = SubResource( 1 ) +text = "Ingresa su nombre completo, RUT y email por favor!" +align = 1 +autowrap = true + +[node name="CenterContainer2" type="CenterContainer" parent="GUI/VBoxContainer"] +margin_top = 100.0 +margin_right = 512.0 +margin_bottom = 196.0 +rect_min_size = Vector2( 0, 96 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="HBoxContainer" type="HBoxContainer" parent="GUI/VBoxContainer/CenterContainer2"] +margin_left = 6.0 +margin_top = 14.0 +margin_right = 506.0 +margin_bottom = 82.0 +rect_min_size = Vector2( 500, 0 ) +size_flags_horizontal = 13 +size_flags_vertical = 13 + +[node name="VBoxContainer" type="VBoxContainer" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer"] +margin_right = 74.0 +margin_bottom = 68.0 +size_flags_vertical = 3 + +[node name="Label" type="Label" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer"] +margin_top = 3.0 +margin_right = 74.0 +margin_bottom = 16.0 +size_flags_vertical = 6 +custom_fonts/font = SubResource( 2 ) +text = "Nombre" +align = 2 + +[node name="Label2" type="Label" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer"] +margin_top = 27.0 +margin_right = 74.0 +margin_bottom = 40.0 +size_flags_vertical = 6 +custom_fonts/font = SubResource( 3 ) +text = "RUT" +align = 2 + +[node name="Label3" type="Label" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer"] +margin_top = 51.0 +margin_right = 74.0 +margin_bottom = 64.0 +size_flags_vertical = 6 +custom_fonts/font = SubResource( 4 ) +text = "Email" +align = 2 + +[node name="VBoxContainer2" type="VBoxContainer" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer"] +margin_left = 78.0 +margin_right = 500.0 +margin_bottom = 68.0 +size_flags_horizontal = 3 + +[node name="Name" type="TextEdit" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2"] +unique_name_in_owner = true +margin_right = 422.0 +margin_bottom = 20.0 +rect_min_size = Vector2( 300, 20 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_fonts/font = SubResource( 9 ) +custom_styles/normal = SubResource( 5 ) +text = "Christopher Barry Cromer" +caret_blink = true +script = ExtResource( 4 ) + +[node name="Rut" type="TextEdit" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2"] +unique_name_in_owner = true +margin_top = 24.0 +margin_right = 422.0 +margin_bottom = 44.0 +rect_min_size = Vector2( 0, 20 ) +custom_fonts/font = SubResource( 10 ) +custom_styles/normal = SubResource( 6 ) +text = "23.660.457-8" +caret_blink = true +script = ExtResource( 3 ) + +[node name="Email" type="TextEdit" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2"] +unique_name_in_owner = true +margin_top = 48.0 +margin_right = 422.0 +margin_bottom = 68.0 +rect_min_size = Vector2( 0, 20 ) +custom_fonts/font = SubResource( 8 ) +custom_styles/normal = SubResource( 7 ) +text = "christohper.cromer1501@alumnos.ubiobio.cl" +caret_blink = true +script = ExtResource( 4 ) + +[node name="CenterContainer3" type="CenterContainer" parent="GUI/VBoxContainer"] +margin_top = 200.0 +margin_right = 512.0 +margin_bottom = 296.0 +rect_min_size = Vector2( 0, 96 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="Button" type="Button" parent="GUI/VBoxContainer/CenterContainer3"] +margin_left = 197.0 +margin_top = 34.0 +margin_right = 314.0 +margin_bottom = 61.0 +focus_mode = 0 +custom_fonts/font = SubResource( 11 ) +custom_styles/normal = SubResource( 12 ) +enabled_focus_mode = 0 +text = "Ingresar" +script = ExtResource( 5 ) + +[connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Name" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Name" method="_on_text_changed"] +[connection signal="focus_exited" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" method="_on_Rut_focus_exited"] +[connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" method="_on_Rut_text_changed"] +[connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Email" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Email" method="_on_text_changed"] +[connection signal="pressed" from="GUI/VBoxContainer/CenterContainer3/Button" to="GUI/VBoxContainer/CenterContainer3/Button" method="_on_Button_pressed"] diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd index 391df9b..9a4e6f8 100644 --- a/godot/monitor/Monitor.gd +++ b/godot/monitor/Monitor.gd @@ -49,9 +49,9 @@ var game: Dictionary = {} func _ready() -> void: game_version = get_parent().game_version - player["rut"] = "23.660.457-8" - player["name"] = "Chris Cromer" - player["email"] = "chris@cromer.cl" + player["rut"] = "" + player["name"] = "" + player["email"] = "" var os_name = OS.get_name() if os_name == "Android": @@ -94,6 +94,10 @@ func _ready() -> void: if err != OK: print(err) + err = $MonitorGUI.find_node("Button").connect("input_validated", self, "_on_input_validated") + if err != OK: + print(err) + func _physics_process(_delta: float) -> void: if enabled: @@ -117,6 +121,12 @@ func _physics_process(_delta: float) -> void: start_monitor() +func _on_input_validated(validated_player: Dictionary) -> void: + $MonitorGUI.queue_free() + get_tree().paused = false + player = validated_player.duplicate(true) + + func _object_created(name: String, state: String, position: Vector2, velocity: Vector2) -> void: if enabled and started: add_object(name, state, position, velocity) @@ -211,9 +221,57 @@ func clean_rut(rut: String) -> String: rut = rut.to_lower() rut = rut.replace(".", "") rut = rut.replace("-", "") + + var rutTemp: String = rut.substr(0, rut.length() - 1) + var verifier: String = rut.substr(rut.length() - 1, 1) + + var regex = RegEx.new() + regex.compile("\\D") + rutTemp = regex.sub(rutTemp, "", true) + + regex.compile("[^kK\\d]") + verifier = regex.sub(verifier, "", true) + + rut = rutTemp + verifier + return rut +func pretty_rut(rut: String) -> String: + rut = clean_rut(rut) + + var rutTemp: String = rut.substr(0, rut.length() - 1) + var verifier: String = rut.substr(rut.length() - 1, 1) + + var regex = RegEx.new() + regex.compile("[^kK\\d]") + verifier = regex.sub(verifier, "", true) + + var byteArray = rutTemp.to_utf8() + byteArray.invert() + + var newByteArray: PoolByteArray = PoolByteArray() + var i = 1 + for symbol in byteArray: + newByteArray.append(symbol) + if i == 3: + newByteArray.append(".".to_utf8()[0]) + i = 0 + i = i + 1 + if newByteArray.size() > 0 and newByteArray[newByteArray.size() - 1] == ".".to_utf8()[0]: + newByteArray.resize(newByteArray.size() - 1) + + newByteArray.invert() + rutTemp = newByteArray.get_string_from_utf8() + + if rutTemp.length() == 0 and verifier.length() > 0: + rutTemp = verifier + elif rutTemp.length() > 0 and verifier.length() > 0: + rutTemp = rutTemp + "-" + verifier + + return rutTemp + + func is_rut_valid(rut: String) -> bool: rut = clean_rut(rut) if rut.length() < 8 or rut.length() > 9: diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn index c2280ca..a50b176 100644 --- a/godot/monitor/Monitor.tscn +++ b/godot/monitor/Monitor.tscn @@ -1,13 +1,12 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://monitor/Monitor.gd" type="Script" id=1] -[ext_resource path="res://monitor/Player.gd" type="Script" id=2] +[ext_resource path="res://monitor/GUI.tscn" type="PackedScene" id=3] [node name="Monitor" type="Node"] script = ExtResource( 1 ) use_development_url = true -[node name="Player" type="Node" parent="."] -script = ExtResource( 2 ) +[node name="MonitorGUI" parent="." instance=ExtResource( 3 )] [node name="HTTPRequest" type="HTTPRequest" parent="."] diff --git a/godot/monitor/Rut.gd b/godot/monitor/Rut.gd new file mode 100644 index 0000000..ea7339c --- /dev/null +++ b/godot/monitor/Rut.gd @@ -0,0 +1,13 @@ +extends TextEdit + + +func _on_Rut_text_changed() -> void: + _on_Rut_focus_exited() + + +func _on_Rut_focus_exited() -> void: + var monitor = get_tree().get_current_scene().get_node("Monitor") + if text.length() > 12: + text = text.substr(0, 12) + text = monitor.pretty_rut(text) + cursor_set_column(text.length()) diff --git a/godot/monitor/Text.gd b/godot/monitor/Text.gd new file mode 100644 index 0000000..7109c78 --- /dev/null +++ b/godot/monitor/Text.gd @@ -0,0 +1,14 @@ +extends TextEdit + + +onready var previousText: String = text + + +func _on_text_changed() -> void: + var col = cursor_get_column() + # if a scroll bar appears, reset to the previous good string + if text.length() > 50: + text = previousText + col = col - 1 + previousText = text + cursor_set_column(col) From e4b91d2739acdae11b74fc6624ed79d049788f09 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 8 Jul 2022 00:58:12 -0400 Subject: [PATCH 10/19] pause game when starting --- src/Main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Main.cpp b/src/Main.cpp index 59f5378..d5ff187 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -37,6 +37,7 @@ void Main::_init() void Main::_ready() { + get_tree()->set_pause(true); if (get_full_screen()) { _os->set_window_fullscreen(true); From 39d08042685a583fb66de4f0d4ee2eac8ba5baed Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 8 Jul 2022 00:59:44 -0400 Subject: [PATCH 11/19] remove default text from text inputs --- godot/monitor/GUI.tscn | 3 --- 1 file changed, 3 deletions(-) diff --git a/godot/monitor/GUI.tscn b/godot/monitor/GUI.tscn index 85a6faa..2290c25 100644 --- a/godot/monitor/GUI.tscn +++ b/godot/monitor/GUI.tscn @@ -183,7 +183,6 @@ size_flags_horizontal = 3 size_flags_vertical = 3 custom_fonts/font = SubResource( 9 ) custom_styles/normal = SubResource( 5 ) -text = "Christopher Barry Cromer" caret_blink = true script = ExtResource( 4 ) @@ -195,7 +194,6 @@ margin_bottom = 44.0 rect_min_size = Vector2( 0, 20 ) custom_fonts/font = SubResource( 10 ) custom_styles/normal = SubResource( 6 ) -text = "23.660.457-8" caret_blink = true script = ExtResource( 3 ) @@ -207,7 +205,6 @@ margin_bottom = 68.0 rect_min_size = Vector2( 0, 20 ) custom_fonts/font = SubResource( 8 ) custom_styles/normal = SubResource( 7 ) -text = "christohper.cromer1501@alumnos.ubiobio.cl" caret_blink = true script = ExtResource( 4 ) From ae40849c213983b1a7a8aadc39d67fa39b915e84 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Wed, 13 Jul 2022 21:14:30 -0400 Subject: [PATCH 12/19] validate information and send it to the monitor --- godot/Main.tscn | 1 - godot/monitor/EnterButton.gd | 104 ++++++++++++++++++- godot/monitor/GUI.tscn | 187 +++++++++++++---------------------- godot/monitor/Monitor.gd | 130 ++---------------------- godot/monitor/Monitor.tscn | 2 + godot/monitor/Rut.gd | 74 ++++++++++++-- godot/monitor/Text.gd | 14 --- 7 files changed, 251 insertions(+), 261 deletions(-) delete mode 100644 godot/monitor/Text.gd diff --git a/godot/Main.tscn b/godot/Main.tscn index 0896dfd..24b4abe 100644 --- a/godot/Main.tscn +++ b/godot/Main.tscn @@ -9,4 +9,3 @@ script = ExtResource( 1 ) level = ExtResource( 2 ) [node name="Monitor" parent="." instance=ExtResource( 3 )] -enabled = true diff --git a/godot/monitor/EnterButton.gd b/godot/monitor/EnterButton.gd index 2430822..f66c90e 100644 --- a/godot/monitor/EnterButton.gd +++ b/godot/monitor/EnterButton.gd @@ -4,13 +4,115 @@ extends Button signal input_validated(player) +func is_valid_name(name: String) -> bool: + if name.strip_edges() == "": + print_debug("Name is empty!") + return false + if name.split(" ").size() == 1: + print_debug("Doesn't contain at least a first and last name!") + return false + return true + + +func is_valid_rut(rut: String) -> bool: + var rut_node = get_node("%Rut") + rut = rut_node.clean_rut(rut) + if rut.length() < 8 or rut.length() > 9: + print_debug("RUT length is invalid!") + return false + + var rut_temp: String = rut.substr(0, rut.length() - 1) + var verifier: String = rut.substr(rut.length() - 1, 1) + + if not rut_temp.is_valid_integer(): + print_debug("RUT isn't a valid integer!") + return false + + if rut_temp.to_int() > 50000000: + print_debug("RUT is too large, that is a company!") + return false + + if verifier != generate_verifier(rut): + return false + + return true + + +func generate_verifier(rut: String) -> String: + if not rut.is_valid_integer(): + print_debug("RUT isn't a valid integer!") + return "" + + var multiplier: int = 2 + var sum: int = 0 + var remainder: int = 0 + var division: int = 0 + var rut_length: int = rut.length() + + var i: int = rut_length - 1 + while i >= 0: + sum = sum + rut.substr(i, i + 1).to_int() * multiplier + multiplier = multiplier + 1 + if multiplier == 8: + multiplier = 2 + i = i - 1 + + var tempSum: float = int(sum) + division = int(floor(tempSum / 11)) + division = division * 11 + remainder = sum - division + + if remainder != 0: + remainder = 11 - remainder + + if remainder == 10: + return "k" + else: + return String(remainder) + + +func is_valid_email(email: String) -> bool: + var regex = RegEx.new() + regex.compile("\\w+([\\.-]?\\w+)*@\\w+([\\.-]?\\w+)*(\\.\\w{2,3})+") + if regex.search(email) == null: + print_debug("Isn't a valid email address!") + return false + return true + func _on_Button_pressed() -> void: var name = get_node("%Name") var rut = get_node("%Rut") var email = get_node("%Email") var player: Dictionary = { "name" : name.text, - "rut" : rut.text, + "rut" : get_node("%Rut").clean_rut(rut.text), "email" : email.text } + + if not is_valid_name(player.name): + show_error_message("Ingresa un nombre completo valido por favor!") + return + + if not is_valid_rut(player.rut): + show_error_message("Ingresa un RUT valido por favor!") + return + + if not is_valid_email(player.email): + show_error_message("Ingresa un email valido por favor!") + return + emit_signal("input_validated", player) + + +func show_error_message(message: String) -> void: + var popup = get_node("%PopupDialog") + popup.get_node("ErrorMessage").text = message + popup.popup() + popup.focus_mode = Control.FOCUS_ALL + popup.grab_focus() + + +func _on_PopupDialog_gui_input(event: InputEvent) -> void: + if event.is_pressed(): + var popup = get_node("%PopupDialog") + popup.hide() diff --git a/godot/monitor/GUI.tscn b/godot/monitor/GUI.tscn index 2290c25..2fb72ed 100644 --- a/godot/monitor/GUI.tscn +++ b/godot/monitor/GUI.tscn @@ -1,63 +1,22 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://assets/fonts/data/PixelOperator.tres" type="DynamicFontData" id=1] [ext_resource path="res://assets/fonts/data/PixelOperator-Bold.tres" type="DynamicFontData" id=2] [ext_resource path="res://monitor/Rut.gd" type="Script" id=3] -[ext_resource path="res://monitor/Text.gd" type="Script" id=4] [ext_resource path="res://monitor/EnterButton.gd" type="Script" id=5] [sub_resource type="DynamicFont" id=1] font_data = ExtResource( 1 ) -[sub_resource type="DynamicFont" id=2] -size = 12 -font_data = ExtResource( 2 ) - -[sub_resource type="DynamicFont" id=3] -size = 12 -font_data = ExtResource( 2 ) - -[sub_resource type="DynamicFont" id=4] -size = 12 -font_data = ExtResource( 2 ) - -[sub_resource type="DynamicFont" id=9] +[sub_resource type="DynamicFont" id=14] size = 8 -extra_spacing_top = 2 font_data = ExtResource( 1 ) -[sub_resource type="StyleBoxFlat" id=5] -content_margin_left = 5.0 -content_margin_right = 5.0 -bg_color = Color( 0.313726, 0.290196, 0.290196, 0.752941 ) -border_blend = true -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="DynamicFont" id=10] -size = 8 -extra_spacing_top = 2 -font_data = ExtResource( 1 ) - -[sub_resource type="StyleBoxFlat" id=6] -content_margin_left = 5.0 -content_margin_right = 5.0 -bg_color = Color( 0.313726, 0.290196, 0.290196, 0.752941 ) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="DynamicFont" id=8] -size = 8 -extra_spacing_top = 2 -font_data = ExtResource( 1 ) - -[sub_resource type="StyleBoxFlat" id=7] +[sub_resource type="StyleBoxFlat" id=13] content_margin_left = 5.0 content_margin_right = 5.0 +content_margin_top = 2.0 +content_margin_bottom = 2.0 bg_color = Color( 0.313726, 0.290196, 0.290196, 0.752941 ) corner_radius_top_left = 5 corner_radius_top_right = 5 @@ -83,6 +42,20 @@ corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 +[sub_resource type="StyleBoxFlat" id=15] +bg_color = Color( 0.239216, 0.239216, 0.239216, 1 ) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 +expand_margin_left = 5.0 +expand_margin_right = 5.0 +expand_margin_top = 5.0 +expand_margin_bottom = 5.0 + +[sub_resource type="DynamicFont" id=16] +font_data = ExtResource( 2 ) + [node name="MonitorGUI" type="CanvasLayer"] pause_mode = 2 @@ -102,6 +75,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 3 size_flags_vertical = 3 +custom_constants/separation = 0 [node name="CenterContainer" type="CenterContainer" parent="GUI/VBoxContainer"] margin_right = 512.0 @@ -120,98 +94,60 @@ align = 1 autowrap = true [node name="CenterContainer2" type="CenterContainer" parent="GUI/VBoxContainer"] -margin_top = 100.0 +margin_top = 96.0 margin_right = 512.0 -margin_bottom = 196.0 +margin_bottom = 192.0 rect_min_size = Vector2( 0, 96 ) size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="HBoxContainer" type="HBoxContainer" parent="GUI/VBoxContainer/CenterContainer2"] -margin_left = 6.0 +[node name="VBoxContainer2" type="VBoxContainer" parent="GUI/VBoxContainer/CenterContainer2"] +margin_left = 16.0 margin_top = 14.0 -margin_right = 506.0 +margin_right = 496.0 margin_bottom = 82.0 -rect_min_size = Vector2( 500, 0 ) -size_flags_horizontal = 13 -size_flags_vertical = 13 - -[node name="VBoxContainer" type="VBoxContainer" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer"] -margin_right = 74.0 -margin_bottom = 68.0 +rect_min_size = Vector2( 480, 0 ) +size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="Label" type="Label" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer"] -margin_top = 3.0 -margin_right = 74.0 -margin_bottom = 16.0 -size_flags_vertical = 6 -custom_fonts/font = SubResource( 2 ) -text = "Nombre" -align = 2 - -[node name="Label2" type="Label" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer"] -margin_top = 27.0 -margin_right = 74.0 -margin_bottom = 40.0 -size_flags_vertical = 6 -custom_fonts/font = SubResource( 3 ) -text = "RUT" -align = 2 - -[node name="Label3" type="Label" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer"] -margin_top = 51.0 -margin_right = 74.0 -margin_bottom = 64.0 -size_flags_vertical = 6 -custom_fonts/font = SubResource( 4 ) -text = "Email" -align = 2 - -[node name="VBoxContainer2" type="VBoxContainer" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer"] -margin_left = 78.0 -margin_right = 500.0 -margin_bottom = 68.0 -size_flags_horizontal = 3 - -[node name="Name" type="TextEdit" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2"] +[node name="Name" type="LineEdit" parent="GUI/VBoxContainer/CenterContainer2/VBoxContainer2"] unique_name_in_owner = true -margin_right = 422.0 +margin_right = 480.0 margin_bottom = 20.0 -rect_min_size = Vector2( 300, 20 ) -size_flags_horizontal = 3 -size_flags_vertical = 3 -custom_fonts/font = SubResource( 9 ) -custom_styles/normal = SubResource( 5 ) +custom_fonts/font = SubResource( 14 ) +custom_styles/normal = SubResource( 13 ) +context_menu_enabled = false +clear_button_enabled = true +placeholder_text = "Nombre Completo" caret_blink = true -script = ExtResource( 4 ) -[node name="Rut" type="TextEdit" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2"] +[node name="Rut" type="LineEdit" parent="GUI/VBoxContainer/CenterContainer2/VBoxContainer2"] unique_name_in_owner = true margin_top = 24.0 -margin_right = 422.0 +margin_right = 480.0 margin_bottom = 44.0 -rect_min_size = Vector2( 0, 20 ) -custom_fonts/font = SubResource( 10 ) -custom_styles/normal = SubResource( 6 ) +custom_fonts/font = SubResource( 14 ) +custom_styles/normal = SubResource( 13 ) +clear_button_enabled = true +placeholder_text = "RUT" caret_blink = true script = ExtResource( 3 ) -[node name="Email" type="TextEdit" parent="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2"] +[node name="Email" type="LineEdit" parent="GUI/VBoxContainer/CenterContainer2/VBoxContainer2"] unique_name_in_owner = true margin_top = 48.0 -margin_right = 422.0 +margin_right = 480.0 margin_bottom = 68.0 -rect_min_size = Vector2( 0, 20 ) -custom_fonts/font = SubResource( 8 ) -custom_styles/normal = SubResource( 7 ) +custom_fonts/font = SubResource( 14 ) +custom_styles/normal = SubResource( 13 ) +clear_button_enabled = true +placeholder_text = "Email" caret_blink = true -script = ExtResource( 4 ) [node name="CenterContainer3" type="CenterContainer" parent="GUI/VBoxContainer"] -margin_top = 200.0 +margin_top = 192.0 margin_right = 512.0 -margin_bottom = 296.0 +margin_bottom = 288.0 rect_min_size = Vector2( 0, 96 ) size_flags_horizontal = 3 size_flags_vertical = 3 @@ -228,8 +164,27 @@ enabled_focus_mode = 0 text = "Ingresar" script = ExtResource( 5 ) -[connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Name" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Name" method="_on_text_changed"] -[connection signal="focus_exited" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" method="_on_Rut_focus_exited"] -[connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Rut" method="_on_Rut_text_changed"] -[connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Email" to="GUI/VBoxContainer/CenterContainer2/HBoxContainer/VBoxContainer2/Email" method="_on_text_changed"] +[node name="PopupDialog" type="PopupDialog" parent="."] +unique_name_in_owner = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 96.0 +margin_top = 96.0 +margin_right = -96.0 +margin_bottom = -96.0 +custom_styles/panel = SubResource( 15 ) + +[node name="ErrorMessage" type="Label" parent="PopupDialog"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 7 +custom_fonts/font = SubResource( 16 ) +text = "Error Message" +align = 1 +valign = 1 +autowrap = true + +[connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/VBoxContainer2/Rut" to="GUI/VBoxContainer/CenterContainer2/VBoxContainer2/Rut" method="_on_Rut_text_changed"] [connection signal="pressed" from="GUI/VBoxContainer/CenterContainer3/Button" to="GUI/VBoxContainer/CenterContainer3/Button" method="_on_Button_pressed"] +[connection signal="gui_input" from="PopupDialog" to="GUI/VBoxContainer/CenterContainer3/Button" method="_on_PopupDialog_gui_input"] diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd index 9a4e6f8..b9628a1 100644 --- a/godot/monitor/Monitor.gd +++ b/godot/monitor/Monitor.gd @@ -1,7 +1,7 @@ extends Node -export var enabled: bool = false +export var monitor_enabled: bool = false export var development_url: String = "http://localhost:4050/api/v1" var url_real: String = "https://alai.cromer.cl/api/v1" export var use_development_url: bool = false @@ -73,8 +73,6 @@ func _ready() -> void: else: os_id = 0 - player["rut"] = clean_rut(player["rut"]) - game["player"] = player game["level_id"] = 0 game["os_id"] = os_id @@ -100,8 +98,8 @@ func _ready() -> void: func _physics_process(_delta: float) -> void: - if enabled: - if started: + if monitor_enabled: + if started and not get_tree().paused: var frame = empty_frame.duplicate(true) frame["coins"] = coins frame["points"] = points @@ -119,6 +117,9 @@ func _physics_process(_delta: float) -> void: else: if Input.is_action_just_pressed("Send"): start_monitor() + else: + get_tree().paused = false + queue_free() func _on_input_validated(validated_player: Dictionary) -> void: @@ -128,18 +129,18 @@ func _on_input_validated(validated_player: Dictionary) -> void: func _object_created(name: String, state: String, position: Vector2, velocity: Vector2) -> void: - if enabled and started: + if monitor_enabled and started: add_object(name, state, position, velocity) func _object_updated(name: String, state: String, position: Vector2, velocity: Vector2) -> void: - if enabled and started: + if monitor_enabled and started: remove_object(name) add_object(name, state, position, velocity) func _object_removed(name: String) -> void: - if enabled and started: + if monitor_enabled and started: remove_object(name) @@ -215,116 +216,3 @@ func compress_payload(payload: String) -> String: return new_payload -func clean_rut(rut: String) -> String: - rut = rut.strip_escapes() - rut = rut.strip_edges(true, true) - rut = rut.to_lower() - rut = rut.replace(".", "") - rut = rut.replace("-", "") - - var rutTemp: String = rut.substr(0, rut.length() - 1) - var verifier: String = rut.substr(rut.length() - 1, 1) - - var regex = RegEx.new() - regex.compile("\\D") - rutTemp = regex.sub(rutTemp, "", true) - - regex.compile("[^kK\\d]") - verifier = regex.sub(verifier, "", true) - - rut = rutTemp + verifier - - return rut - - -func pretty_rut(rut: String) -> String: - rut = clean_rut(rut) - - var rutTemp: String = rut.substr(0, rut.length() - 1) - var verifier: String = rut.substr(rut.length() - 1, 1) - - var regex = RegEx.new() - regex.compile("[^kK\\d]") - verifier = regex.sub(verifier, "", true) - - var byteArray = rutTemp.to_utf8() - byteArray.invert() - - var newByteArray: PoolByteArray = PoolByteArray() - var i = 1 - for symbol in byteArray: - newByteArray.append(symbol) - if i == 3: - newByteArray.append(".".to_utf8()[0]) - i = 0 - i = i + 1 - if newByteArray.size() > 0 and newByteArray[newByteArray.size() - 1] == ".".to_utf8()[0]: - newByteArray.resize(newByteArray.size() - 1) - - newByteArray.invert() - rutTemp = newByteArray.get_string_from_utf8() - - if rutTemp.length() == 0 and verifier.length() > 0: - rutTemp = verifier - elif rutTemp.length() > 0 and verifier.length() > 0: - rutTemp = rutTemp + "-" + verifier - - return rutTemp - - -func is_rut_valid(rut: String) -> bool: - rut = clean_rut(rut) - if rut.length() < 8 or rut.length() > 9: - print_debug("RUT length is invalid!") - return false - - var rutTemp: String = rut.substr(0, rut.length() - 1) - var verifier: String = rut.substr(rut.length() - 1, 1) - print("Rut: " + rutTemp) - print("Verifier: " + verifier) - - if not rutTemp.is_valid_integer(): - print_debug("RUT isn't a valid integer!") - return false - - if rutTemp.to_int() > 50000000: - print_debug("RUT is too large, that is a company!") - return false - - if verifier != generate_verifier(rut): - return false - - return true - - -func generate_verifier(rut: String) -> String: - if not rut.is_valid_integer(): - print_debug("RUT isn't a valid integer!") - return "" - - var multiplier: int = 2 - var sum: int = 0 - var remainder: int = 0 - var division: int = 0 - var rutLength: int = rut.length() - - var i: int = rutLength - 1 - while i >= 0: - sum = sum + rut.substr(i, i + 1).to_int() * multiplier - multiplier = multiplier + 1 - if multiplier == 8: - multiplier = 2 - i = i - 1 - - var tempSum: float = int(sum) - division = int(floor(tempSum / 11)) - division = division * 11 - remainder = sum - division - - if remainder != 0: - remainder = 11 - remainder - - if remainder == 10: - return "k" - else: - return String(remainder) diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn index a50b176..46070db 100644 --- a/godot/monitor/Monitor.tscn +++ b/godot/monitor/Monitor.tscn @@ -4,7 +4,9 @@ [ext_resource path="res://monitor/GUI.tscn" type="PackedScene" id=3] [node name="Monitor" type="Node"] +pause_mode = 2 script = ExtResource( 1 ) +monitor_enabled = true use_development_url = true [node name="MonitorGUI" parent="." instance=ExtResource( 3 )] diff --git a/godot/monitor/Rut.gd b/godot/monitor/Rut.gd index ea7339c..85b66d0 100644 --- a/godot/monitor/Rut.gd +++ b/godot/monitor/Rut.gd @@ -1,13 +1,71 @@ -extends TextEdit +extends LineEdit -func _on_Rut_text_changed() -> void: - _on_Rut_focus_exited() +var previous_text: String = "" -func _on_Rut_focus_exited() -> void: - var monitor = get_tree().get_current_scene().get_node("Monitor") +func _on_Rut_text_changed(_new_text: String) -> void: + var old_pos = caret_position if text.length() > 12: - text = text.substr(0, 12) - text = monitor.pretty_rut(text) - cursor_set_column(text.length()) + text = previous_text + old_pos = old_pos - 2 + text = pretty_rut(text) + caret_position = old_pos + 1 + previous_text = text + + +func clean_rut(rut: String) -> String: + rut = rut.strip_escapes() + rut = rut.strip_edges(true, true) + rut = rut.to_lower() + rut = rut.replace(".", "") + rut = rut.replace("-", "") + + var rut_temp: String = rut.substr(0, rut.length() - 1) + var verifier: String = rut.substr(rut.length() - 1, 1) + + var regex = RegEx.new() + regex.compile("\\D") + rut_temp = regex.sub(rut_temp, "", true) + + regex.compile("[^kK\\d]") + verifier = regex.sub(verifier, "", true) + + rut = rut_temp + verifier + + return rut + + +func pretty_rut(rut: String) -> String: + rut = clean_rut(rut) + + var rut_temp: String = rut.substr(0, rut.length() - 1) + var verifier: String = rut.substr(rut.length() - 1, 1) + + var regex = RegEx.new() + regex.compile("[^kK\\d]") + verifier = regex.sub(verifier, "", true) + + var byte_array = rut_temp.to_utf8() + byte_array.invert() + + var new_byte_array: PoolByteArray = PoolByteArray() + var i = 1 + for symbol in byte_array: + new_byte_array.append(symbol) + if i == 3: + new_byte_array.append(".".to_utf8()[0]) + i = 0 + i = i + 1 + if new_byte_array.size() > 0 and new_byte_array[new_byte_array.size() - 1] == ".".to_utf8()[0]: + new_byte_array.resize(new_byte_array.size() - 1) + + new_byte_array.invert() + rut_temp = new_byte_array.get_string_from_utf8() + + if rut_temp.length() == 0 and verifier.length() > 0: + rut_temp = verifier + elif rut_temp.length() > 0 and verifier.length() > 0: + rut_temp = rut_temp + "-" + verifier + + return rut_temp diff --git a/godot/monitor/Text.gd b/godot/monitor/Text.gd deleted file mode 100644 index 7109c78..0000000 --- a/godot/monitor/Text.gd +++ /dev/null @@ -1,14 +0,0 @@ -extends TextEdit - - -onready var previousText: String = text - - -func _on_text_changed() -> void: - var col = cursor_get_column() - # if a scroll bar appears, reset to the previous good string - if text.length() > 50: - text = previousText - col = col - 1 - previousText = text - cursor_set_column(col) From 84eb228a6c30e7d813750d17a596a6499180fe0b Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Tue, 19 Jul 2022 21:41:52 -0400 Subject: [PATCH 13/19] fix bug with RUT validation --- godot/monitor/EnterButton.gd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/godot/monitor/EnterButton.gd b/godot/monitor/EnterButton.gd index f66c90e..48ed546 100644 --- a/godot/monitor/EnterButton.gd +++ b/godot/monitor/EnterButton.gd @@ -32,7 +32,7 @@ func is_valid_rut(rut: String) -> bool: print_debug("RUT is too large, that is a company!") return false - if verifier != generate_verifier(rut): + if verifier != generate_verifier(rut_temp): return false return true @@ -51,13 +51,13 @@ func generate_verifier(rut: String) -> String: var i: int = rut_length - 1 while i >= 0: - sum = sum + rut.substr(i, i + 1).to_int() * multiplier + sum = sum + rut.substr(i, 1).to_int() * multiplier multiplier = multiplier + 1 if multiplier == 8: multiplier = 2 i = i - 1 - var tempSum: float = int(sum) + var tempSum: float = sum division = int(floor(tempSum / 11)) division = division * 11 remainder = sum - division @@ -79,6 +79,7 @@ func is_valid_email(email: String) -> bool: return false return true + func _on_Button_pressed() -> void: var name = get_node("%Name") var rut = get_node("%Rut") From 4f8c134bb7f78422c9b7f9a8cc54236d2a03e8dc Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 22 Jul 2022 00:10:08 -0400 Subject: [PATCH 14/19] add level 2 music --- godot/assets/music/level2.ogg | 3 +++ godot/assets/music/level2.ogg.import | 15 +++++++++++++++ godot/levels/Level2.tscn | 9 ++++++++- godot/levels/MusicPlayer.gd | 16 ++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 godot/assets/music/level2.ogg create mode 100644 godot/assets/music/level2.ogg.import create mode 100644 godot/levels/MusicPlayer.gd diff --git a/godot/assets/music/level2.ogg b/godot/assets/music/level2.ogg new file mode 100644 index 0000000..ebb3231 --- /dev/null +++ b/godot/assets/music/level2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fe1597eeec1f308631c10c37e6457d16429c6692a1a6db9bb2641d58facd030 +size 1605670 diff --git a/godot/assets/music/level2.ogg.import b/godot/assets/music/level2.ogg.import new file mode 100644 index 0000000..54354c0 --- /dev/null +++ b/godot/assets/music/level2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/level2.ogg-0cba17639fcb1c4e45dc4f01c5837760.oggstr" + +[deps] + +source_file="res://assets/music/level2.ogg" +dest_files=[ "res://.import/level2.ogg-0cba17639fcb1c4e45dc4f01c5837760.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/godot/levels/Level2.tscn b/godot/levels/Level2.tscn index 717c1fe..811360b 100644 --- a/godot/levels/Level2.tscn +++ b/godot/levels/Level2.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://CameraLimit.gdns" type="Script" id=1] [ext_resource path="res://characters/player/Player.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/backgrounds/hills.png" type="Texture" id=3] [ext_resource path="res://levels/Level2.tmx" type="PackedScene" id=4] +[ext_resource path="res://assets/music/level2.ogg" type="AudioStream" id=5] +[ext_resource path="res://levels/MusicPlayer.gd" type="Script" id=6] [node name="Level2" type="Node2D"] @@ -39,3 +41,8 @@ centered = false [node name="Level2" parent="Map" instance=ExtResource( 4 )] script = ExtResource( 1 ) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +pause_mode = 2 +stream = ExtResource( 5 ) +script = ExtResource( 6 ) diff --git a/godot/levels/MusicPlayer.gd b/godot/levels/MusicPlayer.gd new file mode 100644 index 0000000..ab397b1 --- /dev/null +++ b/godot/levels/MusicPlayer.gd @@ -0,0 +1,16 @@ +extends AudioStreamPlayer + + +# there is currently a bug with AudioStreamPlayer +# it doesn't pause when the tree is paused +# so let's manually check if paused and pause the audio +# for this to work pause mode for the node is set to process instead of inherit + + +func _physics_process(_delta: float) -> void: + if get_tree().paused and playing: + stop() + playing = false + elif not get_tree().paused and not playing: + play() + playing = true From 1398f3d92c1f76ab498fad5d2ebb55a1e78221b1 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 21 Jul 2022 00:14:14 -0400 Subject: [PATCH 15/19] GUI should not be visible until ready --- godot/monitor/Monitor.gd | 2 ++ godot/monitor/Monitor.tscn | 1 + 2 files changed, 3 insertions(+) diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd index b9628a1..0c96cc7 100644 --- a/godot/monitor/Monitor.gd +++ b/godot/monitor/Monitor.gd @@ -99,6 +99,8 @@ func _ready() -> void: func _physics_process(_delta: float) -> void: if monitor_enabled: + if not $MonitorGUI.visible: + $MonitorGUI.visible = true if started and not get_tree().paused: var frame = empty_frame.duplicate(true) frame["coins"] = coins diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn index 46070db..977db82 100644 --- a/godot/monitor/Monitor.tscn +++ b/godot/monitor/Monitor.tscn @@ -10,5 +10,6 @@ monitor_enabled = true use_development_url = true [node name="MonitorGUI" parent="." instance=ExtResource( 3 )] +visible = false [node name="HTTPRequest" type="HTTPRequest" parent="."] From 71bf91fd2fded796a3d3a5d858c4116ecc9cbe22 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 22 Jul 2022 00:14:25 -0400 Subject: [PATCH 16/19] make ui_accept press the button --- godot/monitor/GUI.tscn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/godot/monitor/GUI.tscn b/godot/monitor/GUI.tscn index 2fb72ed..d5f25e7 100644 --- a/godot/monitor/GUI.tscn +++ b/godot/monitor/GUI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://assets/fonts/data/PixelOperator.tres" type="DynamicFontData" id=1] [ext_resource path="res://assets/fonts/data/PixelOperator-Bold.tres" type="DynamicFontData" id=2] @@ -42,6 +42,13 @@ corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 +[sub_resource type="InputEventAction" id=17] +action = "ui_accept" +pressed = true + +[sub_resource type="ShortCut" id=18] +shortcut = SubResource( 17 ) + [sub_resource type="StyleBoxFlat" id=15] bg_color = Color( 0.239216, 0.239216, 0.239216, 1 ) corner_radius_top_left = 5 @@ -160,7 +167,9 @@ margin_bottom = 61.0 focus_mode = 0 custom_fonts/font = SubResource( 11 ) custom_styles/normal = SubResource( 12 ) +shortcut_in_tooltip = false enabled_focus_mode = 0 +shortcut = SubResource( 18 ) text = "Ingresar" script = ExtResource( 5 ) From 5c4106246c29538357ee1816e123246036a64a92 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sat, 23 Jul 2022 13:27:21 -0400 Subject: [PATCH 17/19] fix error that happens after the GUI is freed --- godot/monitor/Monitor.gd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd index 0c96cc7..e146477 100644 --- a/godot/monitor/Monitor.gd +++ b/godot/monitor/Monitor.gd @@ -99,8 +99,9 @@ func _ready() -> void: func _physics_process(_delta: float) -> void: if monitor_enabled: - if not $MonitorGUI.visible: + if has_node("MonitorGUI") and not $MonitorGUI.visible: $MonitorGUI.visible = true + if started and not get_tree().paused: var frame = empty_frame.duplicate(true) frame["coins"] = coins From 6b86126127f9bc7cab06b2f2310bc97132e5d15d Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sat, 23 Jul 2022 13:45:09 -0400 Subject: [PATCH 18/19] gui focus changes and limits --- godot/monitor/GUI.tscn | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/godot/monitor/GUI.tscn b/godot/monitor/GUI.tscn index d5f25e7..e2962a7 100644 --- a/godot/monitor/GUI.tscn +++ b/godot/monitor/GUI.tscn @@ -121,8 +121,15 @@ size_flags_vertical = 3 unique_name_in_owner = true margin_right = 480.0 margin_bottom = 20.0 +focus_neighbour_left = NodePath("../../../CenterContainer3/Button") +focus_neighbour_top = NodePath("../../../CenterContainer3/Button") +focus_neighbour_right = NodePath("../Rut") +focus_neighbour_bottom = NodePath("../Rut") +focus_next = NodePath("../Rut") +focus_previous = NodePath("../../../CenterContainer3/Button") custom_fonts/font = SubResource( 14 ) custom_styles/normal = SubResource( 13 ) +max_length = 256 context_menu_enabled = false clear_button_enabled = true placeholder_text = "Nombre Completo" @@ -133,8 +140,16 @@ unique_name_in_owner = true margin_top = 24.0 margin_right = 480.0 margin_bottom = 44.0 +focus_neighbour_left = NodePath("../Name") +focus_neighbour_top = NodePath("../Name") +focus_neighbour_right = NodePath("../Email") +focus_neighbour_bottom = NodePath("../Email") +focus_next = NodePath("../Email") +focus_previous = NodePath("../Name") custom_fonts/font = SubResource( 14 ) custom_styles/normal = SubResource( 13 ) +max_length = 12 +context_menu_enabled = false clear_button_enabled = true placeholder_text = "RUT" caret_blink = true @@ -145,8 +160,16 @@ unique_name_in_owner = true margin_top = 48.0 margin_right = 480.0 margin_bottom = 68.0 +focus_neighbour_left = NodePath("../Rut") +focus_neighbour_top = NodePath("../Rut") +focus_neighbour_right = NodePath("../../../CenterContainer3/Button") +focus_neighbour_bottom = NodePath("../../../CenterContainer3/Button") +focus_next = NodePath("../../../CenterContainer3/Button") +focus_previous = NodePath("../Rut") custom_fonts/font = SubResource( 14 ) custom_styles/normal = SubResource( 13 ) +max_length = 256 +context_menu_enabled = false clear_button_enabled = true placeholder_text = "Email" caret_blink = true @@ -164,11 +187,15 @@ margin_left = 197.0 margin_top = 34.0 margin_right = 314.0 margin_bottom = 61.0 -focus_mode = 0 +focus_neighbour_left = NodePath("../../CenterContainer2/VBoxContainer2/Email") +focus_neighbour_top = NodePath("../../CenterContainer2/VBoxContainer2/Email") +focus_neighbour_right = NodePath("../../CenterContainer2/VBoxContainer2/Name") +focus_neighbour_bottom = NodePath("../../CenterContainer2/VBoxContainer2/Name") +focus_next = NodePath("../../CenterContainer2/VBoxContainer2/Name") +focus_previous = NodePath("../../CenterContainer2/VBoxContainer2/Email") custom_fonts/font = SubResource( 11 ) custom_styles/normal = SubResource( 12 ) shortcut_in_tooltip = false -enabled_focus_mode = 0 shortcut = SubResource( 18 ) text = "Ingresar" script = ExtResource( 5 ) From 8cfa1d5cce54957cb6d2f2715eb2c0ef31b80d7b Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Tue, 26 Jul 2022 23:14:21 -0400 Subject: [PATCH 19/19] add sounds and adjust music --- godot/assets/music/level2.ogg | 4 ++-- godot/assets/sounds/coin.wav | 3 +++ godot/assets/sounds/coin.wav.import | 23 +++++++++++++++++++++++ godot/assets/sounds/died.wav | 3 +++ godot/assets/sounds/died.wav.import | 23 +++++++++++++++++++++++ godot/assets/sounds/gem.wav | 3 +++ godot/assets/sounds/gem.wav.import | 23 +++++++++++++++++++++++ godot/assets/sounds/jump.wav | 3 +++ godot/assets/sounds/jump.wav.import | 23 +++++++++++++++++++++++ godot/assets/sounds/ui_popup.wav | 3 +++ godot/assets/sounds/ui_popup.wav.import | 23 +++++++++++++++++++++++ godot/assets/sounds/ui_select.wav | 3 +++ godot/assets/sounds/ui_select.wav.import | 23 +++++++++++++++++++++++ godot/characters/player/Player.tscn | 8 +++++++- godot/monitor/GUI.tscn | 19 ++++++++++++++++++- godot/monitor/UISounds.gd | 9 +++++++++ src/player/states/PlayerJump.cpp | 5 +++++ 17 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 godot/assets/sounds/coin.wav create mode 100644 godot/assets/sounds/coin.wav.import create mode 100644 godot/assets/sounds/died.wav create mode 100644 godot/assets/sounds/died.wav.import create mode 100644 godot/assets/sounds/gem.wav create mode 100644 godot/assets/sounds/gem.wav.import create mode 100644 godot/assets/sounds/jump.wav create mode 100644 godot/assets/sounds/jump.wav.import create mode 100644 godot/assets/sounds/ui_popup.wav create mode 100644 godot/assets/sounds/ui_popup.wav.import create mode 100644 godot/assets/sounds/ui_select.wav create mode 100644 godot/assets/sounds/ui_select.wav.import create mode 100644 godot/monitor/UISounds.gd diff --git a/godot/assets/music/level2.ogg b/godot/assets/music/level2.ogg index ebb3231..548241f 100644 --- a/godot/assets/music/level2.ogg +++ b/godot/assets/music/level2.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fe1597eeec1f308631c10c37e6457d16429c6692a1a6db9bb2641d58facd030 -size 1605670 +oid sha256:7f80b1f828f132293790f730b899596631e3f5de834dca0bc66d4335ba648893 +size 1053717 diff --git a/godot/assets/sounds/coin.wav b/godot/assets/sounds/coin.wav new file mode 100644 index 0000000..437d810 --- /dev/null +++ b/godot/assets/sounds/coin.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3feda8ae12b154d33c41d286bfc8423acb5bd30027de8590b44179ccdaefe0f6 +size 132564 diff --git a/godot/assets/sounds/coin.wav.import b/godot/assets/sounds/coin.wav.import new file mode 100644 index 0000000..f7e7100 --- /dev/null +++ b/godot/assets/sounds/coin.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/coin.wav-9081ee1c6d81d9c34d08bc916297b892.sample" + +[deps] + +source_file="res://assets/sounds/coin.wav" +dest_files=[ "res://.import/coin.wav-9081ee1c6d81d9c34d08bc916297b892.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/assets/sounds/died.wav b/godot/assets/sounds/died.wav new file mode 100644 index 0000000..96f68c5 --- /dev/null +++ b/godot/assets/sounds/died.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ef38b521ccfa436c210c13ba14731b093fc1c6564da6e6d5a008c959c9cb517 +size 857132 diff --git a/godot/assets/sounds/died.wav.import b/godot/assets/sounds/died.wav.import new file mode 100644 index 0000000..b92b919 --- /dev/null +++ b/godot/assets/sounds/died.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/died.wav-fc4528ad616bbce5115ae092cb80d346.sample" + +[deps] + +source_file="res://assets/sounds/died.wav" +dest_files=[ "res://.import/died.wav-fc4528ad616bbce5115ae092cb80d346.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/assets/sounds/gem.wav b/godot/assets/sounds/gem.wav new file mode 100644 index 0000000..b4eb998 --- /dev/null +++ b/godot/assets/sounds/gem.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec7fa9358699bc8f9be0cb47c027efc2099803f5fc81d24aac066ae5f2b3a406 +size 145348 diff --git a/godot/assets/sounds/gem.wav.import b/godot/assets/sounds/gem.wav.import new file mode 100644 index 0000000..60eb36b --- /dev/null +++ b/godot/assets/sounds/gem.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/gem.wav-49535e5638777427fa416449f386aaf6.sample" + +[deps] + +source_file="res://assets/sounds/gem.wav" +dest_files=[ "res://.import/gem.wav-49535e5638777427fa416449f386aaf6.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/assets/sounds/jump.wav b/godot/assets/sounds/jump.wav new file mode 100644 index 0000000..03982ea --- /dev/null +++ b/godot/assets/sounds/jump.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:147904084c9eaea71eae200292905b3adb41d862e0e09b5aab866cfb28ba4576 +size 176602 diff --git a/godot/assets/sounds/jump.wav.import b/godot/assets/sounds/jump.wav.import new file mode 100644 index 0000000..f8e1faf --- /dev/null +++ b/godot/assets/sounds/jump.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/jump.wav-395b727cde98999423d5c020c9c3492f.sample" + +[deps] + +source_file="res://assets/sounds/jump.wav" +dest_files=[ "res://.import/jump.wav-395b727cde98999423d5c020c9c3492f.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/assets/sounds/ui_popup.wav b/godot/assets/sounds/ui_popup.wav new file mode 100644 index 0000000..f00a22a --- /dev/null +++ b/godot/assets/sounds/ui_popup.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7af5be9759b98365633e251a6a0c72f4840975f141a9d57e40ea70ab4beebbc2 +size 51772 diff --git a/godot/assets/sounds/ui_popup.wav.import b/godot/assets/sounds/ui_popup.wav.import new file mode 100644 index 0000000..679a364 --- /dev/null +++ b/godot/assets/sounds/ui_popup.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/ui_popup.wav-b70bc280bf50aa4e775c08111118c3ae.sample" + +[deps] + +source_file="res://assets/sounds/ui_popup.wav" +dest_files=[ "res://.import/ui_popup.wav-b70bc280bf50aa4e775c08111118c3ae.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/assets/sounds/ui_select.wav b/godot/assets/sounds/ui_select.wav new file mode 100644 index 0000000..ec3580d --- /dev/null +++ b/godot/assets/sounds/ui_select.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e43e035f6953c9854eee64f2f45b8d7d7107a412b82bbbe625253e1103c1bbb1 +size 62564 diff --git a/godot/assets/sounds/ui_select.wav.import b/godot/assets/sounds/ui_select.wav.import new file mode 100644 index 0000000..3e3d8c0 --- /dev/null +++ b/godot/assets/sounds/ui_select.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/ui_select.wav-a1e6656879b8474ab79f3a15e3073001.sample" + +[deps] + +source_file="res://assets/sounds/ui_select.wav" +dest_files=[ "res://.import/ui_select.wav-a1e6656879b8474ab79f3a15e3073001.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/characters/player/Player.tscn b/godot/characters/player/Player.tscn index 858efb3..20f4c51 100644 --- a/godot/characters/player/Player.tscn +++ b/godot/characters/player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://characters/player/sprites/green.tres" type="SpriteFrames" id=1] [ext_resource path="res://characters/player/states/Idle.gdns" type="Script" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://characters/player/Player.gdns" type="Script" id=5] [ext_resource path="res://characters/player/states/Jump.gdns" type="Script" id=6] [ext_resource path="res://characters/player/states/Fall.gdns" type="Script" id=7] +[ext_resource path="res://assets/sounds/jump.wav" type="AudioStream" id=8] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 7, 12 ) @@ -40,3 +41,8 @@ script = ExtResource( 6 ) [node name="Fall" type="Node" parent="StateMachine"] script = ExtResource( 7 ) + +[node name="Sounds" type="Node" parent="."] + +[node name="Jump" type="AudioStreamPlayer" parent="Sounds"] +stream = ExtResource( 8 ) diff --git a/godot/monitor/GUI.tscn b/godot/monitor/GUI.tscn index e2962a7..08187b6 100644 --- a/godot/monitor/GUI.tscn +++ b/godot/monitor/GUI.tscn @@ -1,9 +1,12 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://assets/fonts/data/PixelOperator.tres" type="DynamicFontData" id=1] [ext_resource path="res://assets/fonts/data/PixelOperator-Bold.tres" type="DynamicFontData" id=2] [ext_resource path="res://monitor/Rut.gd" type="Script" id=3] +[ext_resource path="res://monitor/UISounds.gd" type="Script" id=4] [ext_resource path="res://monitor/EnterButton.gd" type="Script" id=5] +[ext_resource path="res://assets/sounds/ui_popup.wav" type="AudioStream" id=6] +[ext_resource path="res://assets/sounds/ui_select.wav" type="AudioStream" id=7] [sub_resource type="DynamicFont" id=1] font_data = ExtResource( 1 ) @@ -77,6 +80,15 @@ anchor_right = 1.0 anchor_bottom = 1.0 rect_min_size = Vector2( 512, 0 ) +[node name="Sounds" type="Node" parent="GUI"] +script = ExtResource( 4 ) + +[node name="Popup" type="AudioStreamPlayer" parent="GUI/Sounds"] +stream = ExtResource( 6 ) + +[node name="Menu" type="AudioStreamPlayer" parent="GUI/Sounds"] +stream = ExtResource( 7 ) + [node name="VBoxContainer" type="VBoxContainer" parent="GUI"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -221,6 +233,11 @@ align = 1 valign = 1 autowrap = true +[connection signal="focus_entered" from="GUI/VBoxContainer/CenterContainer2/VBoxContainer2/Name" to="GUI/Sounds" method="_play_ui_select_sound"] +[connection signal="focus_entered" from="GUI/VBoxContainer/CenterContainer2/VBoxContainer2/Rut" to="GUI/Sounds" method="_play_ui_select_sound"] [connection signal="text_changed" from="GUI/VBoxContainer/CenterContainer2/VBoxContainer2/Rut" to="GUI/VBoxContainer/CenterContainer2/VBoxContainer2/Rut" method="_on_Rut_text_changed"] +[connection signal="focus_entered" from="GUI/VBoxContainer/CenterContainer2/VBoxContainer2/Email" to="GUI/Sounds" method="_play_ui_select_sound"] +[connection signal="focus_entered" from="GUI/VBoxContainer/CenterContainer3/Button" to="GUI/Sounds" method="_play_ui_select_sound"] [connection signal="pressed" from="GUI/VBoxContainer/CenterContainer3/Button" to="GUI/VBoxContainer/CenterContainer3/Button" method="_on_Button_pressed"] +[connection signal="focus_entered" from="PopupDialog" to="GUI/Sounds" method="_play_popup_sound"] [connection signal="gui_input" from="PopupDialog" to="GUI/VBoxContainer/CenterContainer3/Button" method="_on_PopupDialog_gui_input"] diff --git a/godot/monitor/UISounds.gd b/godot/monitor/UISounds.gd new file mode 100644 index 0000000..b0821c6 --- /dev/null +++ b/godot/monitor/UISounds.gd @@ -0,0 +1,9 @@ +extends Node + + +func _play_popup_sound() -> void: + $Popup.play() + + +func _play_ui_select_sound() -> void: + $Menu.play() diff --git a/src/player/states/PlayerJump.cpp b/src/player/states/PlayerJump.cpp index 8255e1b..e9f9082 100644 --- a/src/player/states/PlayerJump.cpp +++ b/src/player/states/PlayerJump.cpp @@ -1,6 +1,8 @@ #include "player/states/PlayerJump.h" #include "player/Player.h" +#include + using namespace godot; using namespace player; @@ -26,6 +28,9 @@ void PlayerJump::_init() void PlayerJump::_state_enter(const String state) { + auto jump_sound = get_parent()->get_node("Sounds/Jump"); + jump_sound->play(); + animated_sprite = get_parent()->get_node("AnimatedSprite"); animated_sprite->stop(); animated_sprite->set_animation("air");