diff --git a/scenes/GUI/GUI.tscn b/scenes/GUI/GUI.tscn index ef7b0b3..a4c6885 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 diff --git a/scenes/GUI/Settings/Settings.gd b/scenes/GUI/Settings/Settings.gd index 03fdb3e..bb86e8d 100644 --- a/scenes/GUI/Settings/Settings.gd +++ b/scenes/GUI/Settings/Settings.gd @@ -18,16 +18,21 @@ func _on_font_size_bar_value_changed(value): emit_signal( "font_changed", value ) func load_settings(): + var config_file = ConfigFile.new() var err = config_file.load( "user://settings.cfg" ) - if err: + if err == ERR_CANT_OPEN or err == ERR_FILE_NOT_FOUND: + # On suppose que le fichier n'existe pas encore, donc on le crée. + config_file.set_value( "theme", "font_size", 14 ) + config_file.save( "user://settings.cfg" ) + else: print("Error code when loading config file: ", err) if $Menus.get_theme() and config_file.get_value( "theme", "font_size" ): $Menus.get_theme().default_font.size = config_file.get_value( "theme", "font_size" ) - $Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size_bar.value = config_file.get_value( "theme", "font_size" ) - $Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size/font_size_value.text = str( $Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size_bar.value ) - + $Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size_bar.value = config_file.get_value( "theme", "font_size" ) + $Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size/font_size_value.text = str( $Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size_bar.value ) + func _on_ReturnButton_pressed(): diff --git a/scenes/GUI/Settings/Settings.tscn b/scenes/GUI/Settings/Settings.tscn index a995a38..c1b165e 100644 --- a/scenes/GUI/Settings/Settings.tscn +++ b/scenes/GUI/Settings/Settings.tscn @@ -233,12 +233,11 @@ _sections_unfolded = [ "Hint", "Rect", "Size Flags", "Theme", "Visibility", "cus [node name="Display" type="MarginContainer" parent="Menus/TabContainer" index="0"] editor/display_folded = true -visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 54.0 +margin_top = 49.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -260,7 +259,7 @@ anchor_bottom = 0.0 margin_left = 42.0 margin_top = 42.0 margin_right = 982.0 -margin_bottom = 403.0 +margin_bottom = 408.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = true mouse_filter = 0 @@ -300,7 +299,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 940.0 -margin_bottom = 46.0 +margin_bottom = 41.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -316,10 +315,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 378.0 +margin_left = 395.0 margin_top = 4.0 margin_right = 468.0 -margin_bottom = 42.0 +margin_bottom = 37.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -340,7 +339,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 472.0 margin_right = 496.0 -margin_bottom = 46.0 +margin_bottom = 41.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -362,9 +361,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 54.0 +margin_top = 49.0 margin_right = 940.0 -margin_bottom = 100.0 +margin_bottom = 90.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -380,10 +379,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 375.0 +margin_left = 392.0 margin_top = 4.0 margin_right = 468.0 -margin_bottom = 42.0 +margin_bottom = 37.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -404,7 +403,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 472.0 margin_right = 496.0 -margin_bottom = 46.0 +margin_bottom = 41.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -427,9 +426,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 108.0 +margin_top = 98.0 margin_right = 940.0 -margin_bottom = 154.0 +margin_bottom = 139.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -445,10 +444,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 383.0 +margin_left = 400.0 margin_top = 4.0 margin_right = 468.0 -margin_bottom = 42.0 +margin_bottom = 37.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -469,7 +468,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 472.0 margin_right = 496.0 -margin_bottom = 46.0 +margin_bottom = 41.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -491,9 +490,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 162.0 +margin_top = 147.0 margin_right = 940.0 -margin_bottom = 208.0 +margin_bottom = 188.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -509,10 +508,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 336.0 +margin_left = 366.0 margin_top = 4.0 margin_right = 468.0 -margin_bottom = 42.0 +margin_bottom = 37.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -533,7 +532,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 472.0 margin_right = 496.0 -margin_bottom = 46.0 +margin_bottom = 41.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -556,9 +555,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 216.0 +margin_top = 196.0 margin_right = 940.0 -margin_bottom = 264.0 +margin_bottom = 239.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -574,10 +573,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 330.0 +margin_left = 358.0 margin_top = 5.0 margin_right = 468.0 -margin_bottom = 43.0 +margin_bottom = 38.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -597,8 +596,8 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 472.0 -margin_right = 570.0 -margin_bottom = 48.0 +margin_right = 546.0 +margin_bottom = 43.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -625,7 +624,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 54.0 +margin_top = 49.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -752,7 +751,7 @@ anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 margin_left = 1.0 -margin_top = 55.0 +margin_top = 50.0 margin_right = -1.0 margin_bottom = -1.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -976,7 +975,7 @@ anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 margin_left = 1.0 -margin_top = 55.0 +margin_top = 50.0 margin_right = -1.0 margin_bottom = -1.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -1269,6 +1268,7 @@ _sections_unfolded = [ "Size Flags" ] [node name="Test" type="MarginContainer" parent="Menus/TabContainer" index="2"] +visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 @@ -1315,8 +1315,8 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 336.0 -margin_right = 592.0 +margin_left = 342.0 +margin_right = 598.0 margin_bottom = 446.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false diff --git a/scenes/Game/Game.tscn b/scenes/Game/Game.tscn index 18b79a5..ad2e549 100644 --- a/scenes/Game/Game.tscn +++ b/scenes/Game/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=41 format=2] +[gd_scene load_steps=43 format=2] [ext_resource path="res://scenes/Game/Character/Character.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/Game/Brick08/Bricks08_col.jpg" type="Texture" id=2] @@ -14,6 +14,106 @@ [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] + +radiance_size = 4 +sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 ) +sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 ) +sky_curve = 0.25 +sky_energy = 1.0 +ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 ) +ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 ) +ground_curve = 0.01 +ground_energy = 1.0 +sun_color = Color( 1, 1, 1, 1 ) +sun_latitude = 35.0 +sun_longitude = 0.0 +sun_angle_min = 1.0 +sun_angle_max = 100.0 +sun_curve = 0.05 +sun_energy = 16.0 +texture_size = 2 + +[sub_resource type="Environment" id=29] + +background_mode = 2 +background_sky = SubResource( 28 ) +background_sky_custom_fov = 0.0 +background_color = Color( 0, 0, 0, 1 ) +background_energy = 1.0 +background_canvas_max_layer = 0 +ambient_light_color = Color( 0, 0, 0, 1 ) +ambient_light_energy = 1.0 +ambient_light_sky_contribution = 1.0 +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 = 0 +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 = 8.0 +auto_exposure_speed = 0.5 +ss_reflections_enabled = true +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 = true +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 = 0.8 +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 = 1.0 +adjustment_contrast = 1.0 +adjustment_saturation = 1.0 +_sections_unfolded = [ "Background", "SS Reflections", "SSAO" ] + [sub_resource type="GDScript" id=1] script/source = "extends RigidBody @@ -776,7 +876,7 @@ material = SubResource( 26 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[node name="Game" type="Spatial" index="0"] +[node name="Game" type="Spatial"] _sections_unfolded = [ "Transform" ] @@ -786,7 +886,11 @@ _sections_unfolded = [ "Transform" ] _sections_unfolded = [ "Transform", "Visibility" ] -[node name="OmniLight" type="OmniLight" parent="World" index="0"] +[node name="WorldEnvironment" type="WorldEnvironment" parent="World" index="0"] + +environment = SubResource( 29 ) + +[node name="OmniLight" type="OmniLight" parent="World" index="1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.46929, 4.14904, -7.50301 ) layers = 1 @@ -809,7 +913,7 @@ omni_shadow_mode = 1 omni_shadow_detail = 1 _sections_unfolded = [ "Editor", "Light", "Omni", "Shadow", "Visibility" ] -[node name="Box" type="RigidBody" parent="World" index="1"] +[node name="Box" type="RigidBody" parent="World" index="2"] editor/display_folded = true transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, 1.68693, 3.13013, -6.48976 ) @@ -865,7 +969,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box3" type="RigidBody" parent="World" index="2"] +[node name="Box3" type="RigidBody" parent="World" index="3"] editor/display_folded = true transform = Transform( 1, 0, -0.00107956, 0, 1, 0, 0.00107956, 0, 0.999999, 8.55614, 1.10185, -4.11165 ) @@ -899,7 +1003,7 @@ _sections_unfolded = [ "Collision", "Transform" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box3" index="0"] -transform = Transform( 1, 1.49012e-008, 0, 2.68221e-007, 1, -5.96046e-008, -2.98023e-008, 1.19209e-007, 1, 0.0656061, -0.054674, 0.0536032 ) +transform = Transform( 1, 1.49012e-008, 2.32831e-010, 2.68221e-007, 1, -5.96046e-008, -2.98023e-008, 1.19209e-007, 1, 0.0656042, 0.238898, 0.0536022 ) layers = 1 material_override = null cast_shadow = 1 @@ -921,9 +1025,8 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box5" type="RigidBody" parent="World" index="3"] +[node name="Box5" type="RigidBody" parent="World" index="4"] -editor/display_folded = true transform = Transform( 1, 0, -0.00107956, 0, 1, 0, 0.00107956, 0, 0.999999, 6.54047, 1.10185, -4.11382 ) input_ray_pickable = true input_capture_on_drag = false @@ -955,7 +1058,7 @@ _sections_unfolded = [ "Collision", "Transform" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box5" index="0"] -transform = Transform( 1, 1.49012e-008, 0, 2.68221e-007, 1, -5.96046e-008, -2.98023e-008, 1.19209e-007, 1, 0.0656061, -0.054674, 0.0536032 ) +transform = Transform( 1, 1.49012e-008, 2.32831e-010, 2.68221e-007, 1, -5.96046e-008, -2.98023e-008, 1.19209e-007, 1, 0.0656071, 0.238898, 0.0536032 ) layers = 1 material_override = null cast_shadow = 1 @@ -977,7 +1080,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box4" type="RigidBody" parent="World" index="4"] +[node name="Box4" type="RigidBody" parent="World" index="5"] editor/display_folded = true transform = Transform( 1, 0, -0.00107956, 0, 1, 0, 0.00107956, 0, 0.999999, 8.55614, 3.13749, -4.11165 ) @@ -1011,7 +1114,7 @@ _sections_unfolded = [ "Collision", "Transform" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box4" index="0"] -transform = Transform( 1, 1.49012e-008, 0, 2.68221e-007, 1, -5.96046e-008, -2.98023e-008, 1.19209e-007, 1, 0.0656061, -0.0546739, 0.0536032 ) +transform = Transform( 1, 1.49012e-008, 2.32831e-010, 2.68221e-007, 1, -5.96046e-008, -2.98023e-008, 1.19209e-007, 1, 0.0656042, 0.238898, 0.0536022 ) layers = 1 material_override = null cast_shadow = 1 @@ -1033,7 +1136,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box2" type="RigidBody" parent="World" index="5"] +[node name="Box2" type="RigidBody" parent="World" index="6"] editor/display_folded = true transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, -3.00203, 8.74323, -4.47902 ) @@ -1089,7 +1192,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="CubeShaderTest" parent="World" index="6" instance=ExtResource( 8 )] +[node name="CubeShaderTest" parent="World" index="7" instance=ExtResource( 8 )] editor/display_folded = true transform = Transform( -0.471909, 0, -0.881647, 0, 1, 0, 0.881647, 0, -0.471909, 4, 2, 3.11353 ) @@ -1131,11 +1234,11 @@ draw_passes = 2 draw_pass_1 = SubResource( 25 ) draw_pass_2 = SubResource( 27 ) -[node name="jukebox" parent="World" index="7" instance=ExtResource( 12 )] +[node name="jukebox" parent="World" index="8" instance=ExtResource( 12 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.67816, 0, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.67816, 0.386279, 0 ) -[node name="GridMaps" parent="World" index="8" instance=ExtResource( 13 )] +[node name="GridMaps" parent="World" index="9" instance=ExtResource( 13 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.66248, 0 ) diff --git a/scenes/Game/Terrain/gridmaps/GridMaps.tscn b/scenes/Game/Terrain/gridmaps/GridMaps.tscn index c065816..6885530 100644 --- a/scenes/Game/Terrain/gridmaps/GridMaps.tscn +++ b/scenes/Game/Terrain/gridmaps/GridMaps.tscn @@ -18,12 +18,12 @@ cell_scale = 1.0 collision_layer = 1 collision_mask = 1 data = { -"cells": PoolIntArray( ) +"cells": PoolIntArray( 65543, 0, 1048576, 131064, 0, 1048576, 65543, 1, -1609564160, 131064, 1, 1048576, 65543, 2, 1048576, 131064, 2, 1048576, 65543, 3, 537919488, 131064, 3, 1048576, 65543, 4, 1048576, 131064, 4, 537919488, 65543, 5, 1074790400, 131064, 5, 537919488, 65543, 6, 1074790400, 131064, 6, 537919488, 65536, 7, 1048576, 65537, 7, 1048576, 65538, 7, 537919488, 65539, 7, 1048576, 65540, 7, 537919488, 65541, 7, 537919488, 65542, 7, 1048576, 65543, 7, 537919488, 131064, 7, 537919488, 131065, 7, 1048576, 131066, 7, 537919488, 131067, 7, 1048576, 131068, 7, 1048576, 131069, 7, 1048576, 131070, 7, 1048576, 131071, 7, 1048576, 65536, 65528, 1048576, 65537, 65528, 1048576, 65538, 65528, 1074790400, 65539, 65528, 1048576, 65540, 65528, 1048576, 65541, 65528, 537919488, 65542, 65528, 537919488, 65543, 65528, 1048576, 131064, 65528, 1048576, 131065, 65528, 537919488, 131066, 65528, 537919488, 131067, 65528, 1048576, 131068, 65528, 1074790400, 131069, 65528, 1074790400, 131070, 65528, 1048576, 131071, 65528, 1048576, 65543, 65529, 1048576, 131064, 65529, 1048576, 65543, 65530, 1048576, 131064, 65530, 1074790400, 65543, 65531, 1048576, 131064, 65531, 537919488, 65543, 65532, 1048576, 131064, 65532, 537919488, 65543, 65533, -1609564160, 131064, 65533, 537919488, 65543, 65534, -1609564160, 131064, 65534, 537919488, 65543, 65535, -1609564160, 131064, 65535, 537919488 ) } _sections_unfolded = [ "Cell" ] __meta__ = { "_editor_clip_": 0, -"_editor_floor_": Vector3( 0, 0, 0 ) +"_editor_floor_": Vector3( 0, 1, 0 ) } [node name="wall" type="GridMap" parent="." index="1"] @@ -38,12 +38,12 @@ cell_scale = 1.0 collision_layer = 1 collision_mask = 1 data = { -"cells": PoolIntArray( 7, 0, 1441795, 65528, 0, 1048579, 7, 1, 1441795, 65528, 1, 1048579, 7, 2, 1441795, 65528, 2, 1048579, 7, 3, 1441795, 65528, 3, 1048579, 7, 4, 538312707, 65528, 4, 1048579, 7, 5, 538312707, 65528, 5, 537919491, 7, 6, 538312707, 65528, 6, 1048579, 0, 7, 655363, 1, 7, 1074397187, 2, 7, 655363, 3, 7, 1074397187, 4, 7, 655363, 5, 7, 655363, 6, 7, 655363, 7, 7, 655362, 65528, 7, 1048578, 65529, 7, 655363, 65530, 7, 655363, 65531, 7, 537526275, 65532, 7, 655363, 65533, 7, 537526275, 65534, 7, 1074397187, 65535, 7, 537526275, 0, 65528, 1073741827, 1, 65528, 536870915, 2, 65528, 1073741827, 3, 65528, 3, 4, 65528, 3, 5, 65528, 3, 6, 65528, 3, 7, 65528, 1441794, 65528, 65528, 2, 65529, 65528, 3, 65530, 65528, 3, 65531, 65528, 3, 65532, 65528, 3, 65533, 65528, 3, 65534, 65528, 3, 65535, 65528, 3, 7, 65529, 1441795, 65528, 65529, 1048579, 7, 65530, 1441795, 65528, 65530, 1048579, 7, 65531, 1441795, 65528, 65531, 1048579, 7, 65532, 1441795, 65528, 65532, 1048579, 7, 65533, 1441795, 65528, 65533, 1048579, 7, 65534, 1441795, 65528, 65534, 1048579, 7, 65535, 1441795, 65528, 65535, 1048579 ) +"cells": PoolIntArray( 7, 0, 1441795, 65528, 0, 1048579, 65543, 0, 538312707, 131064, 0, 1048579, 7, 1, 1441795, 65528, 1, 1048579, 65543, 1, 1075183619, 131064, 1, 1048579, 7, 2, 538312707, 65528, 2, 1048579, 65543, 2, 1441795, 131064, 2, 1074790403, 7, 3, 1075183619, 65528, 3, 1048579, 65543, 3, 1075183619, 131064, 3, 1048579, 7, 4, 1441795, 65528, 4, 1048579, 65543, 4, 538312707, 131064, 4, 1048579, 7, 5, 538312707, 65528, 5, 1048579, 65543, 5, 1075183619, 131064, 5, -1609564157, 7, 6, 538312707, 65528, 6, 1048579, 65543, 6, 1441795, 131064, 6, 1048579, 0, 7, 655363, 1, 7, 537526275, 2, 7, 655363, 3, 7, 655363, 4, 7, 655363, 5, 7, 655363, 6, 7, 1074397187, 7, 7, 537526274, 65528, 7, 537919490, 65529, 7, 1074397187, 65530, 7, 655363, 65531, 7, 1074397187, 65532, 7, 655363, 65533, 7, 655363, 65534, 7, 655363, 65535, 7, 1074397187, 65536, 7, 655363, 65537, 7, -1609957373, 65538, 7, -1609957373, 65539, 7, 655363, 65540, 7, 655363, 65541, 7, 655363, 65542, 7, -1609957373, 65543, 7, 537526274, 131064, 7, 537919490, 131065, 7, 655363, 131066, 7, 1074397187, 131067, 7, 655363, 131068, 7, 655363, 131069, 7, 655363, 131070, 7, 1074397187, 131071, 7, 655363, 0, 65528, 536870915, 1, 65528, 3, 2, 65528, 3, 3, 65528, 3, 4, 65528, 3, 5, 65528, 3, 6, 65528, 3, 7, 65528, 1441794, 65528, 65528, 2, 65529, 65528, 3, 65530, 65528, 3, 65531, 65528, 3, 65532, 65528, 3, 65533, 65528, 3, 65534, 65528, 3, 65535, 65528, 3, 65536, 65528, 1073741827, 65537, 65528, 3, 65538, 65528, -1610612733, 65539, 65528, 3, 65540, 65528, -1610612733, 65541, 65528, -1610612733, 65542, 65528, 3, 65543, 65528, 1441794, 131064, 65528, -1610612734, 131065, 65528, 3, 131066, 65528, 3, 131067, 65528, 1073741827, 131068, 65528, 3, 131069, 65528, 3, 131070, 65528, -1610612733, 131071, 65528, 3, 7, 65529, 1441795, 65528, 65529, 1048579, 65543, 65529, 1441795, 131064, 65529, 1048579, 7, 65530, 1441795, 65528, 65530, 1048579, 65543, 65530, 1441795, 131064, 65530, -1609564157, 7, 65531, 1441795, 65528, 65531, 537919491, 65543, 65531, 1441795, 131064, 65531, -1609564157, 7, 65532, 1441795, 65528, 65532, 1048579, 65543, 65532, 1441795, 131064, 65532, 1074790403, 7, 65533, 538312707, 65528, 65533, 537919491, 65543, 65533, 538312707, 131064, 65533, 1048579, 7, 65534, 538312707, 65528, 65534, 1048579, 65543, 65534, 1441795, 131064, 65534, 1048579, 7, 65535, 538312707, 65528, 65535, 1048579, 65543, 65535, 538312707, 131064, 65535, 1048579 ) } -_sections_unfolded = [ "Cell", "Transform" ] +_sections_unfolded = [ "Transform" ] __meta__ = { "_editor_clip_": 0, -"_editor_floor_": Vector3( 0, 0, 0 ) +"_editor_floor_": Vector3( 0, 1, 0 ) } [node name="Ground" type="GridMap" parent="." index="2"] @@ -58,7 +58,7 @@ cell_scale = 1.0 collision_layer = 1 collision_mask = 1 data = { -"cells": PoolIntArray( 0, 0, 655360, 1, 0, 1074397184, 2, 0, 655360, 3, 0, 1074397184, 4, 0, 1074397184, 5, 0, 1074397184, 6, 0, -1609957376, 7, 0, -1609957376, 65528, 0, 1074397184, 65529, 0, 655360, 65530, 0, 1074397184, 65531, 0, 1074397184, 65532, 0, 537526272, 65533, 0, 655360, 65534, 0, -1609957376, 65535, 0, 1074397184, 0, 1, 1074397184, 1, 1, 1074397184, 2, 1, -1609957376, 3, 1, 1074397184, 4, 1, -1609957376, 5, 1, 1074397184, 6, 1, 1074397184, 7, 1, 1074397184, 65528, 1, 1074397184, 65529, 1, 655360, 65530, 1, 655360, 65531, 1, 1074397184, 65532, 1, 537526272, 65533, 1, 1074397184, 65534, 1, 1074397184, 65535, 1, 1074397184, 0, 2, 1074397184, 1, 2, 1074397184, 2, 2, 655360, 3, 2, 655360, 4, 2, 655360, 5, 2, 655360, 6, 2, 655360, 7, 2, 655360, 65528, 2, -1609957376, 65529, 2, 655360, 65530, 2, -1609957376, 65531, 2, 1074397184, 65532, 2, -1609957376, 65533, 2, 655360, 65534, 2, 655360, 65535, 2, 655360, 0, 3, 655360, 1, 3, 655360, 2, 3, 1074397184, 3, 3, 655360, 4, 3, 655360, 5, 3, 655360, 6, 3, 537526272, 7, 3, 655360, 65528, 3, 1074397184, 65529, 3, 655360, 65530, 3, -1609957376, 65531, 3, 655360, 65532, 3, 655360, 65533, 3, -1609957376, 65534, 3, 655360, 65535, 3, 655360, 0, 4, 655360, 1, 4, 655360, 2, 4, 655360, 3, 4, 655360, 4, 4, -1609957376, 5, 4, 655360, 6, 4, 655360, 7, 4, 655360, 65528, 4, 655360, 65529, 4, 655360, 65530, 4, 655360, 65531, 4, 655360, 65532, 4, 655360, 65533, 4, 655360, 65534, 4, 655360, 65535, 4, 655360, 0, 5, 655360, 1, 5, -1609957376, 2, 5, 655360, 3, 5, 655360, 4, 5, 655360, 5, 5, 655360, 6, 5, 655360, 7, 5, 655360, 65528, 5, 655360, 65529, 5, 655360, 65530, 5, 655360, 65531, 5, 655360, 65532, 5, 655360, 65533, 5, 655360, 65534, 5, 655360, 65535, 5, 655360, 0, 6, -1609957376, 1, 6, 655360, 2, 6, 655360, 3, 6, 655360, 4, 6, 655360, 5, 6, 655360, 6, 6, 655360, 7, 6, 655360, 65528, 6, 655360, 65529, 6, 655360, 65530, 6, 655360, 65531, 6, 655360, 65532, 6, 1074397184, 65533, 6, 655360, 65534, 6, 655360, 65535, 6, -1609957376, 0, 7, -1609957376, 1, 7, 655360, 2, 7, 655360, 3, 7, -1609957376, 4, 7, 655360, 5, 7, 655360, 6, 7, 655360, 7, 7, -1609957376, 65528, 7, -1609957376, 65529, 7, 655360, 65530, 7, -1609957376, 65531, 7, 655360, 65532, 7, 655360, 65533, 7, 537526272, 65534, 7, -1609957376, 65535, 7, 1074397184, 0, 65528, 655360, 1, 65528, -1609957376, 2, 65528, 655360, 3, 65528, 1074397184, 4, 65528, 655360, 5, 65528, 655360, 6, 65528, -1609957376, 7, 65528, 655360, 65528, 65528, -1609957376, 65529, 65528, 655360, 65530, 65528, -1609957376, 65531, 65528, 655360, 65532, 65528, -1609957376, 65533, 65528, 1074397184, 65534, 65528, 537526272, 65535, 65528, 1074397184, 0, 65529, 655360, 1, 65529, 1074397184, 2, 65529, 1074397184, 3, 65529, 1074397184, 4, 65529, 655360, 5, 65529, 1074397184, 6, 65529, 1074397184, 7, 65529, 655360, 65528, 65529, 655360, 65529, 65529, 655360, 65530, 65529, 655360, 65531, 65529, 655360, 65532, 65529, 655360, 65533, 65529, 1074397184, 65534, 65529, 655360, 65535, 65529, 1074397184, 0, 65530, 537526272, 1, 65530, 655360, 2, 65530, 655360, 3, 65530, -1609957376, 4, 65530, 655360, 5, 65530, 655360, 6, 65530, 655360, 7, 65530, 655360, 65528, 65530, 655360, 65529, 65530, 1074397184, 65530, 65530, 1074397184, 65531, 65530, 655360, 65532, 65530, 655360, 65533, 65530, 655360, 65534, 65530, 655360, 65535, 65530, 655360, 0, 65531, 655360, 1, 65531, 655360, 2, 65531, 1074397184, 3, 65531, 1074397184, 4, 65531, 655360, 5, 65531, 655360, 6, 65531, 1074397184, 7, 65531, 1074397184, 65528, 65531, 655360, 65529, 65531, 655360, 65530, 65531, 1074397184, 65531, 65531, 1074397184, 65532, 65531, 655360, 65533, 65531, 1074397184, 65534, 65531, 655360, 65535, 65531, 1074397184, 0, 65532, 655360, 1, 65532, 655360, 2, 65532, 655360, 3, 65532, 655360, 4, 65532, 655360, 5, 65532, 655360, 6, 65532, 655360, 7, 65532, 655360, 65528, 65532, 655360, 65529, 65532, 655360, 65530, 65532, 655360, 65531, 65532, 655360, 65532, 65532, 537526272, 65533, 65532, 655360, 65534, 65532, 655360, 65535, 65532, 655360, 0, 65533, 655360, 1, 65533, 655360, 2, 65533, 655360, 3, 65533, 655360, 4, 65533, 655360, 5, 65533, 655360, 6, 65533, 655360, 7, 65533, 655360, 65528, 65533, 655360, 65529, 65533, 655360, 65530, 65533, 655360, 65531, 65533, 655360, 65532, 65533, 537526272, 65533, 65533, 655360, 65534, 65533, 655360, 65535, 65533, 655360, 0, 65534, 655360, 1, 65534, 655360, 2, 65534, 655360, 3, 65534, 655360, 4, 65534, 655360, 5, 65534, 655360, 6, 65534, 655360, 7, 65534, 655360, 65528, 65534, 655360, 65529, 65534, 655360, 65530, 65534, 655360, 65531, 65534, 655360, 65532, 65534, 655360, 65533, 65534, 655360, 65534, 65534, 655360, 65535, 65534, 655360, 0, 65535, 655360, 1, 65535, 655360, 2, 65535, 655360, 3, 65535, 655360, 4, 65535, 655360, 5, 65535, 655360, 6, 65535, 655360, 7, 65535, 655360, 65528, 65535, 655360, 65529, 65535, 655360, 65530, 65535, 655360, 65531, 65535, 655360, 65532, 65535, 655360, 65533, 65535, 655360, 65534, 65535, 655360, 65535, 65535, 655360 ) +"cells": PoolIntArray( 0, 0, 655360, 1, 0, 655360, 2, 0, 655360, 3, 0, 655360, 4, 0, 655360, 5, 0, 655360, 6, 0, 655360, 7, 0, 655360, 65528, 0, 655360, 65529, 0, 655360, 65530, 0, 655360, 65531, 0, 655360, 65532, 0, 655360, 65533, 0, 655360, 65534, 0, 655360, 65535, 0, 655360, 0, 1, 655360, 1, 1, 655360, 2, 1, 655360, 3, 1, 655360, 4, 1, 655360, 5, 1, 655360, 6, 1, 655360, 7, 1, 655360, 65528, 1, 655360, 65529, 1, 655360, 65530, 1, 655360, 65531, 1, 655360, 65532, 1, 655360, 65533, 1, 655360, 65534, 1, 655360, 65535, 1, 655360, 0, 2, 655360, 1, 2, 655360, 2, 2, 655360, 3, 2, 655360, 4, 2, 655360, 5, 2, 655360, 6, 2, 655360, 7, 2, 655360, 65528, 2, 655360, 65529, 2, 655360, 65530, 2, 655360, 65531, 2, 655360, 65532, 2, 655360, 65533, 2, 655360, 65534, 2, 655360, 65535, 2, 655360, 0, 3, 655360, 1, 3, 655360, 2, 3, 655360, 3, 3, 655360, 4, 3, 655360, 5, 3, 655360, 6, 3, 655360, 7, 3, 655360, 65528, 3, 655360, 65529, 3, 655360, 65530, 3, 655360, 65531, 3, 655360, 65532, 3, 655360, 65533, 3, 655360, 65534, 3, 655360, 65535, 3, 655360, 0, 4, 655360, 1, 4, 655360, 2, 4, 655360, 3, 4, 655360, 4, 4, 655360, 5, 4, 655360, 6, 4, 655360, 7, 4, 655360, 65528, 4, 655360, 65529, 4, 655360, 65530, 4, 655360, 65531, 4, 655360, 65532, 4, 655360, 65533, 4, 655360, 65534, 4, 655360, 65535, 4, 655360, 0, 5, 655360, 1, 5, 655360, 2, 5, 655360, 3, 5, 655360, 4, 5, 655360, 5, 5, 655360, 6, 5, 655360, 7, 5, 655360, 65528, 5, 655360, 65529, 5, 655360, 65530, 5, 655360, 65531, 5, 655360, 65532, 5, 655360, 65533, 5, 655360, 65534, 5, 655360, 65535, 5, 655360, 0, 6, 655360, 1, 6, 655360, 2, 6, 655360, 3, 6, 655360, 4, 6, 655360, 5, 6, 655360, 6, 6, 655360, 7, 6, 655360, 65528, 6, 655360, 65529, 6, 655360, 65530, 6, 655360, 65531, 6, 655360, 65532, 6, 655360, 65533, 6, 655360, 65534, 6, 655360, 65535, 6, 655360, 0, 7, 655360, 1, 7, 655360, 2, 7, 655360, 3, 7, 655360, 4, 7, 655360, 5, 7, 655360, 6, 7, 655360, 7, 7, 655360, 65528, 7, 655360, 65529, 7, 655360, 65530, 7, 655360, 65531, 7, 655360, 65532, 7, 655360, 65533, 7, 655360, 65534, 7, 655360, 65535, 7, 655360, 0, 65528, 655360, 1, 65528, 655360, 2, 65528, 655360, 3, 65528, 655360, 4, 65528, 655360, 5, 65528, 655360, 6, 65528, 655360, 7, 65528, 655360, 65528, 65528, 655360, 65529, 65528, 655360, 65530, 65528, 655360, 65531, 65528, 655360, 65532, 65528, 655360, 65533, 65528, 655360, 65534, 65528, 655360, 65535, 65528, 655360, 0, 65529, 655360, 1, 65529, 655360, 2, 65529, 655360, 3, 65529, 655360, 4, 65529, 655360, 5, 65529, 655360, 6, 65529, 655360, 7, 65529, 655360, 65528, 65529, 655360, 65529, 65529, 655360, 65530, 65529, 655360, 65531, 65529, 655360, 65532, 65529, 655360, 65533, 65529, 655360, 65534, 65529, 655360, 65535, 65529, 655360, 0, 65530, 655360, 1, 65530, 655360, 2, 65530, 655360, 3, 65530, 655360, 4, 65530, 655360, 5, 65530, 655360, 6, 65530, 655360, 7, 65530, 655360, 65528, 65530, 655360, 65529, 65530, 655360, 65530, 65530, 655360, 65531, 65530, 655360, 65532, 65530, 655360, 65533, 65530, 655360, 65534, 65530, 655360, 65535, 65530, 655360, 0, 65531, 655360, 1, 65531, 655360, 2, 65531, 655360, 3, 65531, 655360, 4, 65531, 655360, 5, 65531, 655360, 6, 65531, 655360, 7, 65531, 655360, 65528, 65531, 655360, 65529, 65531, 655360, 65530, 65531, 655360, 65531, 65531, 655360, 65532, 65531, 655360, 65533, 65531, 655360, 65534, 65531, 655360, 65535, 65531, 655360, 0, 65532, 655360, 1, 65532, 655360, 2, 65532, 655360, 3, 65532, 655360, 4, 65532, 655360, 5, 65532, 655360, 6, 65532, 655360, 7, 65532, 655360, 65528, 65532, 655360, 65529, 65532, 655360, 65530, 65532, 655360, 65531, 65532, 655360, 65532, 65532, 655360, 65533, 65532, 655360, 65534, 65532, 655360, 65535, 65532, 655360, 0, 65533, 655360, 1, 65533, 655360, 2, 65533, 655360, 3, 65533, 655360, 4, 65533, 655360, 5, 65533, 655360, 6, 65533, 655360, 7, 65533, 655360, 65528, 65533, 655360, 65529, 65533, 655360, 65530, 65533, 655360, 65531, 65533, 655360, 65532, 65533, 655360, 65533, 65533, 655360, 65534, 65533, 655360, 65535, 65533, 655360, 0, 65534, 655360, 1, 65534, 655360, 2, 65534, 655360, 3, 65534, 655360, 4, 65534, 655360, 5, 65534, 655360, 6, 65534, 655360, 7, 65534, 655360, 65528, 65534, 655360, 65529, 65534, 537526272, 65530, 65534, 655360, 65531, 65534, 655360, 65532, 65534, 655360, 65533, 65534, 537526272, 65534, 65534, 537526272, 65535, 65534, 537526272, 0, 65535, 655360, 1, 65535, 655360, 2, 65535, 655360, 3, 65535, 655360, 4, 65535, 655360, 5, 65535, 655360, 6, 65535, 655360, 7, 65535, 655360, 65528, 65535, 537526272, 65529, 65535, 537526272, 65530, 65535, 655360, 65531, 65535, 655360, 65532, 65535, 655360, 65533, 65535, 655360, 65534, 65535, 655360, 65535, 65535, 655360 ) } _sections_unfolded = [ "Cell" ] __meta__ = { diff --git a/scenes/Game/Terrain/gridmaps/ceilling.meshlib b/scenes/Game/Terrain/gridmaps/ceilling.meshlib index 01068c2..0732202 100644 Binary files a/scenes/Game/Terrain/gridmaps/ceilling.meshlib and b/scenes/Game/Terrain/gridmaps/ceilling.meshlib differ diff --git a/scenes/Game/Terrain/gridmaps/ground.meshlib b/scenes/Game/Terrain/gridmaps/ground.meshlib index 7a49695..6b40c4e 100644 Binary files a/scenes/Game/Terrain/gridmaps/ground.meshlib and b/scenes/Game/Terrain/gridmaps/ground.meshlib differ diff --git a/scenes/Game/Terrain/gridmaps/wall.meshlib b/scenes/Game/Terrain/gridmaps/wall.meshlib index 62b669e..715016b 100644 Binary files a/scenes/Game/Terrain/gridmaps/wall.meshlib and b/scenes/Game/Terrain/gridmaps/wall.meshlib differ diff --git a/scenes/Game/jukebox/jukebox.tscn b/scenes/Game/jukebox/jukebox.tscn index cf18c30..d5d3163 100644 --- a/scenes/Game/jukebox/jukebox.tscn +++ b/scenes/Game/jukebox/jukebox.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=10 format=2] -[ext_resource path="res://assets/Game/jukebox/jukebox_colorgrid_tex.png" type="Texture" id=1] -[ext_resource path="res://scenes/Game/jukebox/JukeboxPannel.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/Game/jukebox/JukeboxPannel.tscn" type="PackedScene" id=1] [sub_resource type="SpatialMaterial" id=1] @@ -95,7 +94,6 @@ params_billboard_mode = 0 params_grow = false params_use_alpha_scissor = false albedo_color = Color( 1, 1, 1, 1 ) -albedo_texture = ExtResource( 1 ) metallic = 1.0 metallic_specular = 1.0 metallic_texture_channel = 0 @@ -126,7 +124,7 @@ uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false distance_fade_enable = false -_sections_unfolded = [ "Albedo", "Emission", "Flags", "Metallic", "Roughness", "Vertex Color" ] +_sections_unfolded = [ "Albedo", "Emission", "Flags", "Metallic", "Refraction", "Roughness", "Subsurf Scatter", "Vertex Color" ] [sub_resource type="ConvexPolygonShape" id=4] @@ -223,12 +221,11 @@ params_point_size = 1.0 params_billboard_mode = 0 params_grow = false params_use_alpha_scissor = false -albedo_color = Color( 1, 1, 1, 1 ) -albedo_texture = ExtResource( 1 ) -metallic = 0.5 -metallic_specular = 0.5 +albedo_color = Color( 0.333698, 0.285645, 0.609375, 1 ) +metallic = 1.0 +metallic_specular = 1.0 metallic_texture_channel = 0 -roughness = 0.0 +roughness = 0.25 roughness_texture_channel = 0 emission_enabled = false normal_enabled = false @@ -240,7 +237,9 @@ depth_enabled = false subsurf_scatter_enabled = false transmission_enabled = false refraction_enabled = false -detail_enabled = false +detail_enabled = true +detail_blend_mode = 0 +detail_uv_layer = 0 uv1_scale = Vector3( 1, 1, 1 ) uv1_offset = Vector3( 0, 0, 0 ) uv1_triplanar = false @@ -251,7 +250,7 @@ uv2_triplanar = false uv2_triplanar_sharpness = 1.0 proximity_fade_enable = false distance_fade_enable = false -_sections_unfolded = [ "Albedo", "Metallic" ] +_sections_unfolded = [ "Albedo", "Ambient Occlusion", "Detail", "Metallic", "Refraction", "Roughness" ] [sub_resource type="ConvexPolygonShape" id=8] @@ -328,7 +327,7 @@ constant_angular_velocity = Vector3( 0, 0, 0 ) shape = SubResource( 8 ) disabled = false -[node name="JukeboxPannel" parent="." index="2" instance=ExtResource( 2 )] +[node name="JukeboxPannel" parent="." index="2" instance=ExtResource( 1 )] transform = Transform( 0.038434, -0.172056, 0.984337, 0.00671291, 0.985087, 0.171925, -0.999239, 0, 0.0390158, 0.536377, 2.51347, 0 )