From 84abafae58cb81fa2a8c2f4e3d41acb0a1d127d0 Mon Sep 17 00:00:00 2001 From: adrienmalin <41926238+adrienmalin@users.noreply.github.com> Date: Tue, 1 Jan 2019 04:06:00 +0100 Subject: [PATCH] Use spotlights instead of ghost. Move minoes in tetromino --- ExplodingLine.tscn | 7 +- ExplodingLine/Breakage1.tres | 3 +- ExplodingLine/Breakage2.tres | 3 +- GridBack.tscn | 3 +- GridMap.tscn | 5 +- GridMap/GridMap.gd | 17 +- GridMap/GridMap.tscn | 20 +-- Mino/MinoLibrary.meshlib | Bin 1609 -> 0 bytes Mino_Library.tscn | 3 +- Tetrominos/GhostPiece.gd | 1 - Tetrominos/GhostPiece.tscn | 156 ------------------ {Mino => Tetrominos/Mino}/BackMaterial.tres | 0 {Mino => Tetrominos/Mino}/Breakage1.tres | 3 +- {Mino => Tetrominos/Mino}/Breakage2.tres | 3 +- {Mino => Tetrominos/Mino}/Mino.tscn | 14 +- Tetrominos/Mino/MinoLibrary.meshlib | Bin 0 -> 1628 bytes {Mino => Tetrominos/Mino}/MinoLibrary.tres | 2 +- {Mino => Tetrominos/Mino}/MinoMaterial.tres | 0 {Mino => Tetrominos/Mino}/MinoMesh.tres | 2 +- {Mino => Tetrominos/Mino}/MinoMesh.tscn | 3 +- {Mino => Tetrominos/Mino}/Mino_Library.tscn | 3 +- .../Mino}/SparkSpatialmaterial.tres | 0 Tetrominos/Mino/SpotLight.tscn | 26 +++ {Mino => Tetrominos/Mino}/TrailMaterial.tres | 0 Tetrominos/TetroI.tscn | 3 +- Tetrominos/TetroJ.tscn | 5 +- Tetrominos/TetroL.tscn | 2 +- Tetrominos/TetroO.tscn | 2 +- Tetrominos/TetroS.tscn | 2 +- Tetrominos/TetroT.tscn | 2 +- Tetrominos/TetroZ.tscn | 2 +- project.godot | 2 +- 32 files changed, 79 insertions(+), 215 deletions(-) delete mode 100644 Mino/MinoLibrary.meshlib delete mode 100644 Tetrominos/GhostPiece.gd delete mode 100644 Tetrominos/GhostPiece.tscn rename {Mino => Tetrominos/Mino}/BackMaterial.tres (100%) rename {Mino => Tetrominos/Mino}/Breakage1.tres (75%) rename {Mino => Tetrominos/Mino}/Breakage2.tres (74%) rename {Mino => Tetrominos/Mino}/Mino.tscn (86%) create mode 100644 Tetrominos/Mino/MinoLibrary.meshlib rename {Mino => Tetrominos/Mino}/MinoLibrary.tres (99%) rename {Mino => Tetrominos/Mino}/MinoMaterial.tres (100%) rename {Mino => Tetrominos/Mino}/MinoMesh.tres (73%) rename {Mino => Tetrominos/Mino}/MinoMesh.tscn (87%) rename {Mino => Tetrominos/Mino}/Mino_Library.tscn (65%) rename {Mino => Tetrominos/Mino}/SparkSpatialmaterial.tres (100%) create mode 100644 Tetrominos/Mino/SpotLight.tscn rename {Mino => Tetrominos/Mino}/TrailMaterial.tres (100%) diff --git a/ExplodingLine.tscn b/ExplodingLine.tscn index 61c790f..42f8fcc 100644 --- a/ExplodingLine.tscn +++ b/ExplodingLine.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://Mino/Breakage1.tres" type="PrismMesh" id=1] -[ext_resource path="res://Mino/Breakage2.tres" type="PrismMesh" id=2] -[ext_resource path="res://Mino/BackMaterial.tres" type="Material" id=3] +[ext_resource path="res://Tetrominos/Mino/Breakage1.tres" type="PrismMesh" id=1] +[ext_resource path="res://Tetrominos/Mino/Breakage2.tres" type="PrismMesh" id=2] +[ext_resource path="res://Tetrominos/Mino/BackMaterial.tres" type="Material" id=3] + [sub_resource type="Gradient" id=1] diff --git a/ExplodingLine/Breakage1.tres b/ExplodingLine/Breakage1.tres index 4914763..d709fa5 100644 --- a/ExplodingLine/Breakage1.tres +++ b/ExplodingLine/Breakage1.tres @@ -1,6 +1,7 @@ [gd_resource type="PrismMesh" load_steps=2 format=2] -[ext_resource path="res://Mino/MinoMaterial.tres" type="Material" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] + [resource] diff --git a/ExplodingLine/Breakage2.tres b/ExplodingLine/Breakage2.tres index e87944a..a3f48a5 100644 --- a/ExplodingLine/Breakage2.tres +++ b/ExplodingLine/Breakage2.tres @@ -1,6 +1,7 @@ [gd_resource type="PrismMesh" load_steps=2 format=2] -[ext_resource path="res://Mino/MinoMaterial.tres" type="Material" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] + [resource] diff --git a/GridBack.tscn b/GridBack.tscn index 3d7188a..5d4ef5f 100644 --- a/GridBack.tscn +++ b/GridBack.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Mino/BackMaterial.tres" type="Material" id=1] +[ext_resource path="res://Tetrominos/Mino/BackMaterial.tres" type="Material" id=1] + [sub_resource type="CubeMesh" id=3] diff --git a/GridMap.tscn b/GridMap.tscn index 897ccc2..b93fdc1 100644 --- a/GridMap.tscn +++ b/GridMap.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://Mino/MinoLibrary.tres" type="MeshLibrary" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoLibrary.tres" type="MeshLibrary" id=1] [ext_resource path="res://GridMap.gd" type="Script" id=2] [ext_resource path="res://GridBack.tscn" type="PackedScene" id=3] -[ext_resource path="res://Mino/BackMaterial.tres" type="Material" id=4] +[ext_resource path="res://Tetrominos/Mino/BackMaterial.tres" type="Material" id=4] [ext_resource path="res://Tetrominos/GhostPiece.tscn" type="PackedScene" id=5] + [sub_resource type="CubeMesh" id=1] material = ExtResource( 4 ) diff --git a/GridMap/GridMap.gd b/GridMap/GridMap.gd index 8e718e5..1613c71 100644 --- a/GridMap/GridMap.gd +++ b/GridMap/GridMap.gd @@ -54,7 +54,6 @@ var score = 0 func _ready(): randomize() - print(NB_LINES) for y in range(NB_LINES): exploding_lines.append(ExplodingLine.instance()) add_child(exploding_lines[y]) @@ -87,7 +86,6 @@ func new_piece(): current_piece = next_piece current_piece.translation = START_POSITION current_piece.emit_trail(true) - update_ghost_piece() autoshift_action = "" next_piece = random_piece() next_piece.translation = NEXT_POSITION @@ -162,27 +160,16 @@ func possible_positions(initial_positions, movement): func move(movement): if current_piece.move(movement): $LockDelay.start() - if movement.x: - update_ghost_piece() return true else: return false func rotate(direction): if current_piece.rotate(direction): - update_ghost_piece() $LockDelay.start() return true else: return false - -func update_ghost_piece(): - var new_positions = current_piece.positions() - var positions - while(new_positions): - positions = new_positions - new_positions = possible_positions(positions, movements["soft_drop"]) - $GhostPiece.apply_positions(positions) func _on_DropTimer_timeout(): move(movements["soft_drop"]) @@ -211,7 +198,6 @@ func line_clear(): set_cell_item(x, y2, 0, get_cell_item(x, y2+1, 0)) lines_cleared += 1 exploding_lines[y].restart() - update_ghost_piece() if lines_cleared or current_piece.t_spin: var s = SCORES[lines_cleared][current_piece.t_spin] score += 100 * s @@ -245,9 +231,8 @@ func hold(): else: held_piece = current_piece new_piece() - update_ghost_piece() - held_piece.translation = HOLD_POSITION held_piece.emit_trail(false) + held_piece.translation = HOLD_POSITION current_piece_held = true func resume(): diff --git a/GridMap/GridMap.tscn b/GridMap/GridMap.tscn index 621d21d..fa287da 100644 --- a/GridMap/GridMap.tscn +++ b/GridMap/GridMap.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=7 format=2] -[ext_resource path="res://Mino/MinoLibrary.tres" type="MeshLibrary" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoLibrary.tres" type="MeshLibrary" id=1] [ext_resource path="res://GridMap/GridMap.gd" type="Script" id=2] [ext_resource path="res://GridMap/GridBack.tscn" type="PackedScene" id=3] [ext_resource path="res://GridMap/BackMaterial.tres" type="Material" id=4] -[ext_resource path="res://Tetrominos/GhostPiece.tscn" type="PackedScene" id=5] -[ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=6] +[ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=5] [sub_resource type="CubeMesh" id=1] @@ -16,7 +15,7 @@ subdivide_width = 0 subdivide_height = 0 subdivide_depth = 0 -[node name="GridMap" type="GridMap" index="0"] +[node name="GridMap" type="GridMap"] theme = ExtResource( 1 ) cell_size = Vector3( 1, 1, 1 ) @@ -28,13 +27,13 @@ cell_scale = 1.0 collision_layer = 1 collision_mask = 1 data = { -"cells": PoolIntArray( 13, 0, 0, 65543, 0, 0 ) +"cells": PoolIntArray( ) } script = ExtResource( 2 ) _sections_unfolded = [ "Cell", "Transform" ] __meta__ = { "_editor_clip_": 1, -"_editor_floor_": Vector3( 0, 1, 0 ) +"_editor_floor_": Vector3( 0, -1, 0 ) } [node name="DropTimer" type="Timer" parent="." index="0"] @@ -80,12 +79,7 @@ mesh = SubResource( 1 ) transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 0.1, 14, 16, -1 ) mesh = SubResource( 1 ) -[node name="GhostPiece" parent="." index="7" instance=ExtResource( 5 )] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 20, 0 ) -_sections_unfolded = [ "Pause", "Transform" ] - -[node name="MidiPlayer" parent="." index="8" instance=ExtResource( 6 )] +[node name="MidiPlayer" parent="." index="7" instance=ExtResource( 5 )] file = "res://midi/Tetris - Song A.mid" volume_db = -24 diff --git a/Mino/MinoLibrary.meshlib b/Mino/MinoLibrary.meshlib deleted file mode 100644 index 46aa3125148210c969668725f6a85d35303a761f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1609 zcmY*a2~ZPP82)#&i<^}|LKYmk^B2_jqP=|^W zDU49iZUlh}RO*3BK@P3;D#o+b+75`eYCR%4Rz;y3#hLbf^Ub_#{{MUb``)~`_=pG; z_$CIZH2^$B08;rO%X2T!VxCbv3wf^Od4(r^Wa8Ttuy?eFnk&r2l-20an`allv9-() zd9-ZkADr;^@Vdbb{j!{S*Ao4mdS8rK6-C5)A^3xB4siWN00clV6sD8Suebtz|#RBi8 zecp==B{fyboyR!(!QM;z6zJ1*x6?~b-Es0gKp0~XMfuhtL0VCf?wZZAI*DBBY%E3{ zd@v)r(`&!G13Q1ha$y`HRMQR#K7l2%)!GqZu0D@K>L~s7+00^3E`e_NjIPUZ&vk2t zpyuj18|pGB?TYgS<^vr+c&fJ$+^M_D<=u$|O>T`_juj>nTQ_R|VWpcA*NA&>bnhx~ zYCt28_xZ0eH^_sP%Ql=A4wQ>->q{G}o*Or=jI?=M7j3 z@bjznfwcYpNtuCDce`Kfs(C*5IOQI$DR1^RsdiVVTH0sq2(GA&4xJ;r`zrIQs8!_i z*MdF6cl|rcUmI}Yz<2?ISd=0SWTk@~utHYP8NxXrXaNa!$qd49b~K@;QIcgz4(%}E zG!P}=2zGAPHJduInr@g#su(=@XCdilSm!h-Y#L5-L;&g56g-nB19Lx24u}vifL0A4 z8%^Rm-lPN|xR@Q~tRvZ!JPFvjp0EW7bE;s9zT1xR;gDu6r4Zr{*@)v!xn3_NISnSi zr4-`hXd{Pf(?t?WW%Bk@{L~+(GgLiZ8WmCRhYsie5&Mw;e%Lz&(*YSrsI8y_5HO)M z9cltnA+!S5Kbp+`%yu}Et2BWA-@iq_I(+V-tVH!yjk>ZjM;EN_8Q3<%}9jpL5 zFrb{WQwTcFzyo8U$NYVp)~xQS%-nLR0jGqhG^ z8ube{5+hb~N|$6Api=~0tJyi7HpY4BMrEu&wNl5J2rYfcFJF&&3%b(YuhB;3* zPG!Qi_j*54Y{gujq03p0K?urujwVYfpis%-eKObNu>p2%_Ca?NT7e83d4M^yHtK^h z5Kz5W#Osj&LNr^HorY^sjIYL+i!cI%J;`w96g??>?k>H0sTA!q=c0U!C+dQPkFnt( zIQE|)69MrJL2%rcQkffl-c@`Wqwvt%P~n)6^hsxxBQ(4;-TOX5IkS2O!>ctO3Z2lI zGczRa8)8)ItW%J0Bc&=e3KDk+QJHGkcjuv4{bNss+ag)k!c8+6&$Qm;v*rhdACw4y zfnoP~!4gJ+%P19K6yiv#ObBXGN;IYpOf(J%>r~7=58jtVow&pd6#o{O&hAz-N^SFk znLXmg^5-@L8Oq?zNj;rxWqxjIR(IE=j`wD(70k7PgI~CeV?~7R$pG7vY;n`j0ZV*R zz02C!mD2c^+47SSC-yZRu@x;FxG0zvQyKIvRUv|$Q0E0z!qG!Lm(RVuP;@V@EO4~f z(Cz*|1_bS0Z3B{`rp$t!hpRl3Rt%mZZ(e8#8O&d7iEqC%BQd7TZ;!nX1R(eA#iu2X zBa6+1lrQI( iKJlz?xxF`oW%PF1Eb1$OGl8xBp+|4;LdVDPpUA(wcs#QJ diff --git a/Mino_Library.tscn b/Mino_Library.tscn index c5c5447..e8bcd08 100644 --- a/Mino_Library.tscn +++ b/Mino_Library.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Mino/MinoMesh.tscn" type="PackedScene" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMesh.tscn" type="PackedScene" id=1] + [node name="Mino_Library" type="Spatial" index="0"] diff --git a/Tetrominos/GhostPiece.gd b/Tetrominos/GhostPiece.gd deleted file mode 100644 index 59d9b06..0000000 --- a/Tetrominos/GhostPiece.gd +++ /dev/null @@ -1 +0,0 @@ -extends "Tetromino.gd" diff --git a/Tetrominos/GhostPiece.tscn b/Tetrominos/GhostPiece.tscn deleted file mode 100644 index efd9b45..0000000 --- a/Tetrominos/GhostPiece.tscn +++ /dev/null @@ -1,156 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://Tetrominos/GhostPiece.gd" type="Script" id=1] - -[sub_resource type="SpatialMaterial" id=1] - -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.409756, 0.451493, 0.615234, 1 ) -metallic = 0.66 -metallic_specular = 0.5 -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", "Metallic", "Proximity Fade" ] - -[sub_resource type="CubeMesh" id=2] - -material = SubResource( 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 - -[node name="GhostPiece" type="Spatial"] - -script = ExtResource( 1 ) - -[node name="Mino0" type="MeshInstance" parent="." index="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 -mesh = SubResource( 2 ) -skeleton = NodePath("..") -material/0 = null - -[node name="OmniLight" type="OmniLight" parent="Mino0" index="0"] - -layers = 1 -light_color = Color( 0.871094, 0.978851, 1, 1 ) -light_energy = 10.0 -light_indirect_energy = 1.0 -light_negative = false -light_specular = 0.5 -light_bake_mode = 1 -light_cull_mask = -1 -shadow_enabled = false -shadow_color = Color( 0, 0, 0, 1 ) -shadow_bias = 0.15 -shadow_contact = 0.0 -shadow_reverse_cull_face = false -editor_only = false -omni_range = 5.0 -omni_attenuation = 1.0 -omni_shadow_mode = 1 -omni_shadow_detail = 1 -_sections_unfolded = [ "Light", "Omni" ] - -[node name="Mino1" type="MeshInstance" parent="." index="1"] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 3, 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 -mesh = SubResource( 2 ) -skeleton = NodePath("..") -material/0 = null - -[node name="Mino2" type="MeshInstance" parent="." index="2"] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 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 -mesh = SubResource( 2 ) -skeleton = NodePath("..") -material/0 = null - -[node name="Mino3" type="MeshInstance" parent="." index="3"] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 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 -mesh = SubResource( 2 ) -skeleton = NodePath("..") -material/0 = null - - diff --git a/Mino/BackMaterial.tres b/Tetrominos/Mino/BackMaterial.tres similarity index 100% rename from Mino/BackMaterial.tres rename to Tetrominos/Mino/BackMaterial.tres diff --git a/Mino/Breakage1.tres b/Tetrominos/Mino/Breakage1.tres similarity index 75% rename from Mino/Breakage1.tres rename to Tetrominos/Mino/Breakage1.tres index 4914763..d709fa5 100644 --- a/Mino/Breakage1.tres +++ b/Tetrominos/Mino/Breakage1.tres @@ -1,6 +1,7 @@ [gd_resource type="PrismMesh" load_steps=2 format=2] -[ext_resource path="res://Mino/MinoMaterial.tres" type="Material" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] + [resource] diff --git a/Mino/Breakage2.tres b/Tetrominos/Mino/Breakage2.tres similarity index 74% rename from Mino/Breakage2.tres rename to Tetrominos/Mino/Breakage2.tres index e87944a..a3f48a5 100644 --- a/Mino/Breakage2.tres +++ b/Tetrominos/Mino/Breakage2.tres @@ -1,6 +1,7 @@ [gd_resource type="PrismMesh" load_steps=2 format=2] -[ext_resource path="res://Mino/MinoMaterial.tres" type="Material" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] + [resource] diff --git a/Mino/Mino.tscn b/Tetrominos/Mino/Mino.tscn similarity index 86% rename from Mino/Mino.tscn rename to Tetrominos/Mino/Mino.tscn index 72f4bd9..4d4aaaf 100644 --- a/Mino/Mino.tscn +++ b/Tetrominos/Mino/Mino.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] -[ext_resource path="res://Mino/MinoMesh.tscn" type="PackedScene" id=1] -[ext_resource path="res://Mino/MinoMesh.tres" type="CubeMesh" id=2] -[ext_resource path="res://Mino/TrailMaterial.tres" type="Material" id=3] +[ext_resource path="res://Tetrominos/Mino/MinoMesh.tscn" type="PackedScene" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMesh.tres" type="CubeMesh" id=2] +[ext_resource path="res://Tetrominos/Mino/TrailMaterial.tres" type="Material" id=3] +[ext_resource path="res://Tetrominos/Mino/SpotLight.tscn" type="PackedScene" id=4] [sub_resource type="SpatialMaterial" id=1] @@ -149,4 +150,9 @@ draw_passes = 1 draw_pass_1 = SubResource( 4 ) _sections_unfolded = [ "Draw Passes", "Drawing", "Geometry", "LOD", "Process Material", "Time", "Transform" ] +[node name="SpotLight" parent="." index="2" instance=ExtResource( 4 )] + +transform = Transform( 1, 0, 0, 0, -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 1 ) +light_energy = 4.0 + diff --git a/Tetrominos/Mino/MinoLibrary.meshlib b/Tetrominos/Mino/MinoLibrary.meshlib new file mode 100644 index 0000000000000000000000000000000000000000..f0a0a210a36fc65f37c74173cdf18fdac5545c80 GIT binary patch literal 1628 zcmYjSX;c$e6uvV_U>FGrWIzJ~LsS^{fKr3F3_$_W#*q*T1q2iXS(K`Et)~MLQ4~eo zaHA7(VN(#ntstAngA0{btF2WGuAufvty&K*bg7X> z6reU2pdSI4&mUPHr98It2;s4TM;ec7Jg9o__X!};OJHZjRKEnB00!Cy`W6L$(==J} z)tdQ5P0P2O`$u(i&W8^Jn|GyZlRFNbj4jMP@NoF@17)61HMdUsIrxGv_`&m28NKYo zX@}Ae|Nh$X-jf%8u|EViBvkLT%$QLc6?o%K{Jrnb+jnh{8^noKy9c&8zC*;C>aX7! zmmO@V)uyG*BmC3D#w1HpJUvs&>-O&8@&{Z-=J@Vf+o5~;{fnJ;_1E6VV|_>09`|eh zJJxM?lX2vog5dnxiy{8*J2uHHS9>@dX-hA^}Y=)-E-@Y-hJ6C#)>kOh?ZkO3O(_8KFBd#x_DsLX0uXm@q zlA8f|knL86E-5vYmU+4U*1^Z<~lYfYU5`dckv;qIINB zf#WyO5H}v^UVk^94S2WCp;%~Oun53F$g(KbJgk5g(KSuj2*vt2D6k_p#&N-RvKG8M zmW}D2ouwvozF-o~R0M4>=DIP7Vv;E2V-8HBL=_Qg*j>OSuP&!sXYZ;#;FRuz4)J#g zKk@haf9zl~m@q&R`+%lMWQ9RUVPTXK0fSKp>TEMWC(%f=0l^_RM+TT!$_}q!bGTg8 z3^0)kNb%8t)eY)0nEe>g0QPb)Knwr7l8vz}&Z!x+8DW_$6c8hSqsrU5&PtWybf2+k ze&jJT`sc#>5&ui16GFoHIDP}oP2ih!0~H;dC}^jMP($W1!UmJ})B2KF8K41z)=YM0 zi%H?^)M75=rm&vo7?Ioco;@7d($4nDNo@_1MBvUnzv|V|WOxr^y=s}ElWe)rz{*LA z0aR~7@$%6*sM)Hg!u@eBN{dE`?}Nw&!2O4vSp1o6eLu5Fv0) zDvE=JST;_N*>VgSIE;~QXJ|Ydvz^IgsZANkDkJr@P;`*bnYs$cEFBy;9!{wY*+h;N z&gRfU`|zF-np7n}GL)#R!SHJv(akfSn^F%v%&VC7x=lki5D9qy4H-}Yk#wNQl?VkP zfmq|A1_bR>TQY`bq1YL)!H}kB&>2{nbbBZ8UeBjnern)dU!owDPWM)ociNHEda&*i zn@LO_c-(ehyTs--czk546?|y|wRv{VtQa$IQ<}H2MKuG}ecI?syT#M@$+T~ly0rzJ zJ5*C|E>3!TRS=@t=UYzf6~juEZA__|e8Bk2rT13~dcuo+_n;uMw(iFRwNJfJa>6J(?SXz6~lN)_9TxC*Y%AAEk zX)A+IAZC%X1jW8*wDRBNt1>N$>(}UAPWQWp9Zn9>VF4R;JDxjL_TN2_!O{wGM7!fQ TfOemT7phZp_oE)+{J-)qz_3Y5 literal 0 HcmV?d00001 diff --git a/Mino/MinoLibrary.tres b/Tetrominos/Mino/MinoLibrary.tres similarity index 99% rename from Mino/MinoLibrary.tres rename to Tetrominos/Mino/MinoLibrary.tres index 8fd0a6a..94f8f00 100644 --- a/Mino/MinoLibrary.tres +++ b/Tetrominos/Mino/MinoLibrary.tres @@ -1,6 +1,6 @@ [gd_resource type="MeshLibrary" load_steps=4 format=2] -[ext_resource path="res://Mino/MinoMesh.tres" type="CubeMesh" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMesh.tres" type="CubeMesh" id=1] [sub_resource type="Image" id=1] diff --git a/Mino/MinoMaterial.tres b/Tetrominos/Mino/MinoMaterial.tres similarity index 100% rename from Mino/MinoMaterial.tres rename to Tetrominos/Mino/MinoMaterial.tres diff --git a/Mino/MinoMesh.tres b/Tetrominos/Mino/MinoMesh.tres similarity index 73% rename from Mino/MinoMesh.tres rename to Tetrominos/Mino/MinoMesh.tres index 27cbf01..d0fe76f 100644 --- a/Mino/MinoMesh.tres +++ b/Tetrominos/Mino/MinoMesh.tres @@ -1,6 +1,6 @@ [gd_resource type="CubeMesh" load_steps=2 format=2] -[ext_resource path="res://Mino/MinoMaterial.tres" type="Material" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] [resource] diff --git a/Mino/MinoMesh.tscn b/Tetrominos/Mino/MinoMesh.tscn similarity index 87% rename from Mino/MinoMesh.tscn rename to Tetrominos/Mino/MinoMesh.tscn index 2892647..7500a1b 100644 --- a/Mino/MinoMesh.tscn +++ b/Tetrominos/Mino/MinoMesh.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Mino/MinoMaterial.tres" type="Material" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1] + [sub_resource type="CubeMesh" id=1] diff --git a/Mino/Mino_Library.tscn b/Tetrominos/Mino/Mino_Library.tscn similarity index 65% rename from Mino/Mino_Library.tscn rename to Tetrominos/Mino/Mino_Library.tscn index c5c5447..e8bcd08 100644 --- a/Mino/Mino_Library.tscn +++ b/Tetrominos/Mino/Mino_Library.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Mino/MinoMesh.tscn" type="PackedScene" id=1] +[ext_resource path="res://Tetrominos/Mino/MinoMesh.tscn" type="PackedScene" id=1] + [node name="Mino_Library" type="Spatial" index="0"] diff --git a/Mino/SparkSpatialmaterial.tres b/Tetrominos/Mino/SparkSpatialmaterial.tres similarity index 100% rename from Mino/SparkSpatialmaterial.tres rename to Tetrominos/Mino/SparkSpatialmaterial.tres diff --git a/Tetrominos/Mino/SpotLight.tscn b/Tetrominos/Mino/SpotLight.tscn new file mode 100644 index 0000000..2fb5c59 --- /dev/null +++ b/Tetrominos/Mino/SpotLight.tscn @@ -0,0 +1,26 @@ +[gd_scene format=2] + +[node name="SpotLight" type="SpotLight" index="0"] + +transform = Transform( 1, 0, 0, 0, 0.374607, 0.927184, 0, -0.927184, 0.374607, 0, 0, 0 ) +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 16.0 +light_indirect_energy = 1.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = false +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = false +editor_only = false +spot_range = 20.0 +spot_attenuation = 0.5 +spot_angle = 5.0 +spot_angle_attenuation = 2.0 +_sections_unfolded = [ "Light", "Spot", "Transform" ] + + diff --git a/Mino/TrailMaterial.tres b/Tetrominos/Mino/TrailMaterial.tres similarity index 100% rename from Mino/TrailMaterial.tres rename to Tetrominos/Mino/TrailMaterial.tres diff --git a/Tetrominos/TetroI.tscn b/Tetrominos/TetroI.tscn index cb9f948..b05c055 100644 --- a/Tetrominos/TetroI.tscn +++ b/Tetrominos/TetroI.tscn @@ -1,8 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Tetrominos/TetroI.gd" type="Script" id=1] -[ext_resource path="res://Mino/Mino.tscn" type="PackedScene" id=2] - +[ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2] [node name="TetroI" type="Spatial" index="0"] diff --git a/Tetrominos/TetroJ.tscn b/Tetrominos/TetroJ.tscn index 00492a9..d3e5c1f 100644 --- a/Tetrominos/TetroJ.tscn +++ b/Tetrominos/TetroJ.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Tetrominos/TetroJ.gd" type="Script" id=1] -[ext_resource path="res://Mino/Mino.tscn" type="PackedScene" id=2] +[ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2] -[node name="TetroJ" type="Spatial"] + +[node name="TetroJ" type="Spatial" index="0"] script = ExtResource( 1 ) diff --git a/Tetrominos/TetroL.tscn b/Tetrominos/TetroL.tscn index e800c3c..ee586cf 100644 --- a/Tetrominos/TetroL.tscn +++ b/Tetrominos/TetroL.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Tetrominos/TetroL.gd" type="Script" id=1] -[ext_resource path="res://Mino/Mino.tscn" type="PackedScene" id=2] +[ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2] [node name="TetroL" type="Spatial" index="0"] diff --git a/Tetrominos/TetroO.tscn b/Tetrominos/TetroO.tscn index 68ecbca..d8f5b60 100644 --- a/Tetrominos/TetroO.tscn +++ b/Tetrominos/TetroO.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Tetrominos/TetroO.gd" type="Script" id=1] -[ext_resource path="res://Mino/Mino.tscn" type="PackedScene" id=2] +[ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2] [node name="TetroO" type="Spatial" index="0"] diff --git a/Tetrominos/TetroS.tscn b/Tetrominos/TetroS.tscn index 6f08a39..ab0f27e 100644 --- a/Tetrominos/TetroS.tscn +++ b/Tetrominos/TetroS.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Tetrominos/TetroS.gd" type="Script" id=1] -[ext_resource path="res://Mino/Mino.tscn" type="PackedScene" id=2] +[ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2] [node name="TetroS" type="Spatial" index="0"] diff --git a/Tetrominos/TetroT.tscn b/Tetrominos/TetroT.tscn index 21ce0c2..232d427 100644 --- a/Tetrominos/TetroT.tscn +++ b/Tetrominos/TetroT.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Tetrominos/TetroT.gd" type="Script" id=1] -[ext_resource path="res://Mino/Mino.tscn" type="PackedScene" id=2] +[ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2] [node name="TetroT" type="Spatial" index="0"] diff --git a/Tetrominos/TetroZ.tscn b/Tetrominos/TetroZ.tscn index db60c4e..b1f0eec 100644 --- a/Tetrominos/TetroZ.tscn +++ b/Tetrominos/TetroZ.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Tetrominos/TetroZ.gd" type="Script" id=1] -[ext_resource path="res://Mino/Mino.tscn" type="PackedScene" id=2] +[ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2] [node name="TetroZ" type="Spatial" index="0"] diff --git a/project.godot b/project.godot index 0c1c97c..89f24fc 100644 --- a/project.godot +++ b/project.godot @@ -10,7 +10,7 @@ config_version=3 [application] -config/name="TETRIS3000" +config/name="TETRIS 3000" run/main_scene="res://WorldEnvironment.tscn" config/icon="res://icon.png"