Merge branch 'main' of https://github.com/gerblesh/sextris

Author: gerblesh

MAIN.tscn

@@ -3,13 +3,6 @@
 [ext_resource type="Script" path="res://blocks.gd" id="2_7cxfx"]
 [ext_resource type="Script" path="res://Models/trigger/trigger_manager.gd" id="6_gro3x"]
 
-[sub_resource type="Environment" id="Environment_mv7jf"]
-background_mode = 2
-ambient_light_source = 2
-ambient_light_color = Color(0.611765, 0.611765, 0.611765, 1)
-tonemap_mode = 2
-glow_enabled = true
-
 [sub_resource type="BoxShape3D" id="BoxShape3D_dseq0"]
 size = Vector3(4, 1, 42)
 
@@ -26,36 +19,28 @@ margin = 0.05
 data = PackedVector3Array(1.15, 40, 20.1, -1.15, 40, 20.1, -1.15, -40, 20.1, 1.15, -40, 20.1, 1.15, 40, 20.1, -1.15, -40, 20.1, -1.15, 40, -20.1, 1.15, 40, -20.1, 1.15, -40, -20.1, -1.15, -40, -20.1, -1.15, 40, -20.1, 1.15, -40, -20.1, 1.15, 40, -20.1, 1.15, 40, 20.1, 1.15, -40, 20.1, 1.15, -40, -20.1, 1.15, 40, -20.1, 1.15, -40, 20.1, -1.15, 40, 20.1, -1.15, 40, -20.1, -1.15, -40, -20.1, -1.15, -40, 20.1, -1.15, 40, 20.1, -1.15, -40, -20.1, -1.15, 40, 20.1, 1.15, 40, 20.1, 1.15, 40, -20.1, -1.15, 40, -20.1, -1.15, 40, 20.1, 1.15, 40, -20.1, 1.15, -40, 20.1, -1.15, -40, 20.1, -1.15, -40, -20.1, 1.15, -40, -20.1, 1.15, -40, 20.1, -1.15, -40, -20.1)
 backface_collision = true
 
-[node name="MAIN" type="Node3D"]
-
-[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-transform = Transform3D(-0.866025, -0.433013, 0.25, 0, 0.5, 0.866025, -0.5, 0.75, -0.433013, 0, 0, 0)
-shadow_enabled = true
-directional_shadow_max_distance = 250.0
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource( "Environment_mv7jf" )
+[sub_resource type="Environment" id="Environment_mv7jf"]
+background_mode = 2
+ambient_light_source = 2
+ambient_light_color = Color(0.611765, 0.611765, 0.611765, 1)
+tonemap_mode = 2
+glow_enabled = true
 
-[node name="Timer" type="Timer" parent="."]
-process_callback = 0
-wait_time = 0.2
-autostart = true
+[node name="MAIN" type="Node3D"]
 
-[node name="Camera3D" type="Camera3D" parent="."]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 15, 14.4, 0)
-fov = 100.0
+[node name="Node3D" type="Node3D" parent="."]
 
-[node name="trigger_manager" type="Node3D" parent="Camera3D"]
-transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 12, -15)
+[node name="trigger_manager" type="Node3D" parent="Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 73.3997, 6.55671e-07)
 script = ExtResource( "6_gro3x" )
 
-[node name="trigger" type="Area3D" parent="Camera3D/trigger_manager"]
+[node name="trigger" type="Area3D" parent="Node3D/trigger_manager"]
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Camera3D/trigger_manager/trigger"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/trigger_manager/trigger"]
 shape = SubResource( "BoxShape3D_dseq0" )
 
-[node name="blocks" type="Node3D" parent="Camera3D"]
-transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 0, 10, -15)
+[node name="blocks" type="Node3D" parent="Node3D"]
+transform = Transform3D(-1, 0, -4.37114e-08, 0, 1, 0, 4.37114e-08, 0, -1, 0, 72.7373, 6.55671e-07)
 script = ExtResource( "2_7cxfx" )
 
 [node name="box" type="MeshInstance3D" parent="."]
@@ -70,4 +55,22 @@ collision_mask = 0
 [node name="@@33914" type="CollisionShape3D" parent="box/StaticBody3D"]
 shape = SubResource( "ConcavePolygonShape3D_fuwlr" )
 
