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/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/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 diff --git a/godot/monitor/EnterButton.gd b/godot/monitor/EnterButton.gd new file mode 100644 index 0000000..48ed546 --- /dev/null +++ b/godot/monitor/EnterButton.gd @@ -0,0 +1,119 @@ +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_temp): + 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, 1).to_int() * multiplier + multiplier = multiplier + 1 + if multiplier == 8: + multiplier = 2 + i = i - 1 + + var tempSum: float = 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" : 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 new file mode 100644 index 0000000..2fb72ed --- /dev/null +++ b/godot/monitor/GUI.tscn @@ -0,0 +1,190 @@ +[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/EnterButton.gd" type="Script" id=5] + +[sub_resource type="DynamicFont" id=1] +font_data = ExtResource( 1 ) + +[sub_resource type="DynamicFont" id=14] +size = 8 +font_data = ExtResource( 1 ) + +[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 +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 + +[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 + +[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 +custom_constants/separation = 0 + +[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 = 96.0 +margin_right = 512.0 +margin_bottom = 192.0 +rect_min_size = Vector2( 0, 96 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="VBoxContainer2" type="VBoxContainer" parent="GUI/VBoxContainer/CenterContainer2"] +margin_left = 16.0 +margin_top = 14.0 +margin_right = 496.0 +margin_bottom = 82.0 +rect_min_size = Vector2( 480, 0 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="Name" type="LineEdit" parent="GUI/VBoxContainer/CenterContainer2/VBoxContainer2"] +unique_name_in_owner = true +margin_right = 480.0 +margin_bottom = 20.0 +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 + +[node name="Rut" type="LineEdit" parent="GUI/VBoxContainer/CenterContainer2/VBoxContainer2"] +unique_name_in_owner = true +margin_top = 24.0 +margin_right = 480.0 +margin_bottom = 44.0 +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="LineEdit" parent="GUI/VBoxContainer/CenterContainer2/VBoxContainer2"] +unique_name_in_owner = true +margin_top = 48.0 +margin_right = 480.0 +margin_bottom = 68.0 +custom_fonts/font = SubResource( 14 ) +custom_styles/normal = SubResource( 13 ) +clear_button_enabled = true +placeholder_text = "Email" +caret_blink = true + +[node name="CenterContainer3" type="CenterContainer" parent="GUI/VBoxContainer"] +margin_top = 192.0 +margin_right = 512.0 +margin_bottom = 288.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 ) + +[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 new file mode 100644 index 0000000..b9628a1 --- /dev/null +++ b/godot/monitor/Monitor.gd @@ -0,0 +1,218 @@ +extends Node + + +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 +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 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 frames: Array = [] + +var coins: int = 0 +var points: int = 0 +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"] = "" + player["name"] = "" + player["email"] = "" + + 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 + + game["player"] = player + game["level_id"] = 0 + 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"] = false + game["timestamp"] = OS.get_unix_time() + game["frames"] = frames + + var err = $HTTPRequest.connect("request_completed", self, "_on_request_completed") + 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 monitor_enabled: + if started and not get_tree().paused: + 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"): + stop_monitor() + send_data() + 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: + $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 monitor_enabled and started: + add_object(name, state, position, velocity) + + +func _object_updated(name: String, state: String, position: Vector2, velocity: Vector2) -> void: + if monitor_enabled and started: + remove_object(name) + add_object(name, state, position, velocity) + + +func _object_removed(name: String) -> void: + if monitor_enabled and started: + remove_object(name) + + +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 + + +func stop_monitor() -> void: + started = false + + +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 + + diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn new file mode 100644 index 0000000..46070db --- /dev/null +++ b/godot/monitor/Monitor.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://monitor/Monitor.gd" type="Script" id=1] +[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 )] + +[node name="HTTPRequest" type="HTTPRequest" parent="."] diff --git a/godot/monitor/Rut.gd b/godot/monitor/Rut.gd new file mode 100644 index 0000000..85b66d0 --- /dev/null +++ b/godot/monitor/Rut.gd @@ -0,0 +1,71 @@ +extends LineEdit + + +var previous_text: String = "" + + +func _on_Rut_text_changed(_new_text: String) -> void: + var old_pos = caret_position + if text.length() > 12: + 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/project.godot b/godot/project.godot index ca6017b..ffda9d8 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) diff --git a/src/Main.cpp b/src/Main.cpp index 4f91c0c..d5ff187 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; @@ -35,6 +37,7 @@ void Main::_init() void Main::_ready() { + get_tree()->set_pause(true); if (get_full_screen()) { _os->set_window_fullscreen(true); @@ -71,6 +74,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)