From e2bcb5e38db4644cd19282d86a990acbc1fab7c4 Mon Sep 17 00:00:00 2001 From: osquallo Date: Mon, 30 Jul 2018 15:35:00 +0200 Subject: [PATCH] correction des fenetres qui n'enregistraient pas la bonne taille dans le fichier de config. --- scenes/GUI/GUI.tscn | 7 +- scenes/GUI/HUD/HUD.tscn | 13 +- scenes/GUI/HUD/WindowControl.gd | 7 +- scenes/GUI/MusicControls/MusicControls.tscn | 4 +- scenes/Game/Game.tscn | 278 ++++++++++---------- scenes/Main.tscn | 2 +- 6 files changed, 158 insertions(+), 153 deletions(-) diff --git a/scenes/GUI/GUI.tscn b/scenes/GUI/GUI.tscn index ef7b0b3..31cd7cc 100644 --- a/scenes/GUI/GUI.tscn +++ b/scenes/GUI/GUI.tscn @@ -19,7 +19,7 @@ _sections_unfolded = [ "Font", "Settings" ] default_font = SubResource( 1 ) -[node name="GUI" type="MarginContainer" index="0"] +[node name="GUI" type="MarginContainer"] anchor_left = 0.0 anchor_top = 0.0 @@ -48,7 +48,6 @@ margin_right = 1020.0 margin_bottom = 596.0 mouse_filter = 1 theme = SubResource( 2 ) -_sections_unfolded = [ "Focus", "Margin", "Mouse", "Rect", "Size Flags", "Theme", "Visibility", "custom_constants" ] [node name="Home" parent="." index="1" instance=ExtResource( 4 )] @@ -60,7 +59,7 @@ margin_top = 4.0 margin_right = 1020.0 margin_bottom = 596.0 mouse_filter = 1 -_sections_unfolded = [ "Margin", "Mouse", "Size Flags", "Visibility", "custom_constants" ] +_sections_unfolded = [ "Mouse", "Size Flags", "Visibility", "custom_constants" ] [node name="Settings" parent="." index="2" instance=ExtResource( 5 )] @@ -72,7 +71,7 @@ margin_top = 4.0 margin_right = 1020.0 margin_bottom = 596.0 mouse_filter = 1 -_sections_unfolded = [ "Margin", "Mouse", "Size Flags", "Theme", "custom_constants" ] +_sections_unfolded = [ "Mouse", "Size Flags", "Theme", "custom_constants" ] [node name="Help" parent="." index="3" instance=ExtResource( 6 )] diff --git a/scenes/GUI/HUD/HUD.tscn b/scenes/GUI/HUD/HUD.tscn index 05a8d18..aabe5ef 100644 --- a/scenes/GUI/HUD/HUD.tscn +++ b/scenes/GUI/HUD/HUD.tscn @@ -79,7 +79,7 @@ mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 3 size_flags_vertical = 3 -_sections_unfolded = [ "Anchor", "Focus", "Margin", "Mouse", "Size Flags", "Theme", "Visibility", "custom_styles" ] +_sections_unfolded = [ "Mouse", "Size Flags", "Theme", "Visibility", "custom_styles" ] [node name="Test" type="MarginContainer" parent="Windows" index="0"] @@ -94,7 +94,7 @@ margin_bottom = 143.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false hint_tooltip = "Tooltips test." -mouse_filter = 0 +mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 2 size_flags_vertical = 2 @@ -103,7 +103,7 @@ custom_constants/margin_top = 0 custom_constants/margin_left = 0 custom_constants/margin_bottom = 0 script = ExtResource( 2 ) -_sections_unfolded = [ "Anchor", "Focus", "Hint", "Margin", "Mouse", "Rect", "Size Flags", "Theme", "custom_constants" ] +_sections_unfolded = [ "Mouse", "Size Flags", "Theme", "custom_constants" ] __meta__ = { "_edit_group_": true } @@ -137,6 +137,7 @@ _sections_unfolded = [ "Axis Stretch", "Material", "Patch Margin", "Rect", "Size [node name="VBoxContainer" type="VBoxContainer" parent="Windows/Test" index="1"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 @@ -402,6 +403,7 @@ _sections_unfolded = [ "Mouse", "Size Flags", "Textures" ] [node name="TestBorderless" type="MarginContainer" parent="Windows" index="1"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 @@ -413,7 +415,7 @@ margin_bottom = 335.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false hint_tooltip = "Tooltips test." -mouse_filter = 0 +mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 2 size_flags_vertical = 2 @@ -422,7 +424,7 @@ custom_constants/margin_top = 0 custom_constants/margin_left = 0 custom_constants/margin_bottom = 0 script = ExtResource( 2 ) -_sections_unfolded = [ "Anchor", "Focus", "Hint", "Margin", "Mouse", "Rect", "Size Flags", "Theme", "custom_constants" ] +_sections_unfolded = [ "Mouse", "Size Flags", "Theme", "custom_constants" ] __meta__ = { "_edit_group_": true } @@ -763,6 +765,7 @@ _sections_unfolded = [ "Mouse", "Size Flags", "Textures" ] [node name="Music" type="MarginContainer" parent="Windows" index="2"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 diff --git a/scenes/GUI/HUD/WindowControl.gd b/scenes/GUI/HUD/WindowControl.gd index cefeec7..172f203 100644 --- a/scenes/GUI/HUD/WindowControl.gd +++ b/scenes/GUI/HUD/WindowControl.gd @@ -117,14 +117,17 @@ func load_from_file( config_file ): func save_to_file( config_file ): + + var is_open = $VBoxContainer/Content.visible + config_file.set_value(self.name, "position", self.rect_position) - if not current_rect_size == Vector2( -1, -1 ): + if not is_open: config_file.set_value(self.name, "size", current_rect_size) else: config_file.set_value(self.name, "size", self.rect_size) - if $VBoxContainer/Content.visible: + if is_open: config_file.set_value(self.name, "opened", true) else: config_file.set_value(self.name, "opened", false) diff --git a/scenes/GUI/MusicControls/MusicControls.tscn b/scenes/GUI/MusicControls/MusicControls.tscn index 2140c0e..bcce4d8 100644 --- a/scenes/GUI/MusicControls/MusicControls.tscn +++ b/scenes/GUI/MusicControls/MusicControls.tscn @@ -102,7 +102,7 @@ rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 mouse_filter = 0 -mouse_default_cursor_shape = 0 +mouse_default_cursor_shape = 2 size_flags_horizontal = 3 size_flags_vertical = 1 toggle_mode = false @@ -114,7 +114,7 @@ flat = false align = 0 items = [ ] selected = -1 -_sections_unfolded = [ "Grow Direction", "Margin", "Rect", "Size Flags" ] +_sections_unfolded = [ "Grow Direction", "Margin", "Mouse", "Rect", "Size Flags" ] [node name="Buttons" type="HBoxContainer" parent="." index="3"] diff --git a/scenes/Game/Game.tscn b/scenes/Game/Game.tscn index ad2e549..fe36a53 100644 --- a/scenes/Game/Game.tscn +++ b/scenes/Game/Game.tscn @@ -14,7 +14,7 @@ [ext_resource path="res://scenes/Game/jukebox/jukebox.tscn" type="PackedScene" id=12] [ext_resource path="res://scenes/Game/Terrain/gridmaps/GridMaps.tscn" type="PackedScene" id=13] -[sub_resource type="ProceduralSky" id=28] +[sub_resource type="ProceduralSky" id=1] radiance_size = 4 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) @@ -34,10 +34,10 @@ sun_curve = 0.05 sun_energy = 16.0 texture_size = 2 -[sub_resource type="Environment" id=29] +[sub_resource type="Environment" id=2] background_mode = 2 -background_sky = SubResource( 28 ) +background_sky = SubResource( 1 ) background_sky_custom_fov = 0.0 background_color = Color( 0, 0, 0, 1 ) background_energy = 1.0 @@ -114,7 +114,7 @@ adjustment_contrast = 1.0 adjustment_saturation = 1.0 _sections_unfolded = [ "Background", "SS Reflections", "SSAO" ] -[sub_resource type="GDScript" id=1] +[sub_resource type="GDScript" id=3] script/source = "extends RigidBody @@ -126,7 +126,7 @@ func _on_Box_sleeping_state_changed(): " -[sub_resource type="CubeMesh" id=2] +[sub_resource type="CubeMesh" id=4] custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector3( 2, 2, 2 ) @@ -134,7 +134,7 @@ subdivide_width = 0 subdivide_height = 0 subdivide_depth = 0 -[sub_resource type="SpatialMaterial" id=3] +[sub_resource type="SpatialMaterial" id=5] render_priority = 0 flags_transparent = false @@ -199,78 +199,78 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Ambient Occlusion", "Clearcoat", "Depth", "Detail", "Distance Fade", "Flags", "Metallic", "NormalMap", "Proximity Fade", "Rim", "Roughness", "Subsurf Scatter", "Transmission", "Vertex Color" ] -[sub_resource type="ConvexPolygonShape" id=4] +[sub_resource type="ConvexPolygonShape" id=6] points = PoolVector3Array( -1, 1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, -1, 1, 1, -1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, 1, 1, -1, -1, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, 1, -1, -1 ) -[sub_resource type="SpatialMaterial" id=5] - -render_priority = 0 -flags_transparent = false -flags_unshaded = true -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 = 2 -params_depth_draw_mode = 0 -params_line_width = 1.0 -params_point_size = 1.0 -params_billboard_mode = 3 -params_grow = false -params_use_alpha_scissor = false -particles_anim_h_frames = 1 -particles_anim_v_frames = 1 -particles_anim_loop = 0 -albedo_color = Color( 0.390625, 0.390625, 0.390625, 1 ) -albedo_texture = ExtResource( 10 ) -metallic = 0.0 -metallic_specular = 0.5 -metallic_texture_channel = 0 -roughness = 0.0 -roughness_texture_channel = 0 -emission_enabled = true -emission = Color( 1, 0.886353, 0.617188, 1 ) -emission_energy = 1.0 -emission_operator = 0 -emission_on_uv2 = 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 = false -distance_fade_enable = false -_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] - -[sub_resource type="QuadMesh" id=6] - -material = SubResource( 5 ) -custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) -size = Vector2( 0.4, 0.4 ) - [sub_resource type="SpatialMaterial" id=7] +render_priority = 0 +flags_transparent = false +flags_unshaded = true +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 = 2 +params_depth_draw_mode = 0 +params_line_width = 1.0 +params_point_size = 1.0 +params_billboard_mode = 3 +params_grow = false +params_use_alpha_scissor = false +particles_anim_h_frames = 1 +particles_anim_v_frames = 1 +particles_anim_loop = 0 +albedo_color = Color( 0.390625, 0.390625, 0.390625, 1 ) +albedo_texture = ExtResource( 10 ) +metallic = 0.0 +metallic_specular = 0.5 +metallic_texture_channel = 0 +roughness = 0.0 +roughness_texture_channel = 0 +emission_enabled = true +emission = Color( 1, 0.886353, 0.617188, 1 ) +emission_energy = 1.0 +emission_operator = 0 +emission_on_uv2 = 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 = false +distance_fade_enable = false +_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] + +[sub_resource type="QuadMesh" id=8] + +material = SubResource( 7 ) +custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) +size = Vector2( 0.4, 0.4 ) + +[sub_resource type="SpatialMaterial" id=9] + render_priority = 0 flags_transparent = false flags_unshaded = true @@ -330,37 +330,37 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=8] +[sub_resource type="QuadMesh" id=10] -material = SubResource( 7 ) +material = SubResource( 9 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[sub_resource type="Curve" id=9] +[sub_resource type="Curve" id=11] min_value = -360.0 max_value = 360.0 bake_resolution = 100 _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.959245, 38.6719 ), 89.2918, 89.2918, 0, 0, Vector2( 1, 324.844 ), 17644.8, 0.0, 0, 0 ] -[sub_resource type="CurveTexture" id=10] +[sub_resource type="CurveTexture" id=12] flags = 4 width = 2048 -curve = SubResource( 9 ) +curve = SubResource( 11 ) -[sub_resource type="Gradient" id=11] +[sub_resource type="Gradient" id=13] offsets = PoolRealArray( 0, 0.0788644, 0.514196, 0.851735, 1 ) colors = PoolColorArray( 1, 1, 1, 0.359098, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.911608, 1, 1, 1, 0 ) -[sub_resource type="GradientTexture" id=12] +[sub_resource type="GradientTexture" id=14] flags = 4 -gradient = SubResource( 11 ) +gradient = SubResource( 13 ) width = 2048 -[sub_resource type="ParticlesMaterial" id=13] +[sub_resource type="ParticlesMaterial" id=15] render_priority = 0 trail_divisor = 1 @@ -376,7 +376,7 @@ initial_velocity = 0.0 initial_velocity_random = 0.0 angular_velocity = 35.0 angular_velocity_random = 1.0 -angular_velocity_curve = SubResource( 10 ) +angular_velocity_curve = SubResource( 12 ) linear_accel = 0.01 linear_accel_random = 0.0 radial_accel = 0.0 @@ -389,7 +389,7 @@ angle = 10.0 angle_random = 0.0 scale = 1.0 scale_random = 0.0 -color_ramp = SubResource( 12 ) +color_ramp = SubResource( 14 ) hue_variation = 0.0 hue_variation_random = 0.0 anim_speed = 50.0 @@ -399,7 +399,7 @@ anim_offset_random = 0.0 anim_loop = true _sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Radial Accel", "Resource", "Scale", "Spread", "Tangential Accel", "Trail" ] -[sub_resource type="SpatialMaterial" id=14] +[sub_resource type="SpatialMaterial" id=16] render_priority = 0 flags_transparent = false @@ -459,13 +459,13 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=15] +[sub_resource type="QuadMesh" id=17] -material = SubResource( 14 ) +material = SubResource( 16 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[sub_resource type="SpatialMaterial" id=16] +[sub_resource type="SpatialMaterial" id=18] render_priority = 0 flags_transparent = false @@ -526,13 +526,13 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=17] +[sub_resource type="QuadMesh" id=19] -material = SubResource( 16 ) +material = SubResource( 18 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[sub_resource type="ParticlesMaterial" id=18] +[sub_resource type="ParticlesMaterial" id=20] render_priority = 0 trail_divisor = 1 @@ -548,7 +548,7 @@ initial_velocity = 0.0 initial_velocity_random = 0.0 angular_velocity = 35.0 angular_velocity_random = 1.0 -angular_velocity_curve = SubResource( 10 ) +angular_velocity_curve = SubResource( 12 ) linear_accel = 0.01 linear_accel_random = 0.0 radial_accel = 0.0 @@ -561,7 +561,7 @@ angle = 10.0 angle_random = 0.0 scale = 1.0 scale_random = 0.0 -color_ramp = SubResource( 12 ) +color_ramp = SubResource( 14 ) hue_variation = 0.0 hue_variation_random = 0.0 anim_speed = 50.0 @@ -571,7 +571,7 @@ anim_offset_random = 0.0 anim_loop = true _sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Radial Accel", "Resource", "Scale", "Spread", "Tangential Accel", "Trail" ] -[sub_resource type="SpatialMaterial" id=19] +[sub_resource type="SpatialMaterial" id=21] render_priority = 0 flags_transparent = false @@ -631,13 +631,13 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=20] +[sub_resource type="QuadMesh" id=22] -material = SubResource( 19 ) +material = SubResource( 21 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[sub_resource type="SpatialMaterial" id=21] +[sub_resource type="SpatialMaterial" id=23] render_priority = 0 flags_transparent = false @@ -698,13 +698,13 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=22] +[sub_resource type="QuadMesh" id=24] -material = SubResource( 21 ) +material = SubResource( 23 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[sub_resource type="ParticlesMaterial" id=23] +[sub_resource type="ParticlesMaterial" id=25] render_priority = 0 trail_divisor = 1 @@ -720,7 +720,7 @@ initial_velocity = 0.0 initial_velocity_random = 0.0 angular_velocity = 35.0 angular_velocity_random = 1.0 -angular_velocity_curve = SubResource( 10 ) +angular_velocity_curve = SubResource( 12 ) linear_accel = 0.01 linear_accel_random = 0.0 radial_accel = 0.0 @@ -733,7 +733,7 @@ angle = 10.0 angle_random = 0.0 scale = 1.0 scale_random = 0.0 -color_ramp = SubResource( 12 ) +color_ramp = SubResource( 14 ) hue_variation = 0.0 hue_variation_random = 0.0 anim_speed = 50.0 @@ -743,7 +743,7 @@ anim_offset_random = 0.0 anim_loop = true _sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Radial Accel", "Resource", "Scale", "Spread", "Tangential Accel", "Trail" ] -[sub_resource type="SpatialMaterial" id=24] +[sub_resource type="SpatialMaterial" id=26] render_priority = 0 flags_transparent = false @@ -803,13 +803,13 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=25] +[sub_resource type="QuadMesh" id=27] -material = SubResource( 24 ) +material = SubResource( 26 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[sub_resource type="SpatialMaterial" id=26] +[sub_resource type="SpatialMaterial" id=28] render_priority = 0 flags_transparent = false @@ -870,9 +870,9 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=27] +[sub_resource type="QuadMesh" id=29] -material = SubResource( 26 ) +material = SubResource( 28 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) @@ -888,7 +888,7 @@ _sections_unfolded = [ "Transform", "Visibility" ] [node name="WorldEnvironment" type="WorldEnvironment" parent="World" index="0"] -environment = SubResource( 29 ) +environment = SubResource( 2 ) [node name="OmniLight" type="OmniLight" parent="World" index="1"] @@ -942,7 +942,7 @@ linear_velocity = Vector3( 0, 0, 0 ) linear_damp = -1.0 angular_velocity = Vector3( 0, 0, 0 ) angular_damp = -1.0 -script = SubResource( 1 ) +script = SubResource( 3 ) _sections_unfolded = [ "Collision" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box" index="0"] @@ -957,15 +957,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 4 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 5 ) _sections_unfolded = [ "Geometry", "LOD", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Box" index="1"] transform = Transform( 1, -1.49012e-008, 0, 2.68221e-007, 1, -1.19209e-007, -2.98023e-008, 2.68221e-007, 1, 0.0507725, -0.0524313, 0.0583506 ) -shape = SubResource( 4 ) +shape = SubResource( 6 ) disabled = false _sections_unfolded = [ "Transform" ] @@ -998,7 +998,7 @@ linear_velocity = Vector3( 0, 0, 0 ) linear_damp = -1.0 angular_velocity = Vector3( 0, 0, 0 ) angular_damp = -1.0 -script = SubResource( 1 ) +script = SubResource( 3 ) _sections_unfolded = [ "Collision", "Transform" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box3" index="0"] @@ -1013,15 +1013,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 4 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 5 ) _sections_unfolded = [ "Geometry", "LOD", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Box3" index="1"] transform = Transform( 1, 1.49012e-008, 0, 1.3411e-007, 1, 0, 2.98023e-008, -2.98023e-008, 1, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 6 ) disabled = false _sections_unfolded = [ "Transform" ] @@ -1053,7 +1053,7 @@ linear_velocity = Vector3( 0, 0, 0 ) linear_damp = -1.0 angular_velocity = Vector3( 0, 0, 0 ) angular_damp = -1.0 -script = SubResource( 1 ) +script = SubResource( 3 ) _sections_unfolded = [ "Collision", "Transform" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box5" index="0"] @@ -1068,15 +1068,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 4 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 5 ) _sections_unfolded = [ "Geometry", "LOD", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Box5" index="1"] transform = Transform( 1, 1.49012e-008, 0, 1.3411e-007, 1, 0, 2.98023e-008, -2.98023e-008, 1, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 6 ) disabled = false _sections_unfolded = [ "Transform" ] @@ -1109,7 +1109,7 @@ linear_velocity = Vector3( 0, 0, 0 ) linear_damp = -1.0 angular_velocity = Vector3( 0, 0, 0 ) angular_damp = -1.0 -script = SubResource( 1 ) +script = SubResource( 3 ) _sections_unfolded = [ "Collision", "Transform" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box4" index="0"] @@ -1124,15 +1124,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 4 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 5 ) _sections_unfolded = [ "Geometry", "LOD", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Box4" index="1"] transform = Transform( 1, 1.49012e-008, 0, 1.3411e-007, 1, 0, 2.98023e-008, -2.98023e-008, 1, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 6 ) disabled = false _sections_unfolded = [ "Transform" ] @@ -1180,15 +1180,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 4 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 5 ) _sections_unfolded = [ "Geometry", "LOD", "Visibility", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Box2" index="1"] transform = Transform( 1, 1.49012e-008, 0, 1.3411e-007, 1, 0, 2.98023e-008, -2.98023e-008, 1, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 6 ) disabled = false _sections_unfolded = [ "Transform" ] @@ -1204,35 +1204,35 @@ bounce = 0.75 transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, 0, 1.1836, 0 ) visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 ) draw_passes = 2 -draw_pass_1 = SubResource( 6 ) -draw_pass_2 = SubResource( 8 ) +draw_pass_1 = SubResource( 8 ) +draw_pass_2 = SubResource( 10 ) [node name="fire_02" parent="World/CubeShaderTest" index="3" instance=ExtResource( 9 )] transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, -0.574282, 0.104018, -1.07291 ) visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 ) -process_material = SubResource( 13 ) +process_material = SubResource( 15 ) draw_passes = 2 -draw_pass_1 = SubResource( 15 ) -draw_pass_2 = SubResource( 17 ) +draw_pass_1 = SubResource( 17 ) +draw_pass_2 = SubResource( 19 ) [node name="fire_03" parent="World/CubeShaderTest" index="4" instance=ExtResource( 9 )] transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, 0.573787, 0.104018, 1.07198 ) visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 ) -process_material = SubResource( 18 ) +process_material = SubResource( 20 ) draw_passes = 2 -draw_pass_1 = SubResource( 20 ) -draw_pass_2 = SubResource( 22 ) +draw_pass_1 = SubResource( 22 ) +draw_pass_2 = SubResource( 24 ) [node name="fire_04" parent="World/CubeShaderTest" index="5" instance=ExtResource( 9 )] transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, 0.00931859, -1.29484, 0.0174088 ) visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 ) -process_material = SubResource( 23 ) +process_material = SubResource( 25 ) draw_passes = 2 -draw_pass_1 = SubResource( 25 ) -draw_pass_2 = SubResource( 27 ) +draw_pass_1 = SubResource( 27 ) +draw_pass_2 = SubResource( 29 ) [node name="jukebox" parent="World" index="8" instance=ExtResource( 12 )] diff --git a/scenes/Main.tscn b/scenes/Main.tscn index e198e34..4d17e38 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -14,6 +14,6 @@ _sections_unfolded = [ "Pause" ] [node name="GUI" parent="." index="1" instance=ExtResource( 3 )] pause_mode = 2 -_sections_unfolded = [ "Margin", "Mouse", "Pause", "Rect", "Size Flags", "Theme", "custom_constants" ] +_sections_unfolded = [ "Margin", "Mouse", "Pause", "Size Flags", "Theme", "custom_constants" ]