-[connection signal="timeout" from="Timer" to="Camera3D/trigger_manager" method="_on_timer_timeout"]
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(-0.866025, -0.433013, 0.25, 0, 0.5, 0.866025, -0.5, 0.75, -0.433013, 0, 0, 0)
+shadow_enabled = true
+directional_shadow_max_distance = 250.0
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource( "Environment_mv7jf" )
+
+[node name="Timer" type="Timer" parent="."]
+process_callback = 0
+wait_time = 0.2
+autostart = true
+
+[node name="Camera3D" type="Camera3D" parent="."]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 37.2755, 35.5798, -15.583)
+fov = 100.0
+far = 4000.46
+
+[connection signal="timeout" from="Timer" to="Node3D/trigger_manager" method="_on_timer_timeout"]

Models/trigger/trigger_manager.gd

@@ -9,5 +9,4 @@ extends Node3D
 func _on_timer_timeout():
 	var bodies = $trigger.get_overlapping_bodies()
 	if bodies.size() > 1:
-		get_tree().reload_current_scene()
-	
+		get_tree().reload_current_scene() #TODO: game over and stuff

Pieces/L.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=7 format=3 uid="uid://liglphqd6meu"]
 
 [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_l4ig4"]
-bounce = 0.1
-absorbent = true
+friction = 0.05
+bounce = 0.39
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_1xygi"]
 size = Vector3(2, 2, 4)
@@ -42,7 +42,7 @@ shadow_mesh = SubResource( "ArrayMesh_mbmd4" )
 
 [node name="L" type="RigidDynamicBody3D"]
 collision_mask = 3
-mass = 0.5
+mass = 0.23
 physics_material_override = SubResource( "PhysicsMaterial_l4ig4" )
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]

Pieces/line.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=6 format=3 uid="uid://cveqmvb6a070w"]
 
 [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_l4ig4"]
-bounce = 0.1
-absorbent = true
+friction = 0.05
+bounce = 0.39
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vl86y"]
 resource_name = "Material"

blocks.gd

@@ -1,33 +1,44 @@
 extends Node3D
 
-var block_array = [preload("res://Pieces/line.tscn"),preload("res://Pieces/L.tscn"),
-preload("res://Pieces/S.tscn"),preload("res://Pieces/square.tscn"),
-preload("res://Pieces/wither.tscn")]
+var block_array = [
+	preload("res://Pieces/line.tscn"),
+	preload("res://Pieces/L.tscn"),
+	preload("res://Pieces/S.tscn"),
+	preload("res://Pieces/square.tscn"),
+	preload("res://Pieces/wither.tscn")
+]
+
 var current = 0
 var next = 0
-var current_piece
+var current_piece: RigidDynamicBody3D
+var move_speed = 30
 
 func _ready():
 	_next()
 
 func _next():
 	current = next
 	randomize()
-	next = randi()% 5
+	next = randi() % 5
 	current_piece = block_array[current].instantiate()
 	current_piece.position = position
-	current_piece.rotation.y = deg2rad(90)
+	current_piece.mass = 0.2
+	current_piece.contact_monitor = true
+	current_piece.set_max_contacts_reported(1)
 	await get_tree().process_frame
 	get_parent().add_child(current_piece)
+
 func _physics_process(delta):
-	
+	if Input.is_action_just_pressed("release") or current_piece.get_colliding_bodies().size() > 0:
+		return await release_piece()
+
 	var linear_axis = Input.get_action_strength("left") - Input.get_action_strength("right")
 	var rotation_axis = Input.get_action_strength("rotate_right") - Input.get_action_strength("rotate_left")
 	current_piece.linear_velocity.y = -7
-	current_piece.linear_velocity.z = linear_axis * 10
+	current_piece.linear_velocity.z = linear_axis * move_speed
 	current_piece.angular_velocity.x = rotation_axis * -10
-	if Input.is_action_just_pressed("release") or current_piece.position.y < -11:
-		release_piece()
+
+
 func release_piece():
 	set_physics_process(false)
 	current_piece = null

project.godot

@@ -11,17 +11,10 @@ config_version=5
 [application]
 
 config/name="shit_tetris"
+run/main_scene="res://MAIN.tscn"
 config/icon="res://icon.png"
 config/features=PackedStringArray("4.0", "Vulkan Clustered")
 
-[display]
-
-window/size/viewport_width=1920
-window/size/viewport_height=1080
-window/size/fullscreen=true
-window/stretch/mode="viewport"
-window/stretch/shrink=2.0
-
 [input]
 
 left={
@@ -54,4 +47,8 @@ release={
 
 common/physics_ticks_per_second=240
 3d/physics_engine="GodotPhysics3D"
-3d/default_gravity=14.0
+3d/default_gravity=35.0
+
+[rendering]
+
+anti_aliasing/quality/msaa=1