From ac6e561c3d8b4c3746ecc871e61353cba875f82f Mon Sep 17 00:00:00 2001 From: adrienmalin <41926238+adrienmalin@users.noreply.github.com> Date: Sat, 26 Jan 2019 13:38:04 +0100 Subject: [PATCH] tweaks --- source/Main.gd | 8 +- source/Main.tscn | 357 +++++++++++++++++---------------- source/Tetrominos/Tetromino.gd | 3 +- source/project.godot | 1 + 4 files changed, 185 insertions(+), 184 deletions(-) diff --git a/source/Main.gd b/source/Main.gd index 462a820..d7cd3ea 100644 --- a/source/Main.gd +++ b/source/Main.gd @@ -125,14 +125,14 @@ func hard_drop(): $Stats.piece_dropped(score) var translations = current_piece.get_translations() for i in range(Tetromino.NB_MINOES): - get_node("DropTrail/"+str(i)).translation = translations[i] - $DropTrail.visible = true - $DropTrail/Delay.start() + get_node("Matrix/DropTrail/"+str(i)).translation = translations[i] + $Matrix/DropTrail.visible = true + $Matrix/DropTrail/Delay.start() $LockDelay.stop() lock() func _on_DropTrailDelay_timeout(): - $DropTrail.visible = false + $Matrix/DropTrail.visible = false func _on_DropTimer_timeout(): current_piece.move(movements["soft_drop"]) diff --git a/source/Main.tscn b/source/Main.tscn index 98e320e..9489b8c 100644 --- a/source/Main.tscn +++ b/source/Main.tscn @@ -5,15 +5,15 @@ [ext_resource path="res://aperture-vintage-472251-unsplash.jpg" type="Texture" id=3] [ext_resource path="res://Tetrominos/Mino/MinoLibrary.tres" type="MeshLibrary" id=4] [ext_resource path="res://GridMap.gd" type="Script" id=5] -[ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=6] -[ext_resource path="res://MidiPlayer.gd" type="Script" id=7] -[ext_resource path="res://FlashText.gd" type="Script" id=8] -[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=9] -[ext_resource path="res://Stats.tscn" type="PackedScene" id=10] -[ext_resource path="res://controls.tscn" type="PackedScene" id=11] -[ext_resource path="res://Start.tscn" type="PackedScene" id=12] -[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=13] -[ext_resource path="res://Tetrominos/Mino/drop_trail.png" type="Texture" id=14] +[ext_resource path="res://Tetrominos/Mino/drop_trail.png" type="Texture" id=6] +[ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=7] +[ext_resource path="res://MidiPlayer.gd" type="Script" id=8] +[ext_resource path="res://FlashText.gd" type="Script" id=9] +[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=10] +[ext_resource path="res://Stats.tscn" type="PackedScene" id=11] +[ext_resource path="res://controls.tscn" type="PackedScene" id=12] +[ext_resource path="res://Start.tscn" type="PackedScene" id=13] +[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=14] [sub_resource type="SpatialMaterial" id=1] @@ -91,7 +91,7 @@ subdivide_depth = 0 size = 50 use_mipmaps = true use_filter = false -font_data = ExtResource( 9 ) +font_data = ExtResource( 10 ) _sections_unfolded = [ "Font", "Settings" ] [sub_resource type="Animation" id=5] @@ -143,7 +143,7 @@ size = 20 use_mipmaps = false use_filter = false extra_spacing_bottom = 5 -font_data = ExtResource( 13 ) +font_data = ExtResource( 14 ) _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] [node name="Main" type="WorldEnvironment" index="0"] @@ -273,6 +273,167 @@ __meta__ = { transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 20, 0 ) _sections_unfolded = [ "Transform" ] +[node name="DropTrail" type="Spatial" parent="Matrix" index="2"] + +editor/display_folded = true +transform = Transform( 0.1, 0, 0, 0, 0.05, 0, 0, 0, 1, -0.45, -0.475, 0 ) +visible = false +_sections_unfolded = [ "Transform" ] + +[node name="0" type="Spatial" parent="Matrix/DropTrail" index="0"] + +_sections_unfolded = [ "Transform" ] + +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/0" index="0"] + +transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) +layers = 1 +material_override = null +cast_shadow = 1 +extra_cull_margin = 0.0 +use_in_baked_light = false +lod_min_distance = 0.0 +lod_min_hysteresis = 0.0 +lod_max_distance = 0.0 +lod_max_hysteresis = 0.0 +centered = true +offset = Vector2( 0, 0 ) +flip_h = false +flip_v = false +modulate = Color( 1, 1, 1, 1 ) +opacity = 0.1 +pixel_size = 0.01 +axis = 2 +transparent = true +shaded = false +double_sided = true +alpha_cut = 0 +texture = ExtResource( 6 ) +vframes = 1 +hframes = 1 +frame = 0 +region_enabled = false +region_rect = Rect2( 0, 0, 0, 0 ) +_sections_unfolded = [ "Flags", "Transform" ] + +[node name="1" type="Spatial" parent="Matrix/DropTrail" index="1"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 0 ) +_sections_unfolded = [ "Transform" ] + +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/1" index="0"] + +transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) +layers = 1 +material_override = null +cast_shadow = 1 +extra_cull_margin = 0.0 +use_in_baked_light = false +lod_min_distance = 0.0 +lod_min_hysteresis = 0.0 +lod_max_distance = 0.0 +lod_max_hysteresis = 0.0 +centered = true +offset = Vector2( 0, 0 ) +flip_h = false +flip_v = false +modulate = Color( 1, 1, 1, 1 ) +opacity = 0.1 +pixel_size = 0.01 +axis = 2 +transparent = true +shaded = false +double_sided = true +alpha_cut = 0 +texture = ExtResource( 6 ) +vframes = 1 +hframes = 1 +frame = 0 +region_enabled = false +region_rect = Rect2( 0, 0, 0, 0 ) +_sections_unfolded = [ "Flags", "Transform" ] + +[node name="2" type="Spatial" parent="Matrix/DropTrail" index="2"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 ) +_sections_unfolded = [ "Transform" ] + +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/2" index="0"] + +transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) +layers = 1 +material_override = null +cast_shadow = 1 +extra_cull_margin = 0.0 +use_in_baked_light = false +lod_min_distance = 0.0 +lod_min_hysteresis = 0.0 +lod_max_distance = 0.0 +lod_max_hysteresis = 0.0 +centered = true +offset = Vector2( 0, 0 ) +flip_h = false +flip_v = false +modulate = Color( 1, 1, 1, 1 ) +opacity = 0.1 +pixel_size = 0.01 +axis = 2 +transparent = true +shaded = false +double_sided = true +alpha_cut = 0 +texture = ExtResource( 6 ) +vframes = 1 +hframes = 1 +frame = 0 +region_enabled = false +region_rect = Rect2( 0, 0, 0, 0 ) +_sections_unfolded = [ "Flags", "Transform" ] + +[node name="3" type="Spatial" parent="Matrix/DropTrail" index="3"] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) +_sections_unfolded = [ "Transform" ] + +[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/3" index="0"] + +transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) +layers = 1 +material_override = null +cast_shadow = 1 +extra_cull_margin = 0.0 +use_in_baked_light = false +lod_min_distance = 0.0 +lod_min_hysteresis = 0.0 +lod_max_distance = 0.0 +lod_max_hysteresis = 0.0 +centered = true +offset = Vector2( 0, 0 ) +flip_h = false +flip_v = false +modulate = Color( 1, 1, 1, 1 ) +opacity = 0.1 +pixel_size = 0.01 +axis = 2 +transparent = true +shaded = false +double_sided = true +alpha_cut = 0 +texture = ExtResource( 6 ) +vframes = 1 +hframes = 1 +frame = 0 +region_enabled = false +region_rect = Rect2( 0, 0, 0, 0 ) +_sections_unfolded = [ "Flags", "Transform" ] + +[node name="Delay" type="Timer" parent="Matrix/DropTrail" index="4"] + +process_mode = 1 +wait_time = 0.06 +one_shot = true +autostart = false + [node name="Hold" type="MeshInstance" parent="." index="4"] transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 1, -5, 16, 0 ) @@ -347,10 +508,10 @@ wait_time = 0.03 one_shot = false autostart = false -[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 6 )] +[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 7 )] editor/display_folded = true -script = ExtResource( 7 ) +script = ExtResource( 8 ) _sections_unfolded = [ "Pause" ] file = "res://midi/Korobeiniki.mid" volume_db = -24 @@ -381,7 +542,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -script = ExtResource( 8 ) +script = ExtResource( 9 ) _sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme" ] [node name="Label" type="Label" parent="FlashText" index="0"] @@ -419,7 +580,7 @@ anims/Flash = SubResource( 5 ) blend_times = [ ] _sections_unfolded = [ "Playback Options" ] -[node name="Stats" parent="." index="12" instance=ExtResource( 10 )] +[node name="Stats" parent="." index="12" instance=ExtResource( 11 )] visible = false anchor_left = 0.0 @@ -431,11 +592,11 @@ margin_top = -220.0 margin_right = 140.0 margin_bottom = -25.0 -[node name="controls_ui" parent="." index="13" instance=ExtResource( 11 )] +[node name="controls_ui" parent="." index="13" instance=ExtResource( 12 )] visible = false -[node name="Start" parent="." index="14" instance=ExtResource( 12 )] +[node name="Start" parent="." index="14" instance=ExtResource( 13 )] [node name="ReplayButton" type="Button" parent="." index="15"] @@ -466,165 +627,7 @@ flat = false align = 1 _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ] -[node name="DropTrail" type="Spatial" parent="." index="16"] - -editor/display_folded = true -visible = false -_sections_unfolded = [ "Transform" ] - -[node name="0" type="Spatial" parent="DropTrail" index="0"] - -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="DropTrail/0" index="0"] - -transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) -opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 -texture = ExtResource( 14 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] - -[node name="1" type="Spatial" parent="DropTrail" index="1"] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="DropTrail/1" index="0"] - -transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) -opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 -texture = ExtResource( 14 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] - -[node name="2" type="Spatial" parent="DropTrail" index="2"] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="DropTrail/2" index="0"] - -transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) -opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 -texture = ExtResource( 14 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] - -[node name="3" type="Spatial" parent="DropTrail" index="3"] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) -_sections_unfolded = [ "Transform" ] - -[node name="Sprite" type="Sprite3D" parent="DropTrail/3" index="0"] - -transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 0 ) -layers = 1 -material_override = null -cast_shadow = 1 -extra_cull_margin = 0.0 -use_in_baked_light = false -lod_min_distance = 0.0 -lod_min_hysteresis = 0.0 -lod_max_distance = 0.0 -lod_max_hysteresis = 0.0 -centered = true -offset = Vector2( 0, 0 ) -flip_h = false -flip_v = false -modulate = Color( 1, 1, 1, 1 ) -opacity = 0.1 -pixel_size = 0.01 -axis = 2 -transparent = true -shaded = false -double_sided = true -alpha_cut = 0 -texture = ExtResource( 14 ) -vframes = 1 -hframes = 1 -frame = 0 -region_enabled = false -region_rect = Rect2( 0, 0, 0, 0 ) -_sections_unfolded = [ "Flags", "Transform" ] - -[node name="Delay" type="Timer" parent="DropTrail" index="4"] - -process_mode = 1 -wait_time = 0.06 -one_shot = true -autostart = false +[connection signal="timeout" from="Matrix/DropTrail/Delay" to="." method="_on_DropTrailDelay_timeout"] [connection signal="timeout" from="DropTimer" to="." method="_on_DropTimer_timeout"] @@ -646,6 +649,4 @@ autostart = false [connection signal="pressed" from="ReplayButton" to="." method="_on_ReplayButton_pressed"] -[connection signal="timeout" from="DropTrail/Delay" to="." method="_on_DropTrailDelay_timeout"] - diff --git a/source/Tetrominos/Tetromino.gd b/source/Tetrominos/Tetromino.gd index d572991..d847b73 100644 --- a/source/Tetrominos/Tetromino.gd +++ b/source/Tetrominos/Tetromino.gd @@ -98,8 +98,7 @@ func get_translations(): func move(movement): if grid_map.possible_positions(get_translations(), movement): translate(movement) - if movement == DROP_MOVEMENT: - unlocking() + unlocking() rotated_last = false return true else: diff --git a/source/project.godot b/source/project.godot index 7068609..3d8b98a 100644 --- a/source/project.godot +++ b/source/project.godot @@ -49,6 +49,7 @@ toggle_fullscreen=[ Object(InputEventKey,"resource_local_to_scene":false,"resour [rendering] +quality/filters/use_nearest_mipmap_filter=true environment/default_clear_color=Color( 0, 0, 0, 1 ) environment/default_environment="res://Environment.tres" quality/main_loop_type=""