Skip to content

Commit

Permalink
Fixed small bug with initial element
Browse files Browse the repository at this point in the history
  • Loading branch information
kiwijuice56 committed Jan 14, 2023
1 parent d03965f commit 07342a6
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 8 deletions.
Binary file modified .sconsign.dblite
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
14 changes: 8 additions & 6 deletions game/main/Main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

[sub_resource type="ImageTexture" id="ImageTexture_y7mie"]

[sub_resource type="ShaderMaterial" id="ShaderMaterial_5pqk5"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_5hmme"]
shader = ExtResource("5_mtoof")
shader_parameter/width = null
shader_parameter/height = null
Expand Down Expand Up @@ -157,7 +157,7 @@ shader_parameter/metal_id_match = null
shader_parameter/metal_color_a = null
shader_parameter/metal_color_b = null

[sub_resource type="ImageTexture" id="ImageTexture_flcuu"]
[sub_resource type="ImageTexture" id="ImageTexture_b55ar"]

[sub_resource type="Environment" id="Environment_iakyf"]
background_mode = 3
Expand Down Expand Up @@ -1577,13 +1577,13 @@ layer = -1

[node name="Canvas" type="TextureRect" parent="UI/VSplitContainer/TopPanel/CanvasLayer" node_paths=PackedStringArray("size_mirror")]
texture_filter = 1
material = SubResource("ShaderMaterial_5pqk5")
material = SubResource("ShaderMaterial_5hmme")
custom_minimum_size = Vector2(0, 64)
offset_right = 360.0
offset_bottom = 273.0
size_flags_vertical = 3
size_flags_stretch_ratio = 2.0
texture = SubResource("ImageTexture_flcuu")
texture = SubResource("ImageTexture_b55ar")
ignore_texture_size = true
script = ExtResource("6_o82wb")
background_colors = []
Expand Down Expand Up @@ -1673,7 +1673,7 @@ theme_override_styles/pressed = SubResource("StyleBoxFlat_3h7k3")
icon = ExtResource("105_qi678")
icon_alignment = 1

[node name="ElementSelector" type="TabContainer" parent="UI/VSplitContainer/BottomPanel/BottomPanel/VBoxContainer" node_paths=PackedStringArray("simulation", "eraser_button", "tap_button")]
[node name="ElementSelector" type="TabContainer" parent="UI/VSplitContainer/BottomPanel/BottomPanel/VBoxContainer" node_paths=PackedStringArray("simulation", "eraser_button", "tap_button", "last_button")]
layout_mode = 2
size_flags_vertical = 3
theme_override_font_sizes/font_size = 16
Expand All @@ -1684,6 +1684,7 @@ script = ExtResource("106_sbggk")
simulation = NodePath("../../../../../..")
eraser_button = NodePath("../HBoxContainer/Eraser")
tap_button = NodePath("../HBoxContainer/Tap")
last_button = NodePath("Basic/Basic/Sand")
selected_material = ExtResource("107_aj6vj")

[node name="Basic" type="MarginContainer" parent="UI/VSplitContainer/BottomPanel/BottomPanel/VBoxContainer/ElementSelector"]
Expand All @@ -1701,6 +1702,7 @@ theme_override_constants/v_separation = 0
columns = 4

[node name="Sand" type="Button" parent="UI/VSplitContainer/BottomPanel/BottomPanel/VBoxContainer/ElementSelector/Basic/Basic"]
material = ExtResource("107_aj6vj")
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
Expand Down Expand Up @@ -2800,7 +2802,6 @@ text = " "
text_overrun_behavior = 1

[node name="FPSLabelContainer" type="MarginContainer" parent="UI"]
visible = false
layout_mode = 0
offset_right = 360.0
offset_bottom = 45.0
Expand All @@ -2809,6 +2810,7 @@ theme_override_constants/margin_left = 8
theme_override_constants/margin_top = 8

[node name="FPSLabel" type="Label" parent="UI/FPSLabelContainer"]
visible = false
layout_mode = 2
size_flags_vertical = 1
theme_override_font_sizes/font_size = 12
Expand Down
2 changes: 1 addition & 1 deletion game/main/ui/element_selector/element_selector.gd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class_name ElementSelector
@export var tap_button: Button

var tap_on := false
var last_button: Button
@export var last_button: Button
@export var selected_material: ShaderMaterial

func _ready():
Expand Down
2 changes: 1 addition & 1 deletion game/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ boot_splash/show_image=false
boot_splash/bg_color=Color(0, 0, 0, 1)
config/icon="res://icon.png"
config/windows_native_icon="res://favicon.ico"
config/version="2.0"
config/version="2.1"

[display]

Expand Down

0 comments on commit 07342a6

Please sign in to comment.