diff --git a/Battle Pong/GameSettings.gd b/Battle Pong/GameSettings.gd index 8c22d69d8cbd5b0365a0d409e3a742023912d9d0..874eb085eb3c900702c7b50e084e029b7ff29073 100644 --- a/Battle Pong/GameSettings.gd +++ b/Battle Pong/GameSettings.gd @@ -12,7 +12,7 @@ var game_playtime_per_step var game_wins_to_reset var game_port -var image_format +var image_rgb var image_heigth var image_width @@ -90,6 +90,10 @@ func load_data(): update_settings() func save_data(): + var format = "L8" + if $"/root/GameSettings".image_rgb: + format = "RGB8" + data = { "game":{ "playtime_per_step":$"/root/GameSettings".game_playtime_per_step, @@ -97,7 +101,7 @@ func save_data(): "port":$"/root/GameSettings".game_port }, "image":{ - "format":$"/root/GameSettings".image_format, + "format":format, "height":$"/root/GameSettings".image_heigth, "width":$"/root/GameSettings".image_width }, @@ -138,7 +142,11 @@ func update_settings(): game_wins_to_reset = data["game"]["wins_to_reset"] as int game_port= data["game"]["port"] as int - image_format = data["image"]["format"] + var format = data["image"]["format"] + if format =="RGB8": + image_rgb =true + else: + image_rgb = false; image_heigth = data["image"]["height"] as int image_width = data["image"]["width"] as int diff --git a/Battle Pong/Main.gd b/Battle Pong/Main.gd index cdd9b62dc40e94538b111b4b3c5648152fd9a3f2..032dd1d11ca327bf566891595720be88bc5901c5 100644 --- a/Battle Pong/Main.gd +++ b/Battle Pong/Main.gd @@ -323,12 +323,10 @@ func get_screenshot(): var thumbnail = get_viewport().get_texture().get_data() thumbnail.flip_y() thumbnail.resize(100, 60 ) - if $"/root/GameSettings".image_format == "RGB8": + if $"/root/GameSettings".image_rgb: thumbnail.convert(Image.FORMAT_RGB8 ) # Farbe - elif $"/root/GameSettings".image_format =="L8": - thumbnail.convert(Image.FORMAT_L8 ) # S/W else: - thumbnail.convert(Image.FORMAT_L8 ) # Settings + thumbnail.convert(Image.FORMAT_L8 ) # S/W #thumbnail.save_png('test.png') # Save Image as file - to debug diff --git a/Battle Pong/SettingsWindow.gd b/Battle Pong/SettingsWindow.gd index fc400064a09ea0ab1b625ad597c89dfa41d21a38..cfebdf653e89c9b49ad22c1f9d37b17147c5c0a4 100644 --- a/Battle Pong/SettingsWindow.gd +++ b/Battle Pong/SettingsWindow.gd @@ -17,7 +17,7 @@ func update_gui(): $VBoxContainer/grid_settings/vbox_game_settings/grid_game_settings/input_game_wins_to_reset.text = str($"/root/GameSettings".game_wins_to_reset) $VBoxContainer/grid_settings/vbox_game_settings/grid_game_settings/input_game_port.text= str($"/root/GameSettings".game_port) - $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_format.text = $"/root/GameSettings".image_format + $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_format.pressed = $"/root/GameSettings".image_rgb $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_height.text = str($"/root/GameSettings".image_heigth) $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_width.text = str($"/root/GameSettings".image_width) @@ -57,7 +57,7 @@ func _on_but_save_pressed(): $"/root/GameSettings".game_wins_to_reset = $VBoxContainer/grid_settings/vbox_game_settings/grid_game_settings/input_game_wins_to_reset.text as int $"/root/GameSettings".game_port = $VBoxContainer/grid_settings/vbox_game_settings/grid_game_settings/input_game_port.text as int - $"/root/GameSettings".image_format = $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_format.text + $"/root/GameSettings".image_rgb = $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_format.pressed $"/root/GameSettings".image_heigth = $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_height.text as int $"/root/GameSettings".image_width = $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_width.text as int diff --git a/Battle Pong/SettingsWindow.tscn b/Battle Pong/SettingsWindow.tscn index 7a84c7c64c9ade223cdc5f25b52cd16d8e53428c..9290139b098425ffba277dc4caf11bab8ad105da 100644 --- a/Battle Pong/SettingsWindow.tscn +++ b/Battle Pong/SettingsWindow.tscn @@ -37,8 +37,8 @@ __meta__ = { } [node name="grid_settings" type="GridContainer" parent="VBoxContainer"] -margin_right = 347.0 -margin_bottom = 269.0 +margin_right = 376.0 +margin_bottom = 278.0 columns = 3 __meta__ = { "_edit_use_anchors_": false @@ -46,7 +46,7 @@ __meta__ = { [node name="vbox_game_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] margin_right = 163.0 -margin_bottom = 105.0 +margin_bottom = 114.0 [node name="lbl_title_game_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_game_settings"] margin_right = 163.0 @@ -98,12 +98,12 @@ margin_bottom = 87.0 [node name="VSeparator" type="VSeparator" parent="VBoxContainer/grid_settings"] margin_left = 167.0 margin_right = 171.0 -margin_bottom = 105.0 +margin_bottom = 114.0 [node name="vbox_image_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] margin_left = 175.0 margin_right = 347.0 -margin_bottom = 105.0 +margin_bottom = 114.0 [node name="lbl_title_image_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings"] margin_right = 172.0 @@ -113,69 +113,69 @@ text = "Image:" [node name="grid_image_settings" type="GridContainer" parent="VBoxContainer/grid_settings/vbox_image_settings"] margin_top = 18.0 margin_right = 172.0 -margin_bottom = 98.0 +margin_bottom = 114.0 columns = 2 [node name="lbl_image_format" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] -margin_top = 5.0 -margin_right = 45.0 -margin_bottom = 19.0 -text = "Format" +margin_top = 13.0 +margin_right = 84.0 +margin_bottom = 27.0 +text = "Output RGB8" -[node name="input_image_format" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] -margin_left = 49.0 -margin_right = 107.0 -margin_bottom = 24.0 +[node name="input_image_format" type="CheckButton" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] +margin_left = 88.0 +margin_right = 164.0 +margin_bottom = 40.0 hint_tooltip = "example: RGB8 L8 https://docs.godotengine.org/en/stable/classes/class_image.html#enumerations" [node name="lbl_image_heigth" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] -margin_top = 33.0 -margin_right = 45.0 -margin_bottom = 47.0 +margin_top = 49.0 +margin_right = 84.0 +margin_bottom = 63.0 text = "Height" [node name="input_image_height" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] -margin_left = 49.0 -margin_top = 28.0 -margin_right = 107.0 -margin_bottom = 52.0 +margin_left = 88.0 +margin_top = 44.0 +margin_right = 164.0 +margin_bottom = 68.0 [node name="lbl_image_width" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] -margin_top = 61.0 -margin_right = 45.0 -margin_bottom = 75.0 +margin_top = 77.0 +margin_right = 84.0 +margin_bottom = 91.0 text = "Width" [node name="input_image_width" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] -margin_left = 49.0 -margin_top = 56.0 -margin_right = 107.0 -margin_bottom = 80.0 +margin_left = 88.0 +margin_top = 72.0 +margin_right = 164.0 +margin_bottom = 96.0 [node name="HSeparator" type="HSeparator" parent="VBoxContainer/grid_settings"] -margin_top = 109.0 +margin_top = 118.0 margin_right = 163.0 -margin_bottom = 113.0 +margin_bottom = 122.0 [node name="HSeparator6" type="HSeparator" parent="VBoxContainer/grid_settings"] margin_left = 167.0 -margin_top = 109.0 +margin_top = 118.0 margin_right = 171.0 -margin_bottom = 113.0 +margin_bottom = 122.0 [node name="HSeparator5" type="HSeparator" parent="VBoxContainer/grid_settings"] margin_left = 175.0 -margin_top = 109.0 +margin_top = 118.0 margin_right = 347.0 -margin_bottom = 113.0 +margin_bottom = 122.0 [node name="vbox_trainer_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] -margin_top = 117.0 +margin_top = 126.0 margin_right = 163.0 -margin_bottom = 215.0 +margin_bottom = 224.0 [node name="lbl_title_trainer_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_trainer_settings"] margin_right = 163.0 @@ -238,15 +238,15 @@ margin_bottom = 40.0 [node name="VSeparator2" type="VSeparator" parent="VBoxContainer/grid_settings"] margin_left = 167.0 -margin_top = 117.0 +margin_top = 126.0 margin_right = 171.0 -margin_bottom = 215.0 +margin_bottom = 224.0 [node name="vbox_ball_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] margin_left = 175.0 -margin_top = 117.0 +margin_top = 126.0 margin_right = 347.0 -margin_bottom = 215.0 +margin_bottom = 224.0 [node name="lbl_title_ball_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings"] margin_right = 172.0 @@ -319,26 +319,26 @@ margin_right = 172.0 margin_bottom = 80.0 [node name="HSeparator7" type="HSeparator" parent="VBoxContainer/grid_settings"] -margin_top = 219.0 +margin_top = 228.0 margin_right = 163.0 -margin_bottom = 223.0 +margin_bottom = 232.0 [node name="VSeparator3" type="HSeparator" parent="VBoxContainer/grid_settings"] margin_left = 167.0 -margin_top = 219.0 +margin_top = 228.0 margin_right = 171.0 -margin_bottom = 223.0 +margin_bottom = 232.0 [node name="HSeparator2" type="HSeparator" parent="VBoxContainer/grid_settings"] margin_left = 175.0 -margin_top = 219.0 +margin_top = 228.0 margin_right = 347.0 -margin_bottom = 223.0 +margin_bottom = 232.0 [node name="vbox_player_one_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] -margin_top = 227.0 +margin_top = 236.0 margin_right = 163.0 -margin_bottom = 269.0 +margin_bottom = 278.0 [node name="lbl_title_player_one_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_player_one_settings"] margin_right = 163.0 @@ -377,15 +377,15 @@ margin_bottom = 24.0 [node name="VSeparator4" type="VSeparator" parent="VBoxContainer/grid_settings"] margin_left = 167.0 -margin_top = 227.0 +margin_top = 236.0 margin_right = 171.0 -margin_bottom = 269.0 +margin_bottom = 278.0 [node name="vbox_player_two_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] margin_left = 175.0 -margin_top = 227.0 +margin_top = 236.0 margin_right = 347.0 -margin_bottom = 269.0 +margin_bottom = 278.0 [node name="lbl_title_player_two_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_player_two_settings"] margin_right = 172.0 @@ -422,26 +422,26 @@ margin_right = 101.0 margin_bottom = 24.0 [node name="VSeparator5" type="HSeparator" parent="VBoxContainer"] -margin_top = 273.0 -margin_right = 347.0 -margin_bottom = 277.0 +margin_top = 282.0 +margin_right = 376.0 +margin_bottom = 286.0 [node name="but_save" type="Button" parent="VBoxContainer"] -margin_top = 281.0 -margin_right = 347.0 -margin_bottom = 301.0 +margin_top = 290.0 +margin_right = 376.0 +margin_bottom = 310.0 text = "Save" [node name="but_cancel" type="Button" parent="VBoxContainer"] -margin_top = 305.0 -margin_right = 347.0 -margin_bottom = 325.0 +margin_top = 314.0 +margin_right = 376.0 +margin_bottom = 334.0 text = "Cancel" [node name="but_reset" type="Button" parent="VBoxContainer"] -margin_top = 329.0 -margin_right = 347.0 -margin_bottom = 349.0 +margin_top = 338.0 +margin_right = 376.0 +margin_bottom = 358.0 text = "Reset" [connection signal="pressed" from="VBoxContainer/grid_settings/vbox_trainer_settings/grid_trainer_settings/input_trainer_position" to="." method="_on_input_trainer_position_pressed"] [connection signal="pressed" from="VBoxContainer/but_save" to="." method="_on_but_save_pressed"]