diff --git a/source/Environment.tres b/source/Environment.tres new file mode 100644 index 0000000..16da657 --- /dev/null +++ b/source/Environment.tres @@ -0,0 +1,87 @@ +[gd_resource type="Environment" load_steps=2 format=2] + +[sub_resource type="PanoramaSky" id=1] + +radiance_size = 0 + +[resource] + +resource_local_to_scene = true +background_mode = 0 +background_sky = SubResource( 1 ) +background_sky_custom_fov = 0.0 +background_color = Color( 0, 0, 0, 1 ) +background_energy = 0.0 +background_canvas_max_layer = 0 +ambient_light_color = Color( 0.86908, 0.949502, 0.958984, 1 ) +ambient_light_energy = 2.0 +ambient_light_sky_contribution = 0.92 +fog_enabled = false +fog_color = Color( 0.5, 0.6, 0.7, 1 ) +fog_sun_color = Color( 1, 0.9, 0.7, 1 ) +fog_sun_amount = 0.0 +fog_depth_enabled = true +fog_depth_begin = 10.0 +fog_depth_curve = 1.0 +fog_transmit_enabled = false +fog_transmit_curve = 1.0 +fog_height_enabled = false +fog_height_min = 0.0 +fog_height_max = 100.0 +fog_height_curve = 1.0 +tonemap_mode = 3 +tonemap_exposure = 1.0 +tonemap_white = 1.0 +auto_exposure_enabled = false +auto_exposure_scale = 0.4 +auto_exposure_min_luma = 0.05 +auto_exposure_max_luma = 0.26 +auto_exposure_speed = 0.5 +ss_reflections_enabled = false +ss_reflections_max_steps = 64 +ss_reflections_fade_in = 0.15 +ss_reflections_fade_out = 2.0 +ss_reflections_depth_tolerance = 0.2 +ss_reflections_roughness = true +ssao_enabled = false +ssao_radius = 1.0 +ssao_intensity = 1.0 +ssao_radius2 = 0.0 +ssao_intensity2 = 1.0 +ssao_bias = 0.01 +ssao_light_affect = 0.0 +ssao_color = Color( 0, 0, 0, 1 ) +ssao_quality = 0 +ssao_blur = 3 +ssao_edge_sharpness = 4.0 +dof_blur_far_enabled = false +dof_blur_far_distance = 10.0 +dof_blur_far_transition = 5.0 +dof_blur_far_amount = 0.1 +dof_blur_far_quality = 1 +dof_blur_near_enabled = false +dof_blur_near_distance = 2.0 +dof_blur_near_transition = 1.0 +dof_blur_near_amount = 0.1 +dof_blur_near_quality = 1 +glow_enabled = false +glow_levels/1 = false +glow_levels/2 = false +glow_levels/3 = true +glow_levels/4 = false +glow_levels/5 = true +glow_levels/6 = false +glow_levels/7 = false +glow_intensity = 6.17 +glow_strength = 1.0 +glow_bloom = 0.0 +glow_blend_mode = 2 +glow_hdr_threshold = 1.0 +glow_hdr_scale = 2.0 +glow_bicubic_upscale = false +adjustment_enabled = false +adjustment_brightness = 0.27 +adjustment_contrast = 1.0 +adjustment_saturation = 0.34 +_sections_unfolded = [ "Adjustments", "Ambient Light", "Background", "Resource" ] + diff --git a/source/Main.tscn b/source/Main.tscn index 2bd1554..33128ad 100644 --- a/source/Main.tscn +++ b/source/Main.tscn @@ -1,104 +1,20 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=20 format=2] -[ext_resource path="res://Main.gd" type="Script" id=1] -[ext_resource path="res://aperture-vintage-472251-unsplash.jpg" type="Texture" id=2] -[ext_resource path="res://Tetrominos/Mino/MinoLibrary.tres" type="MeshLibrary" id=3] -[ext_resource path="res://GridMap.gd" type="Script" id=4] -[ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=5] -[ext_resource path="res://MidiPlayer.gd" type="Script" id=6] -[ext_resource path="res://FlashText.gd" type="Script" id=7] -[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=8] -[ext_resource path="res://Stats.tscn" type="PackedScene" id=9] -[ext_resource path="res://controls.tscn" type="PackedScene" id=10] -[ext_resource path="res://Start.tscn" type="PackedScene" id=11] -[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=12] +[ext_resource path="res://Environment.tres" type="Environment" id=1] +[ext_resource path="res://Main.gd" type="Script" id=2] +[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] -[sub_resource type="PanoramaSky" id=1] - -radiance_size = 0 - -[sub_resource type="Environment" id=2] - -resource_local_to_scene = true -background_mode = 0 -background_sky = SubResource( 1 ) -background_sky_custom_fov = 0.0 -background_color = Color( 0, 0, 0, 1 ) -background_energy = 0.0 -background_canvas_max_layer = 0 -ambient_light_color = Color( 0.86908, 0.949502, 0.958984, 1 ) -ambient_light_energy = 2.0 -ambient_light_sky_contribution = 0.92 -fog_enabled = false -fog_color = Color( 0.5, 0.6, 0.7, 1 ) -fog_sun_color = Color( 1, 0.9, 0.7, 1 ) -fog_sun_amount = 0.0 -fog_depth_enabled = true -fog_depth_begin = 10.0 -fog_depth_curve = 1.0 -fog_transmit_enabled = false -fog_transmit_curve = 1.0 -fog_height_enabled = false -fog_height_min = 0.0 -fog_height_max = 100.0 -fog_height_curve = 1.0 -tonemap_mode = 3 -tonemap_exposure = 1.0 -tonemap_white = 1.0 -auto_exposure_enabled = false -auto_exposure_scale = 0.4 -auto_exposure_min_luma = 0.05 -auto_exposure_max_luma = 0.26 -auto_exposure_speed = 0.5 -ss_reflections_enabled = false -ss_reflections_max_steps = 64 -ss_reflections_fade_in = 0.15 -ss_reflections_fade_out = 2.0 -ss_reflections_depth_tolerance = 0.2 -ss_reflections_roughness = true -ssao_enabled = false -ssao_radius = 1.0 -ssao_intensity = 1.0 -ssao_radius2 = 0.0 -ssao_intensity2 = 1.0 -ssao_bias = 0.01 -ssao_light_affect = 0.0 -ssao_color = Color( 0, 0, 0, 1 ) -ssao_quality = 0 -ssao_blur = 3 -ssao_edge_sharpness = 4.0 -dof_blur_far_enabled = false -dof_blur_far_distance = 10.0 -dof_blur_far_transition = 5.0 -dof_blur_far_amount = 0.1 -dof_blur_far_quality = 1 -dof_blur_near_enabled = false -dof_blur_near_distance = 2.0 -dof_blur_near_transition = 1.0 -dof_blur_near_amount = 0.1 -dof_blur_near_quality = 1 -glow_enabled = false -glow_levels/1 = false -glow_levels/2 = false -glow_levels/3 = true -glow_levels/4 = false -glow_levels/5 = true -glow_levels/6 = false -glow_levels/7 = false -glow_intensity = 6.17 -glow_strength = 1.0 -glow_bloom = 0.0 -glow_blend_mode = 2 -glow_hdr_threshold = 1.0 -glow_hdr_scale = 2.0 -glow_bicubic_upscale = false -adjustment_enabled = false -adjustment_brightness = 0.27 -adjustment_contrast = 1.0 -adjustment_saturation = 0.34 -_sections_unfolded = [ "Adjustments", "Ambient Light", "Background", "Resource" ] - -[sub_resource type="SpatialMaterial" id=3] +[sub_resource type="SpatialMaterial" id=1] render_priority = 0 flags_transparent = true @@ -151,33 +67,33 @@ proximity_fade_distance = 1.0 distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Metallic", "NormalMap", "Proximity Fade" ] -[sub_resource type="CubeMesh" id=4] +[sub_resource type="CubeMesh" id=2] -material = SubResource( 3 ) +material = SubResource( 1 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector3( 1, 1, 1 ) subdivide_width = 0 subdivide_height = 0 subdivide_depth = 0 -[sub_resource type="CubeMesh" id=5] +[sub_resource type="CubeMesh" id=3] -material = SubResource( 3 ) +material = SubResource( 1 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector3( 1, 1, 1 ) subdivide_width = 0 subdivide_height = 0 subdivide_depth = 0 -[sub_resource type="DynamicFont" id=6] +[sub_resource type="DynamicFont" id=4] size = 30 use_mipmaps = true use_filter = false -font_data = ExtResource( 8 ) +font_data = ExtResource( 9 ) _sections_unfolded = [ "Font", "Settings" ] -[sub_resource type="Animation" id=7] +[sub_resource type="Animation" id=5] resource_name = "Flash" length = 1.0 @@ -220,19 +136,19 @@ tracks/2/keys = { "values": [ Vector2( 0, 110 ), Vector2( 0, -50 ), Vector2( 0, -60 ), Vector2( 0, -100 ) ] } -[sub_resource type="DynamicFont" id=8] +[sub_resource type="DynamicFont" id=6] size = 20 use_mipmaps = false use_filter = false extra_spacing_bottom = 5 -font_data = ExtResource( 12 ) +font_data = ExtResource( 13 ) _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] [node name="Main" type="WorldEnvironment" index="0"] -environment = SubResource( 2 ) -script = ExtResource( 1 ) +environment = ExtResource( 1 ) +script = ExtResource( 2 ) [node name="Background" type="Sprite3D" parent="." index="0"] @@ -258,7 +174,7 @@ transparent = false shaded = false double_sided = false alpha_cut = 0 -texture = ExtResource( 2 ) +texture = ExtResource( 3 ) vframes = 1 hframes = 1 frame = 0 @@ -324,7 +240,7 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 4 ) +mesh = SubResource( 2 ) skeleton = NodePath("..") material/0 = null _sections_unfolded = [ "Transform", "material" ] @@ -332,7 +248,7 @@ _sections_unfolded = [ "Transform", "material" ] [node name="GridMap" type="GridMap" parent="Matrix" index="0"] transform = Transform( 0.1, 0, 0, 0, 0.05, 0, 0, 0, 1, -0.45, -0.475, 0 ) -theme = ExtResource( 3 ) +theme = ExtResource( 4 ) cell_size = Vector3( 1, 1, 1 ) cell_octant_size = 8 cell_center_x = false @@ -344,7 +260,7 @@ collision_mask = 1 data = { "cells": PoolIntArray( ) } -script = ExtResource( 4 ) +script = ExtResource( 5 ) _sections_unfolded = [ "Cell", "Transform" ] __meta__ = { "_editor_clip_": 1, @@ -369,7 +285,7 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 5 ) +mesh = SubResource( 3 ) skeleton = NodePath("..") material/0 = null _sections_unfolded = [ "Transform" ] @@ -392,7 +308,7 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 5 ) +mesh = SubResource( 3 ) skeleton = NodePath("..") material/0 = null _sections_unfolded = [ "Transform" ] @@ -430,10 +346,10 @@ wait_time = 0.03 one_shot = false autostart = false -[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 5 )] +[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 6 )] editor/display_folded = true -script = ExtResource( 6 ) +script = ExtResource( 7 ) _sections_unfolded = [ "Pause" ] file = "res://midi/Korobeiniki.mid" volume_db = -24 @@ -464,7 +380,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -script = ExtResource( 7 ) +script = ExtResource( 8 ) _sections_unfolded = [ "Material", "Size Flags", "Theme" ] [node name="Label" type="Label" parent="FlashText" index="0"] @@ -482,7 +398,7 @@ mouse_filter = 2 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 4 -custom_fonts/font = SubResource( 6 ) +custom_fonts/font = SubResource( 4 ) custom_colors/font_color = Color( 0.445404, 0.710476, 0.820313, 0 ) align = 1 valign = 1 @@ -498,11 +414,11 @@ autoplay = "" playback_process_mode = 1 playback_default_blend_time = 0.0 playback_speed = 1.0 -anims/Flash = SubResource( 7 ) +anims/Flash = SubResource( 5 ) blend_times = [ ] _sections_unfolded = [ "Playback Options" ] -[node name="Stats" parent="." index="12" instance=ExtResource( 9 )] +[node name="Stats" parent="." index="12" instance=ExtResource( 10 )] visible = false anchor_left = 0.0 @@ -514,11 +430,11 @@ margin_top = -250.0 margin_right = 205.0 margin_bottom = -40.0 -[node name="controls_ui" parent="." index="13" instance=ExtResource( 10 )] +[node name="controls_ui" parent="." index="13" instance=ExtResource( 11 )] visible = false -[node name="Start" parent="." index="14" instance=ExtResource( 11 )] +[node name="Start" parent="." index="14" instance=ExtResource( 12 )] [node name="ReplayButton" type="Button" parent="." index="15"] @@ -538,7 +454,7 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -custom_fonts/font = SubResource( 8 ) +custom_fonts/font = SubResource( 6 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) toggle_mode = false enabled_focus_mode = 2 diff --git a/source/project.godot b/source/project.godot index f8bb11d..7068609 100644 --- a/source/project.godot +++ b/source/project.godot @@ -50,4 +50,5 @@ toggle_fullscreen=[ Object(InputEventKey,"resource_local_to_scene":false,"resour [rendering] environment/default_clear_color=Color( 0, 0, 0, 1 ) +environment/default_environment="res://Environment.tres" quality/main_loop_type="" diff --git a/web/TETRIS3000.pck b/web/TETRIS3000.pck index a689dc3..a9e6f77 100644 Binary files a/web/TETRIS3000.pck and b/web/TETRIS3000.pck differ