move flash text

README.md

@@ -2,5 +2,5 @@
 
 [Downloads](https://github.com/adrienmalin/TETRIS3000/releases)
 
-[Play in browser](https://adrienmalin.github.io/TETRIS3000/web/TETRIS3000.html)
+[Play in browser](https://adrienmalin.github.io/TETRIS3000/web/TETRIS3000.html) (Firefox recommanded)
 

source/FlashText.gd

@@ -10,7 +10,7 @@ func print(text):
 	$AnimationPlayer.play("Flash")
 
 func _on_AnimationPlayer_animation_finished(anim_name):
-	texts.resize(0)
+	texts = PoolStringArray()
 
 func _on_Stats_flash_text(text):
 	self.print(text)

source/Main.gd

@@ -43,10 +43,10 @@ func new_game(level):
 func new_piece():
 	current_piece = next_piece
 	current_piece.translation = $Matrix/Position3D.translation
-	current_piece.emit_trail(true)
+	current_piece.turn_light(true)
 	next_piece = random_piece()
 	next_piece.translation = $Next/Position3D.translation
-	if current_piece.move(THERE):
+	if $Matrix/GridMap.possible_positions(current_piece.get_translations(), THERE):
 		$DropTimer.start()
 		current_piece_held = false
 	else:
@@ -83,20 +83,9 @@ func _unhandled_input(event):
 			$AutoShiftDelay.stop()
 			$AutoShiftTimer.stop()
 			autoshift_action = ""
-			for action in movements:
-				if Input.is_action_pressed(action):
-					autoshift_action = action
-					process_autoshift()
-					$AutoShiftDelay.start()
-					break
-		for action in movements:
-			if action != autoshift_action:
-				if event.is_action_pressed(action):
-					$AutoShiftTimer.stop()
-					autoshift_action = action
-					process_autoshift()
-					$AutoShiftDelay.start()
-					break
+			process_new_action(Input)
+		else:
+			process_new_action(event)
 		if event.is_action_pressed("hard_drop"):
 			hard_drop()
 		if event.is_action_pressed("rotate_clockwise"):
@@ -105,6 +94,15 @@ func _unhandled_input(event):
 			current_piece.turn(Tetromino.COUNTERCLOCKWISE)
 		if event.is_action_pressed("hold"):
 			hold()
+			
+func process_new_action(event):
+	for action in movements:
+		if action != autoshift_action and event.is_action_pressed(action):
+			$AutoShiftTimer.stop()
+			autoshift_action = action
+			process_autoshift()
+			$AutoShiftDelay.start()
+			break
 
 func _on_AutoShiftDelay_timeout():
 	if autoshift_action:
@@ -125,14 +123,24 @@ func hard_drop():
 	while current_piece.move(movements["soft_drop"]):
 		score += 2
 	$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()
 	$LockDelay.stop()
 	lock()
 
+func _on_DropTrailDelay_timeout():
+	$DropTrail.visible = false
+
 func _on_DropTimer_timeout():
-	if not current_piece.move(movements["soft_drop"]):
-		if $LockDelay.is_stopped():
-			lock()
-		
+	current_piece.move(movements["soft_drop"])
+	
+func _on_LockDelay_timeout():
+	if not $Matrix/GridMap.possible_positions(current_piece.get_translations(), movements["soft_drop"]):
+		lock()
+
 func lock():
 	if $Matrix/GridMap.lock(current_piece):
 		var t_spin = current_piece.t_spin()
@@ -151,18 +159,19 @@ func hold():
 		var swap = current_piece
 		current_piece = held_piece
 		held_piece = swap
-		held_piece.emit_trail(false)
+		held_piece.turn_light(false)
+		for mino in held_piece.minoes:
+			mino.get_node("LockingMesh").visible = false
 		held_piece.translation = $Hold/Position3D.translation
 		if current_piece:
 			current_piece.translation = $Matrix/Position3D.translation
-			current_piece.emit_trail(true)
+			current_piece.turn_light(true)
 		else:
 			new_piece()
 		
 func resume():
 	playing = true
 	$DropTimer.start()
-	$LockDelay.start()
 	$Stats.time = OS.get_system_time_secs() - $Stats.time
 	$Stats/Clock.start()
 	$MidiPlayer.resume()
@@ -200,7 +209,6 @@ func pause(gui=null):
 
 func game_over():
 	pause()
-	current_piece.emit_trail(false)
 	$FlashText.print("GAME\nOVER")
 	$ReplayButton.visible = true
 

source/Main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=21 format=2]
 
 [ext_resource path="res://Environment.tres" type="Environment" id=1]
 [ext_resource path="res://Main.gd" type="Script" id=2]
@@ -13,6 +13,7 @@
 [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]
 
 [sub_resource type="SpatialMaterial" id=1]
 
@@ -87,7 +88,7 @@ subdivide_depth = 0
 
 [sub_resource type="DynamicFont" id=4]
 
-size = 30
+size = 50
 use_mipmaps = true
 use_filter = false
 font_data = ExtResource( 9 )
@@ -371,9 +372,9 @@ anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
 margin_left = -250.0
-margin_top = -250.0
+margin_top = -300.0
 margin_right = 250.0
-margin_bottom = 250.0
+margin_bottom = 200.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -381,7 +382,7 @@ mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 script = ExtResource( 8 )
-_sections_unfolded = [ "Material", "Size Flags", "Theme" ]
+_sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme" ]
 
 [node name="Label" type="Label" parent="FlashText" index="0"]
 
@@ -389,9 +390,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 190.0
+margin_top = -100.0
 margin_right = 500.0
-margin_bottom = 690.0
+margin_bottom = 400.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -443,10 +444,10 @@ anchor_left = 1.0
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_left = -215.0
-margin_top = -100.0
-margin_right = -90.0
-margin_bottom = -60.0
+margin_left = -170.0
+margin_top = -90.0
+margin_right = -45.0
+margin_bottom = -50.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -465,8 +466,170 @@ 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="DropTimer" to="." method="_on_DropTimer_timeout"]
 
+[connection signal="timeout" from="LockDelay" to="." method="_on_LockDelay_timeout"]
+
 [connection signal="timeout" from="AutoShiftDelay" to="." method="_on_AutoShiftDelay_timeout"]
 
 [connection signal="timeout" from="AutoShiftTimer" to="." method="_on_AutoShiftTimer_timeout"]
@@ -483,4 +646,6 @@ _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ]
 
 [connection signal="pressed" from="ReplayButton" to="." method="_on_ReplayButton_pressed"]
 
