From 74de557b57876189415b3b6fc0f95bfc27573efa Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Sun, 9 Feb 2020 17:01:32 +0100 Subject: [PATCH] increase particle size --- game/project.godot | 5 +++++ game/src/Main.tscn | 2 +- game/src/Piece.tscn | 8 +++++++- game/src/Taquin.tscn | 17 +++++++++++------ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/game/project.godot b/game/project.godot index 176455f..1e9383b 100644 --- a/game/project.godot +++ b/game/project.godot @@ -46,6 +46,11 @@ window/size/height.mobile=1200 window/stretch/mode.mobile="2d" window/stretch/aspect.mobile="expand" +[input_devices] + +pointing/emulate_touch_from_mouse=true +pointing/emulate_mouse_from_touch=false + [rendering] environment/default_environment="res://default_env.tres" diff --git a/game/src/Main.tscn b/game/src/Main.tscn index 8738d4a..ca3ae8d 100644 --- a/game/src/Main.tscn +++ b/game/src/Main.tscn @@ -122,5 +122,5 @@ __meta__ = { [node name="GameState" type="Node" parent="."] script = ExtResource( 3 ) -[connection signal="state_changed" from="GameState" to="." method="_on_GameState_state_changed"] [connection signal="state_changed" from="GameState" to="HSplitContainer/Taquin" method="_on_GameState_state_changed"] +[connection signal="state_changed" from="GameState" to="." method="_on_GameState_state_changed"] diff --git a/game/src/Piece.tscn b/game/src/Piece.tscn index 9bffe03..d69571c 100644 --- a/game/src/Piece.tscn +++ b/game/src/Piece.tscn @@ -81,7 +81,7 @@ void light() { } " -graph_offset = Vector2( -286.293, 31.5315 ) +graph_offset = Vector2( 0, 75 ) mode = 1 flags/light_only = false nodes/fragment/0/position = Vector2( 1080, 160 ) @@ -118,6 +118,9 @@ anchor_right = 1.0 anchor_bottom = 1.0 margin_right = 64.0 margin_bottom = 64.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="Label" type="Label" parent="ColorRect"] margin_left = 10.0 @@ -129,3 +132,6 @@ rect_clip_content = true size_flags_vertical = 1 custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "0" +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/game/src/Taquin.tscn b/game/src/Taquin.tscn index 2c0f35a..d8958aa 100644 --- a/game/src/Taquin.tscn +++ b/game/src/Taquin.tscn @@ -20,13 +20,13 @@ tracks/0/keys = { "values": [ Vector2( 15, 15 ), Vector2( 175, 15 ) ] } -[sub_resource type="Gradient" id=3] +[sub_resource type="Gradient" id=2] colors = PoolColorArray( 1, 1, 1, 1, 1, 0.140625, 0.140625, 1 ) -[sub_resource type="GradientTexture" id=4] -gradient = SubResource( 3 ) +[sub_resource type="GradientTexture" id=3] +gradient = SubResource( 2 ) -[sub_resource type="ParticlesMaterial" id=2] +[sub_resource type="ParticlesMaterial" id=4] emission_shape = 2 emission_box_extents = Vector3( 10, 5, 1 ) flag_disable_z = true @@ -40,11 +40,15 @@ linear_accel = 1.0 damping = 22.0 angle = 45.0 angle_random = 1.0 -color_ramp = SubResource( 4 ) +scale = 5.0 +color_ramp = SubResource( 3 ) [node name="Taquin" type="Control"] rect_min_size = Vector2( 540, 540 ) script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} rows = 5 columns = 5 difficulty = 0 @@ -70,13 +74,14 @@ color = Color( 0.137255, 0.976471, 0.0196078, 1 ) [node name="Particles2D" type="Particles2D" parent="."] position = Vector2( 253, 262 ) rotation = -1.5708 +emitting = false amount = 30 lifetime = 1.6 preprocess = 0.25 speed_scale = 1.25 explosiveness = 1.0 local_coords = false -process_material = SubResource( 2 ) +process_material = SubResource( 4 ) [node name="Timer" type="Timer" parent="."] wait_time = 2.0