Skip to content
Snippets Groups Projects
Commit dd6d74e0 authored by Frederic Aust's avatar Frederic Aust
Browse files

In den GameSettings die Imageformat Auswahl von Freitext zu einem Checkbutton... 

In den GameSettings die Imageformat Auswahl von Freitext zu einem Checkbutton gewechselt, damit User einfacher zwischen Farbe (RGB8) und S/W (L8) wechseln koennen
parent e232f8f6
No related branches found
No related tags found
1 merge request!6Binding all settings to game
Show whitespace changes
Inline Side-by-side
Battle Pong/GameSettings.gd
+ 11
− 3
View file @ dd6d74e0
...@@ -12,7 +12,7 @@ var game_playtime_per_step ...@@ -12,7 +12,7 @@ var game_playtime_per_step
var game_wins_to_reset var game_wins_to_reset
var game_port var game_port
var image_format var image_rgb
var image_heigth var image_heigth
var image_width var image_width
...@@ -90,6 +90,10 @@ func load_data(): ...@@ -90,6 +90,10 @@ func load_data():
update_settings() update_settings()
func save_data(): func save_data():
var format = "L8"
if $"/root/GameSettings".image_rgb:
format = "RGB8"
data = { data = {
"game":{ "game":{
"playtime_per_step":$"/root/GameSettings".game_playtime_per_step, "playtime_per_step":$"/root/GameSettings".game_playtime_per_step,
...@@ -97,7 +101,7 @@ func save_data(): ...@@ -97,7 +101,7 @@ func save_data():
"port":$"/root/GameSettings".game_port "port":$"/root/GameSettings".game_port
}, },
"image":{ "image":{
"format":$"/root/GameSettings".image_format, "format":format,
"height":$"/root/GameSettings".image_heigth, "height":$"/root/GameSettings".image_heigth,
"width":$"/root/GameSettings".image_width "width":$"/root/GameSettings".image_width
}, },
...@@ -138,7 +142,11 @@ func update_settings(): ...@@ -138,7 +142,11 @@ func update_settings():
game_wins_to_reset = data["game"]["wins_to_reset"] as int game_wins_to_reset = data["game"]["wins_to_reset"] as int
game_port= data["game"]["port"] 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_heigth = data["image"]["height"] as int
image_width = data["image"]["width"] as int image_width = data["image"]["width"] as int
......
Battle Pong/Main.gd
+ 2
− 4
View file @ dd6d74e0
...@@ -323,12 +323,10 @@ func get_screenshot(): ...@@ -323,12 +323,10 @@ func get_screenshot():
var thumbnail = get_viewport().get_texture().get_data() var thumbnail = get_viewport().get_texture().get_data()
thumbnail.flip_y() thumbnail.flip_y()
thumbnail.resize(100, 60 ) thumbnail.resize(100, 60 )
if $"/root/GameSettings".image_format == "RGB8": if $"/root/GameSettings".image_rgb:
thumbnail.convert(Image.FORMAT_RGB8 ) # Farbe thumbnail.convert(Image.FORMAT_RGB8 ) # Farbe
elif $"/root/GameSettings".image_format =="L8":
thumbnail.convert(Image.FORMAT_L8 ) # S/W
else: 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 #thumbnail.save_png('test.png') # Save Image as file - to debug
......
Battle Pong/SettingsWindow.gd
+ 2
− 2
View file @ dd6d74e0
...@@ -17,7 +17,7 @@ func update_gui(): ...@@ -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_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_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_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) $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(): ...@@ -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_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".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_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 $"/root/GameSettings".image_width = $VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings/input_image_width.text as int
......
Battle Pong/SettingsWindow.tscn
+ 64
− 64
View file @ dd6d74e0
...@@ -37,8 +37,8 @@ __meta__ = { ...@@ -37,8 +37,8 @@ __meta__ = {
} }
[node name="grid_settings" type="GridContainer" parent="VBoxContainer"] [node name="grid_settings" type="GridContainer" parent="VBoxContainer"]
margin_right = 347.0 margin_right = 376.0
margin_bottom = 269.0 margin_bottom = 278.0
columns = 3 columns = 3
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
...@@ -46,7 +46,7 @@ __meta__ = { ...@@ -46,7 +46,7 @@ __meta__ = {
[node name="vbox_game_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] [node name="vbox_game_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"]
margin_right = 163.0 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"] [node name="lbl_title_game_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_game_settings"]
margin_right = 163.0 margin_right = 163.0
...@@ -98,12 +98,12 @@ margin_bottom = 87.0 ...@@ -98,12 +98,12 @@ margin_bottom = 87.0
[node name="VSeparator" type="VSeparator" parent="VBoxContainer/grid_settings"] [node name="VSeparator" type="VSeparator" parent="VBoxContainer/grid_settings"]
margin_left = 167.0 margin_left = 167.0
margin_right = 171.0 margin_right = 171.0
margin_bottom = 105.0 margin_bottom = 114.0
[node name="vbox_image_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] [node name="vbox_image_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"]
margin_left = 175.0 margin_left = 175.0
margin_right = 347.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"] [node name="lbl_title_image_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings"]
margin_right = 172.0 margin_right = 172.0
...@@ -113,69 +113,69 @@ text = "Image:" ...@@ -113,69 +113,69 @@ text = "Image:"
[node name="grid_image_settings" type="GridContainer" parent="VBoxContainer/grid_settings/vbox_image_settings"] [node name="grid_image_settings" type="GridContainer" parent="VBoxContainer/grid_settings/vbox_image_settings"]
margin_top = 18.0 margin_top = 18.0
margin_right = 172.0 margin_right = 172.0
margin_bottom = 98.0 margin_bottom = 114.0
columns = 2 columns = 2
[node name="lbl_image_format" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] [node name="lbl_image_format" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"]
margin_top = 5.0 margin_top = 13.0
margin_right = 45.0 margin_right = 84.0
margin_bottom = 19.0 margin_bottom = 27.0
text = "Format" text = "Output RGB8"
[node name="input_image_format" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] [node name="input_image_format" type="CheckButton" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"]
margin_left = 49.0 margin_left = 88.0
margin_right = 107.0 margin_right = 164.0
margin_bottom = 24.0 margin_bottom = 40.0
hint_tooltip = "example: hint_tooltip = "example:
RGB8 RGB8
L8 L8
https://docs.godotengine.org/en/stable/classes/class_image.html#enumerations" 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"] [node name="lbl_image_heigth" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"]
margin_top = 33.0 margin_top = 49.0
margin_right = 45.0 margin_right = 84.0
margin_bottom = 47.0 margin_bottom = 63.0
text = "Height" text = "Height"
[node name="input_image_height" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] [node name="input_image_height" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"]
margin_left = 49.0 margin_left = 88.0
margin_top = 28.0 margin_top = 44.0
margin_right = 107.0 margin_right = 164.0
margin_bottom = 52.0 margin_bottom = 68.0
[node name="lbl_image_width" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] [node name="lbl_image_width" type="Label" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"]
margin_top = 61.0 margin_top = 77.0
margin_right = 45.0 margin_right = 84.0
margin_bottom = 75.0 margin_bottom = 91.0
text = "Width" text = "Width"
[node name="input_image_width" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"] [node name="input_image_width" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_image_settings/grid_image_settings"]
margin_left = 49.0 margin_left = 88.0
margin_top = 56.0 margin_top = 72.0
margin_right = 107.0 margin_right = 164.0
margin_bottom = 80.0 margin_bottom = 96.0
[node name="HSeparator" type="HSeparator" parent="VBoxContainer/grid_settings"] [node name="HSeparator" type="HSeparator" parent="VBoxContainer/grid_settings"]
margin_top = 109.0 margin_top = 118.0
margin_right = 163.0 margin_right = 163.0
margin_bottom = 113.0 margin_bottom = 122.0
[node name="HSeparator6" type="HSeparator" parent="VBoxContainer/grid_settings"] [node name="HSeparator6" type="HSeparator" parent="VBoxContainer/grid_settings"]
margin_left = 167.0 margin_left = 167.0
margin_top = 109.0 margin_top = 118.0
margin_right = 171.0 margin_right = 171.0
margin_bottom = 113.0 margin_bottom = 122.0
[node name="HSeparator5" type="HSeparator" parent="VBoxContainer/grid_settings"] [node name="HSeparator5" type="HSeparator" parent="VBoxContainer/grid_settings"]
margin_left = 175.0 margin_left = 175.0
margin_top = 109.0 margin_top = 118.0
margin_right = 347.0 margin_right = 347.0
margin_bottom = 113.0 margin_bottom = 122.0
[node name="vbox_trainer_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] [node name="vbox_trainer_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"]
margin_top = 117.0 margin_top = 126.0
margin_right = 163.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"] [node name="lbl_title_trainer_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_trainer_settings"]
margin_right = 163.0 margin_right = 163.0
...@@ -238,15 +238,15 @@ margin_bottom = 40.0 ...@@ -238,15 +238,15 @@ margin_bottom = 40.0
[node name="VSeparator2" type="VSeparator" parent="VBoxContainer/grid_settings"] [node name="VSeparator2" type="VSeparator" parent="VBoxContainer/grid_settings"]
margin_left = 167.0 margin_left = 167.0
margin_top = 117.0 margin_top = 126.0
margin_right = 171.0 margin_right = 171.0
margin_bottom = 215.0 margin_bottom = 224.0
[node name="vbox_ball_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] [node name="vbox_ball_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"]
margin_left = 175.0 margin_left = 175.0
margin_top = 117.0 margin_top = 126.0
margin_right = 347.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"] [node name="lbl_title_ball_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings"]
margin_right = 172.0 margin_right = 172.0
...@@ -319,26 +319,26 @@ margin_right = 172.0 ...@@ -319,26 +319,26 @@ margin_right = 172.0
margin_bottom = 80.0 margin_bottom = 80.0
[node name="HSeparator7" type="HSeparator" parent="VBoxContainer/grid_settings"] [node name="HSeparator7" type="HSeparator" parent="VBoxContainer/grid_settings"]
margin_top = 219.0 margin_top = 228.0
margin_right = 163.0 margin_right = 163.0
margin_bottom = 223.0 margin_bottom = 232.0
[node name="VSeparator3" type="HSeparator" parent="VBoxContainer/grid_settings"] [node name="VSeparator3" type="HSeparator" parent="VBoxContainer/grid_settings"]
margin_left = 167.0 margin_left = 167.0
margin_top = 219.0 margin_top = 228.0
margin_right = 171.0 margin_right = 171.0
margin_bottom = 223.0 margin_bottom = 232.0
[node name="HSeparator2" type="HSeparator" parent="VBoxContainer/grid_settings"] [node name="HSeparator2" type="HSeparator" parent="VBoxContainer/grid_settings"]
margin_left = 175.0 margin_left = 175.0
margin_top = 219.0 margin_top = 228.0
margin_right = 347.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"] [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_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"] [node name="lbl_title_player_one_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_player_one_settings"]
margin_right = 163.0 margin_right = 163.0
...@@ -377,15 +377,15 @@ margin_bottom = 24.0 ...@@ -377,15 +377,15 @@ margin_bottom = 24.0
[node name="VSeparator4" type="VSeparator" parent="VBoxContainer/grid_settings"] [node name="VSeparator4" type="VSeparator" parent="VBoxContainer/grid_settings"]
margin_left = 167.0 margin_left = 167.0
margin_top = 227.0 margin_top = 236.0
margin_right = 171.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"] [node name="vbox_player_two_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"]
margin_left = 175.0 margin_left = 175.0
margin_top = 227.0 margin_top = 236.0
margin_right = 347.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"] [node name="lbl_title_player_two_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_player_two_settings"]
margin_right = 172.0 margin_right = 172.0
...@@ -422,26 +422,26 @@ margin_right = 101.0 ...@@ -422,26 +422,26 @@ margin_right = 101.0
margin_bottom = 24.0 margin_bottom = 24.0
[node name="VSeparator5" type="HSeparator" parent="VBoxContainer"] [node name="VSeparator5" type="HSeparator" parent="VBoxContainer"]
margin_top = 273.0 margin_top = 282.0
margin_right = 347.0 margin_right = 376.0
margin_bottom = 277.0 margin_bottom = 286.0
[node name="but_save" type="Button" parent="VBoxContainer"] [node name="but_save" type="Button" parent="VBoxContainer"]
margin_top = 281.0 margin_top = 290.0
margin_right = 347.0 margin_right = 376.0
margin_bottom = 301.0 margin_bottom = 310.0
text = "Save" text = "Save"
[node name="but_cancel" type="Button" parent="VBoxContainer"] [node name="but_cancel" type="Button" parent="VBoxContainer"]
margin_top = 305.0 margin_top = 314.0
margin_right = 347.0 margin_right = 376.0
margin_bottom = 325.0 margin_bottom = 334.0
text = "Cancel" text = "Cancel"
[node name="but_reset" type="Button" parent="VBoxContainer"] [node name="but_reset" type="Button" parent="VBoxContainer"]
margin_top = 329.0 margin_top = 338.0
margin_right = 347.0 margin_right = 376.0
margin_bottom = 349.0 margin_bottom = 358.0
text = "Reset" 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/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"] [connection signal="pressed" from="VBoxContainer/but_save" to="." method="_on_but_save_pressed"]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum Datenschutzerklärung