+[connection signal="timeout" from="DropTrail/Delay" to="." method="_on_DropTrailDelay_timeout"]
+
 

source/Tetrominos/Mino/ExplodingMino.tscn

@@ -36,7 +36,7 @@ flag_rotate_y = true
 flag_disable_z = false
 spread = 0.0
 flatness = 0.0
-gravity = Vector3( 0, -30, 5 )
+gravity = Vector3( 0, -40, 0 )
 initial_velocity = 100.0
 initial_velocity_random = 1.0
 angular_velocity = 210.0

source/Tetrominos/Mino/Mino.tscn

@@ -1,9 +1,17 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Tetrominos/Mino/MinoMesh.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Tetrominos/Mino/MinoMesh.tres" type="CubeMesh" id=2]
 
-[sub_resource type="SpatialMaterial" id=1]
+[sub_resource type="CubeMesh" id=1]
+
+custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
+size = Vector3( 0.9, 0.9, 0.9 )
+subdivide_width = 0
+subdivide_height = 0
+subdivide_depth = 0
+
+[sub_resource type="SpatialMaterial" id=2]
 
 render_priority = 0
 flags_transparent = true
@@ -26,13 +34,17 @@ params_point_size = 1.0
 params_billboard_mode = 0
 params_grow = false
 params_use_alpha_scissor = false
-albedo_color = Color( 0.601563, 0.775878, 1, 0.270275 )
-metallic = 0.68
-metallic_specular = 1.0
-metallic_texture_channel = 0
-roughness = 0.0
+albedo_color = Color( 0.601563, 0.775878, 1, 0.259529 )
+metallic = 1.0
+metallic_specular = 0.63
+metallic_texture_channel = 4
+roughness = 0.46
 roughness_texture_channel = 0
-emission_enabled = false
+emission_enabled = true
+emission = Color( 0.755859, 1, 0.914169, 1 )
+emission_energy = 1.0
+emission_operator = 0
+emission_on_uv2 = false
 normal_enabled = false
 rim_enabled = false
 clearcoat_enabled = false
