feature/monitor #17

Merged
cromer merged 13 commits from feature/monitor into develop 2022-07-19 21:44:29 -04:00
23 changed files with 733 additions and 2 deletions

View File

@ -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://Main.gdns" type="Script" id=1]
[ext_resource path="res://levels/Level2.tscn" type="PackedScene" id=2] [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"] [node name="Main" type="Node"]
script = ExtResource( 1 ) script = ExtResource( 1 )
level = ExtResource( 2 ) level = ExtResource( 2 )
[node name="Monitor" parent="." instance=ExtResource( 3 )]

View File

@ -0,0 +1,4 @@
[gd_resource type="DynamicFontData" format=2]
[resource]
font_path = "res://assets/fonts/ttf/PixelOperator8-Bold.ttf"

View File

@ -0,0 +1,4 @@
[gd_resource type="DynamicFontData" format=2]
[resource]
font_path = "res://assets/fonts/ttf/PixelOperatorHB8.ttf"

BIN
godot/assets/fonts/ttf/PixelOperator-Bold.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperator.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperator8-Bold.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperator8.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorHB.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorHB8.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorMono-Bold.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorMono.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorMono8-Bold.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorMono8.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorMonoHB.ttf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/fonts/ttf/PixelOperatorMonoHB8.ttf (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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()

190
godot/monitor/GUI.tscn Normal file
View File

@ -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"]

218
godot/monitor/Monitor.gd Normal file
View File

@ -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

View File

@ -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="."]

71
godot/monitor/Rut.gd Normal file
View File

@ -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

View File

@ -9,6 +9,7 @@ void Main::_register_methods()
{ {
register_method("_ready", &Main::_ready); register_method("_ready", &Main::_ready);
register_method("_physics_process", &Main::_physics_process); register_method("_physics_process", &Main::_physics_process);
register_property<Main, String>("game_version", &Main::set_game_version, &Main::get_game_version, String(main::game_version.c_str()));
register_property<Main, Ref<PackedScene>>("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<Main, Ref<PackedScene>>("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<Main, bool>("full_screen", &Main::set_full_screen, &Main::get_full_screen, main::full_screen); register_property<Main, bool>("full_screen", &Main::set_full_screen, &Main::get_full_screen, main::full_screen);
register_property<Main, Vector2>("window_size", &Main::set_window_size, &Main::get_window_size, main::window_size); register_property<Main, Vector2>("window_size", &Main::set_window_size, &Main::get_window_size, main::window_size);
@ -28,6 +29,7 @@ void Main::_init()
_os = OS::get_singleton(); _os = OS::get_singleton();
_input = Input::get_singleton(); _input = Input::get_singleton();
game_version = String(main::game_version.c_str());
full_screen = main::full_screen; full_screen = main::full_screen;
window_size = main::window_size; window_size = main::window_size;
launch_screen = main::launch_screen; launch_screen = main::launch_screen;
@ -35,6 +37,7 @@ void Main::_init()
void Main::_ready() void Main::_ready()
{ {
get_tree()->set_pause(true);
if (get_full_screen()) if (get_full_screen())
{ {
_os->set_window_fullscreen(true); _os->set_window_fullscreen(true);
@ -71,6 +74,16 @@ Ref<PackedScene> Main::get_level()
return this->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) void Main::set_full_screen(bool full_screen)
{ {
this->full_screen = full_screen; this->full_screen = full_screen;

View File

@ -1,6 +1,7 @@
#ifndef ALAI_MAIN_H #ifndef ALAI_MAIN_H
#define ALAI_MAIN_H #define ALAI_MAIN_H
#include <string>
#include <Godot.hpp> #include <Godot.hpp>
#include <Node.hpp> #include <Node.hpp>
#include <OS.hpp> #include <OS.hpp>
@ -21,6 +22,11 @@ namespace godot
*/ */
namespace main 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. * @brief The default value for if the game should start in full screen.
* *
@ -64,6 +70,11 @@ namespace godot
* *
*/ */
Ref<PackedScene> level; Ref<PackedScene> level;
/**
* @brief The current version of the game.
*
*/
String game_version;
/** /**
* @brief If the window is full screen or not. * @brief If the window is full screen or not.
* *
@ -137,6 +148,20 @@ namespace godot
*/ */
Ref<PackedScene> get_level(); Ref<PackedScene> 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. * @brief Set the full screen object.
* *

View File

@ -5,6 +5,7 @@
#include <VisibilityNotifier2D.hpp> #include <VisibilityNotifier2D.hpp>
#include <SceneTree.hpp> #include <SceneTree.hpp>
#include <Texture.hpp> #include <Texture.hpp>
#include <Viewport.hpp>
using namespace godot; using namespace godot;
using namespace player; using namespace player;
@ -21,6 +22,9 @@ void Player::_register_methods()
register_property<Player, float>("gravity", &Player::set_gravity, &Player::get_gravity, player::gravity); register_property<Player, float>("gravity", &Player::set_gravity, &Player::get_gravity, player::gravity);
register_property<Player, float>("run_speed", &Player::set_run_speed, &Player::get_run_speed, player::run_speed); register_property<Player, float>("run_speed", &Player::set_run_speed, &Player::get_run_speed, player::run_speed);
register_property<Player, bool>("double_jump", &Player::set_double_jump, &Player::get_double_jump, player::double_jump); register_property<Player, bool>("double_jump", &Player::set_double_jump, &Player::get_double_jump, player::double_jump);
register_signal<Player>("object_created", "name", GODOT_VARIANT_TYPE_STRING, "state", GODOT_VARIANT_TYPE_STRING, "position", GODOT_VARIANT_TYPE_VECTOR2, "velocity", GODOT_VARIANT_TYPE_VECTOR2);
register_signal<Player>("object_updated", "name", GODOT_VARIANT_TYPE_STRING, "state", GODOT_VARIANT_TYPE_STRING, "position", GODOT_VARIANT_TYPE_VECTOR2, "velocity", GODOT_VARIANT_TYPE_VECTOR2);
register_signal<Player>("object_removed", "name", GODOT_VARIANT_TYPE_STRING);
} }
Player::Player() Player::Player()
@ -58,7 +62,6 @@ void Player::_ready()
//animated_sprite->set_sprite_frames(sprite_frames); //animated_sprite->set_sprite_frames(sprite_frames);
auto node = get_parent()->find_node("Middleground"); auto node = get_parent()->find_node("Middleground");
if (node != nullptr) if (node != nullptr)
{ {
auto tile_map = Object::cast_to<TileMap>(node); auto tile_map = Object::cast_to<TileMap>(node);
@ -69,6 +72,27 @@ void Player::_ready()
{ {
WARN_PRINT("Middleground not found!"); 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) 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<SpriteFrames> sprite_frames) void Player::set_sprite_frames(Ref<SpriteFrames> sprite_frames)