@@ -56,113 +68,7 @@ proximity_fade_distance = 1.0
 distance_fade_enable = false
 _sections_unfolded = [ "Albedo", "Emission", "Metallic", "NormalMap", "Proximity Fade" ]
 
-[sub_resource type="GradientTexture" id=2]
-
-flags = 4
-width = 2048
-
-[sub_resource type="ParticlesMaterial" id=3]
-
-render_priority = 0
-trail_divisor = 1
-emission_shape = 0
-flag_align_y = false
-flag_rotate_y = false
-flag_disable_z = true
-spread = 0.0
-flatness = 0.0
-gravity = Vector3( 0, 0, 0 )
-initial_velocity = 0.0
-initial_velocity_random = 0.0
-angular_velocity = 0.0
-angular_velocity_random = 0.0
-orbit_velocity = 0.0
-orbit_velocity_random = 0.0
-linear_accel = 0.0
-linear_accel_random = 0.0
-radial_accel = 0.0
-radial_accel_random = 0.0
-tangential_accel = 0.0
-tangential_accel_random = 0.0
-damping = 0.0
-damping_random = 0.0
-angle = 0.0
-angle_random = 0.0
-scale = 1.0
-scale_random = 0.0
-color_ramp = SubResource( 2 )
-hue_variation = 0.0
-hue_variation_random = 0.0
-anim_speed = 0.0
-anim_speed_random = 0.0
-anim_offset = 0.0
-anim_offset_random = 0.0
-anim_loop = false
-_sections_unfolded = [ "Color", "Gravity" ]
-
-[sub_resource type="SpatialMaterial" id=4]
-
-render_priority = 0
-flags_transparent = true
-flags_unshaded = false
-flags_vertex_lighting = false
-flags_no_depth_test = false
-flags_use_point_size = false
-flags_world_triplanar = false
-flags_fixed_size = false
-flags_albedo_tex_force_srgb = false
-vertex_color_use_as_albedo = false
-vertex_color_is_srgb = false
-params_diffuse_mode = 0
-params_specular_mode = 0
-params_blend_mode = 1
-params_cull_mode = 0
-params_depth_draw_mode = 0
-params_line_width = 1.0
-params_point_size = 1.0
-params_billboard_mode = 0
-params_grow = false
-params_use_alpha_scissor = false
-albedo_color = Color( 0.601563, 0.775878, 1, 0.0045098 )
-metallic = 0.68
-metallic_specular = 1.0
-metallic_texture_channel = 0
-roughness = 0.0
-roughness_texture_channel = 0
-emission_enabled = false
-normal_enabled = false
-rim_enabled = false
-clearcoat_enabled = false
-anisotropy_enabled = false
-ao_enabled = false
-depth_enabled = false
-subsurf_scatter_enabled = false
-transmission_enabled = false
-refraction_enabled = false
-detail_enabled = false
-uv1_scale = Vector3( 1, 1, 1 )
-uv1_offset = Vector3( 0, 0, 0 )
-uv1_triplanar = false
-uv1_triplanar_sharpness = 1.0
-uv2_scale = Vector3( 1, 1, 1 )
-uv2_offset = Vector3( 0, 0, 0 )
-uv2_triplanar = false
-uv2_triplanar_sharpness = 1.0
-proximity_fade_enable = true
-proximity_fade_distance = 1.0
-distance_fade_enable = false
-_sections_unfolded = [ "Albedo", "Emission", "Proximity Fade" ]
-
-[sub_resource type="CubeMesh" id=5]
-
-material = SubResource( 4 )
-custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
-size = Vector3( 0.9, 0.9, 0.9 )
-subdivide_width = 0
-subdivide_height = 0
-subdivide_depth = 0
-
-[node name="Mino" type="Spatial" index="0"]
+[node name="Mino" type="Spatial"]
 
 transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 )
 _sections_unfolded = [ "Pause", "Transform", "Visibility" ]
@@ -173,36 +79,7 @@ mesh = ExtResource( 2 )
 material/0 = null
 _sections_unfolded = [ "Geometry", "Transform", "material" ]
 
-[node name="Trail" type="Particles" parent="." index="1"]
-
-layers = 1
-material_override = SubResource( 1 )
-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
-emitting = false
-amount = 4
-lifetime = 0.05
-one_shot = false
-preprocess = 0.0
-speed_scale = 1.0
-explosiveness = 0.0
-randomness = 0.0
-fixed_fps = 0
-fract_delta = true
-visibility_aabb = AABB( -0.5, -0.5, -0.5, 1, 1, 1 )
-local_coords = false
-draw_order = 0
-process_material = SubResource( 3 )
-draw_passes = 1
-draw_pass_1 = SubResource( 5 )
-_sections_unfolded = [ "Draw Passes", "Drawing", "Geometry", "LOD", "Process Material", "Time", "Transform" ]
-
-[node name="SpotLight" type="SpotLight" parent="." index="2"]
+[node name="SpotLight" type="SpotLight" parent="." index="1"]
 
 transform = Transform( 1, 0, 0, 0, 0.0174524, 0.999848, 0, -0.999848, 0.0174524, 0, 4, 1 )
 layers = 1
@@ -225,4 +102,21 @@ spot_angle = 5.0
 spot_angle_attenuation = 2.0
 _sections_unfolded = [ "Editor", "Light", "Spot", "Transform" ]
 
+[node name="LockingMesh" type="MeshInstance" parent="." index="2"]
+
+visible = false
+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
+mesh = SubResource( 1 )
+skeleton = NodePath("..")
+material/0 = SubResource( 2 )
+_sections_unfolded = [ "Transform", "material" ]
+
 

source/Tetrominos/Mino/MinoMaterial.tres

@@ -31,7 +31,7 @@ roughness = 0.46
 roughness_texture_channel = 0
 emission_enabled = true
 emission = Color( 0.755859, 1, 0.914169, 1 )
-emission_energy = 0.1
+emission_energy = 0.15
 emission_operator = 0
 emission_on_uv2 = false
 normal_enabled = false

source/Tetrominos/Tetromino.gd

@@ -3,6 +3,7 @@ extends Spatial
 const NB_MINOES = 4
 const CLOCKWISE = -1
 const COUNTERCLOCKWISE = 1
+const DROP_MOVEMENT = Vector3(0, -1, 0)
 
 var super_rotation_system = [
     {
@@ -97,10 +98,14 @@ func get_translations():
 func move(movement):
 	if grid_map.possible_positions(get_translations(), movement):
 		translate(movement)
-		lock_delay.start()
+		if movement == DROP_MOVEMENT:
+			unlocking()
 		rotated_last = false
 		return true
-	return false
+	else:
+		if movement == DROP_MOVEMENT:
+			locking()
+		return false
 	
 func turn(direction):
 	var translations = get_translations()
@@ -117,7 +122,7 @@ func turn(direction):
 			orientation = (orientation - direction) % NB_MINOES
 			set_translations(rotated_translations)
 			translate(movements[i])
-			lock_delay.start()
+			unlocking()
 			rotated_last = true
 			if i == 4:
 				rotation_point_5_used = true
@@ -127,10 +132,16 @@ func turn(direction):
 func t_spin():
 	return ""
 	
-func emit_trail(visible):
-	var trail
+func turn_light(on):
 	for mino in minoes:
-		trail = mino.get_node("Trail")
-		trail.emitting = visible
-		trail.visible = visible
-		mino.get_node("SpotLight").visible = visible
+		mino.get_node("SpotLight").visible = on
+		
+func locking():
+	if lock_delay.is_stopped():
+		lock_delay.start()
+	for mino in minoes:
+		mino.get_node("LockingMesh").visible = true
+
+func unlocking():
+	if not lock_delay.is_stopped():
+		lock_delay.start()

web/TETRIS3000.html

@@ -10,7 +10,7 @@
 			border: 0 none;
 			padding: 0;
 			text-align: center;
-			background-color: #222226;
+			background-color: #000000;
 			font-family: 'Noto Sans', Arial, sans-serif;
 		}
 
@@ -20,7 +20,7 @@
 
 		.godot {
 			color: #e0e0e0;
-			background-color: #3b3943;
+			background-color: #000000;
 			background-image: linear-gradient(to bottom, #403e48, #35333c);
 			border: 1px solid #45434e;
 			box-shadow: 0 0 1px 1px #2f2d35;
@@ -65,6 +65,8 @@
 		 * ================ */
 
 		#container {
+			background-image: url("TETRIS3000.png");
+			background-size: 100% 100%;
 			display: inline-block; /* scale with canvas */
 			vertical-align: top; /* prevent extra height */
 			position: relative; /* root for absolutely positioned overlay */