From 6976ecb5023745af45c735108a75fe37779784ba Mon Sep 17 00:00:00 2001 From: deed Date: Mon, 30 Oct 2023 09:24:26 +0100 Subject: [PATCH] coquille + addons --- .../demos/assets/models/brick.glb.import | 3 - .../demos/assets/models/bush.glb.import | 1 - .../assets/models/dead_branch.glb.import | 3 - .../assets/models/fence_planks.glb.import | 3 - .../demos/assets/models/gobot.glb.import | 3 - .../demos/assets/models/grass.glb.import | 3 - .../demos/assets/models/grass_2.glb.import | 3 - .../demos/assets/models/large_rock.glb.import | 3 - .../demos/assets/models/mushrooms.glb.import | 3 - .../demos/assets/models/pine_tree.glb.import | 3 - .../demos/assets/models/small_rock.glb.import | 3 - .../demos/assets/models/tree.glb.import | 3 - addons/proton_scatter/presets/grass.tscn | 3 +- .../presets/scatter_default.tscn | 4 +- .../compute_shaders/compute_relax.glsl.import | 14 --- .../components/header/parameter_button.tscn | 4 +- .../components/header/parameter_spinbox.tscn | 2 +- .../modifier/components/parameter_bool.tscn | 2 +- .../modifier/components/parameter_string.tscn | 18 ++-- .../ui/modifier_list_popup/category.tscn | 6 +- .../ui/presets/load_preset.tscn | 4 +- .../inspector_plugin/ui/presets/preset.tscn | 10 +- .../ui/presets/save_preset.tscn | 6 +- addons/proton_scatter/tests/unit_testing.tscn | 100 ++++++++---------- addons/zylann.hterrain/hterrain.gd | 2 +- .../zylann.hterrain/hterrain_detail_layer.gd | 2 +- .../models/grass_quad.obj.import | 1 - .../models/grass_quad_x2.obj.import | 1 - .../models/grass_quad_x3.obj.import | 1 - .../models/grass_quad_x4.obj.import | 1 - .../zylann.hterrain/shaders/low_poly.gdshader | 3 + .../shaders/multisplat16.gdshader | 2 + .../shaders/multisplat16_lite.gdshader | 2 + .../zylann.hterrain/shaders/simple4.gdshader | 3 + .../shaders/simple4_lite.gdshader | 2 + .../tools/generate_mesh_dialog.tscn | 2 +- .../tools/generator/generator_dialog.tscn | 4 +- .../tools/importer/importer_dialog.tscn | 2 +- addons/zylann.hterrain/tools/panel.tscn | 2 +- .../tools/texture_editor/texture_editor.tscn | 13 ++- .../tools/texture_editor/texture_list.tscn | 12 +-- .../tools/util/dialog_fitter.tscn | 6 +- .../tools/util/spin_slider.tscn | 8 +- addons/zylann.hterrain/util/util.gd | 13 +++ scenes/interface/page_login.tscn | 1 - 45 files changed, 122 insertions(+), 168 deletions(-) delete mode 100644 addons/proton_scatter/src/modifiers/compute_shaders/compute_relax.glsl.import diff --git a/addons/proton_scatter/demos/assets/models/brick.glb.import b/addons/proton_scatter/demos/assets/models/brick.glb.import index 52fff8b..464ff5a 100644 --- a/addons/proton_scatter/demos/assets/models/brick.glb.import +++ b/addons/proton_scatter/demos/assets/models/brick.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/bush.glb.import b/addons/proton_scatter/demos/assets/models/bush.glb.import index c6fa3ec..508e2f3 100644 --- a/addons/proton_scatter/demos/assets/models/bush.glb.import +++ b/addons/proton_scatter/demos/assets/models/bush.glb.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 diff --git a/addons/proton_scatter/demos/assets/models/dead_branch.glb.import b/addons/proton_scatter/demos/assets/models/dead_branch.glb.import index c7b3f06..c211937 100644 --- a/addons/proton_scatter/demos/assets/models/dead_branch.glb.import +++ b/addons/proton_scatter/demos/assets/models/dead_branch.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/fence_planks.glb.import b/addons/proton_scatter/demos/assets/models/fence_planks.glb.import index 1c0c94c..fd5a26c 100644 --- a/addons/proton_scatter/demos/assets/models/fence_planks.glb.import +++ b/addons/proton_scatter/demos/assets/models/fence_planks.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/gobot.glb.import b/addons/proton_scatter/demos/assets/models/gobot.glb.import index cf648c5..dafd14f 100644 --- a/addons/proton_scatter/demos/assets/models/gobot.glb.import +++ b/addons/proton_scatter/demos/assets/models/gobot.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/grass.glb.import b/addons/proton_scatter/demos/assets/models/grass.glb.import index 7987b88..0854594 100644 --- a/addons/proton_scatter/demos/assets/models/grass.glb.import +++ b/addons/proton_scatter/demos/assets/models/grass.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/grass_2.glb.import b/addons/proton_scatter/demos/assets/models/grass_2.glb.import index d795840..6f0f11c 100644 --- a/addons/proton_scatter/demos/assets/models/grass_2.glb.import +++ b/addons/proton_scatter/demos/assets/models/grass_2.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/large_rock.glb.import b/addons/proton_scatter/demos/assets/models/large_rock.glb.import index 6452621..3141cea 100644 --- a/addons/proton_scatter/demos/assets/models/large_rock.glb.import +++ b/addons/proton_scatter/demos/assets/models/large_rock.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/mushrooms.glb.import b/addons/proton_scatter/demos/assets/models/mushrooms.glb.import index 2649781..40ff849 100644 --- a/addons/proton_scatter/demos/assets/models/mushrooms.glb.import +++ b/addons/proton_scatter/demos/assets/models/mushrooms.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/pine_tree.glb.import b/addons/proton_scatter/demos/assets/models/pine_tree.glb.import index fc8588e..139c722 100644 --- a/addons/proton_scatter/demos/assets/models/pine_tree.glb.import +++ b/addons/proton_scatter/demos/assets/models/pine_tree.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/small_rock.glb.import b/addons/proton_scatter/demos/assets/models/small_rock.glb.import index 08669c5..0af1066 100644 --- a/addons/proton_scatter/demos/assets/models/small_rock.glb.import +++ b/addons/proton_scatter/demos/assets/models/small_rock.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/demos/assets/models/tree.glb.import b/addons/proton_scatter/demos/assets/models/tree.glb.import index b67a423..657e8a5 100644 --- a/addons/proton_scatter/demos/assets/models/tree.glb.import +++ b/addons/proton_scatter/demos/assets/models/tree.glb.import @@ -22,12 +22,9 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false -animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/embedded_image_handling=1 diff --git a/addons/proton_scatter/presets/grass.tscn b/addons/proton_scatter/presets/grass.tscn index 1976a63..1a25665 100644 --- a/addons/proton_scatter/presets/grass.tscn +++ b/addons/proton_scatter/presets/grass.tscn @@ -38,7 +38,6 @@ remove_points_on_miss = false align_with_collision_normal = false max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -47,7 +46,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_mv17r"] script = ExtResource("2_84xri") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_mu1a8"), SubResource("Resource_8361b"), SubResource("Resource_14cyx")]) +stack = Array[Resource]([SubResource("Resource_mu1a8"), SubResource("Resource_8361b"), SubResource("Resource_14cyx")]) [sub_resource type="Resource" id="Resource_gaw40"] script = ExtResource("9_w0igc") diff --git a/addons/proton_scatter/presets/scatter_default.tscn b/addons/proton_scatter/presets/scatter_default.tscn index 5987d29..75654b7 100644 --- a/addons/proton_scatter/presets/scatter_default.tscn +++ b/addons/proton_scatter/presets/scatter_default.tscn @@ -35,7 +35,6 @@ script = ExtResource("5_n2in0") iterations = 3 offset_step = 0.2 consecutive_step_multiplier = 0.75 -use_computeshader = true enabled = true override_global_seed = false custom_seed = 0 @@ -51,7 +50,6 @@ remove_points_on_miss = false align_with_collision_normal = false max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -60,7 +58,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_xqhqc"] script = ExtResource("2_lt5xy") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_jbxru"), SubResource("Resource_0oyil"), SubResource("Resource_ogw66"), SubResource("Resource_awufl")]) +stack = Array[Resource]([SubResource("Resource_jbxru"), SubResource("Resource_0oyil"), SubResource("Resource_ogw66"), SubResource("Resource_awufl")]) [sub_resource type="Resource" id="Resource_g8bsm"] script = ExtResource("8_gnbkw") diff --git a/addons/proton_scatter/src/modifiers/compute_shaders/compute_relax.glsl.import b/addons/proton_scatter/src/modifiers/compute_shaders/compute_relax.glsl.import deleted file mode 100644 index 4ca76dd..0000000 --- a/addons/proton_scatter/src/modifiers/compute_shaders/compute_relax.glsl.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="glsl" -type="RDShaderFile" -uid="uid://cufp1r02aur6w" -path="res://.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.res" - -[deps] - -source_file="res://addons/proton_scatter/src/modifiers/compute_shaders/compute_relax.glsl" -dest_files=["res://.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.res"] - -[params] - diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_button.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_button.tscn index 883d1fa..12dab18 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_button.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_button.tscn @@ -8,7 +8,7 @@ offset_right = 40.0 offset_bottom = 40.0 size_flags_horizontal = 4 size_flags_vertical = 4 -script = ExtResource("1_f6puy") +script = ExtResource( "1_f6puy" ) [node name="Button" type="Button" parent="."] offset_right = 40.0 @@ -16,4 +16,4 @@ offset_bottom = 40.0 focus_mode = 0 toggle_mode = true icon_alignment = 1 -script = ExtResource("2_167vc") +script = ExtResource( "2_167vc" ) diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_spinbox.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_spinbox.tscn index eea563f..76175e5 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_spinbox.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/header/parameter_spinbox.tscn @@ -7,7 +7,7 @@ offset_right = 83.0625 offset_bottom = 31.0 size_flags_horizontal = 4 size_flags_vertical = 4 -script = ExtResource("1_f0oq6") +script = ExtResource( "1_f0oq6" ) [node name="SpinBox" type="SpinBox" parent="."] offset_right = 83.0 diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_bool.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_bool.tscn index afe4a0c..49aa944 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_bool.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_bool.tscn @@ -4,7 +4,7 @@ [node name="ParameterScalar" type="HBoxContainer"] anchor_right = 1.0 -script = ExtResource("1") +script = ExtResource( "1" ) [node name="Label" type="Label" parent="."] offset_top = 2.0 diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_string.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_string.tscn index 78693e7..00fbce5 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_string.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_string.tscn @@ -1,16 +1,16 @@ -[gd_scene load_steps=4 format=3 uid="uid://b3wsnrnd0ur01"] +[gd_scene load_steps=4 format=3] [ext_resource type="Script" path="res://addons/proton_scatter/src/stack/inspector_plugin/ui/modifier/components/parameter_string.gd" id="1"] -[sub_resource type="StyleBoxFlat" id="1"] -bg_color = Color(0, 0, 0, 0.392157) +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 0, 0, 0, 0.392157 ) -[sub_resource type="StyleBoxFlat" id="2"] -bg_color = Color(0.6, 0.6, 0.6, 0) +[sub_resource type="StyleBoxFlat" id=2] +bg_color = Color( 0.6, 0.6, 0.6, 0 ) [node name="ParameterString" type="HBoxContainer"] anchor_right = 1.0 -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -34,7 +34,7 @@ size_flags_horizontal = 3 margin_right = 638.0 margin_bottom = 18.0 mouse_filter = 2 -custom_styles/panel = SubResource("1") +custom_styles/panel = SubResource( 1 ) [node name="MarginContainer" type="MarginContainer" parent="MarginContainer"] margin_right = 638.0 @@ -51,6 +51,6 @@ margin_top = 2.0 margin_right = 634.0 margin_bottom = 16.0 mouse_filter = 1 -custom_styles/focus = SubResource("2") -custom_styles/normal = SubResource("2") +custom_styles/focus = SubResource( 2 ) +custom_styles/normal = SubResource( 2 ) clear_button_enabled = true diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier_list_popup/category.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier_list_popup/category.tscn index d61f15e..690edec 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier_list_popup/category.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/modifier_list_popup/category.tscn @@ -1,13 +1,13 @@ -[gd_scene load_steps=2 format=3 uid="uid://doxbsx8qe8gxv"] +[gd_scene load_steps=2 format=3] [ext_resource type="Script" path="res://addons/proton_scatter/src/stack/inspector_plugin/ui/modifier_list_popup/category.gd" id="1"] [node name="VBoxContainer" type="VBoxContainer"] margin_right = 40.0 margin_bottom = 40.0 -rect_pivot_offset = Vector2(-591.851, -77.5574) +rect_pivot_offset = Vector2( -591.851, -77.5574 ) size_flags_horizontal = 3 -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/load_preset.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/load_preset.tscn index c6c90a7..7016386 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/load_preset.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/load_preset.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://htv4xb0mftp0"] +[gd_scene load_steps=2 format=3] [ext_resource type="Script" path="res://addons/proton_scatter/src/stack/inspector_plugin/ui/presets/load_preset.gd" id="1"] @@ -16,7 +16,7 @@ size_flags_horizontal = 5 size_flags_vertical = 5 window_title = "Load Presets" resizable = true -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/preset.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/preset.tscn index e0d7d2a..967db9a 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/preset.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/preset.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=3 format=3 uid="uid://x28db7xalfsa"] +[gd_scene load_steps=3 format=3] -[ext_resource type="Texture2D" uid="uid://dahwdjl2er75o" path="res://addons/proton_scatter/icons/close.svg" id="1"] +[ext_resource type="Texture" uid="uid://dahwdjl2er75o" path="res://addons/proton_scatter/icons/close.svg" id="1"] [ext_resource type="Script" path="res://addons/proton_scatter/src/stack/inspector_plugin/ui/presets/preset.gd" id="2"] [node name="Preset" type="Button"] @@ -9,9 +9,9 @@ anchor_right = 1.0 anchor_bottom = 0.5 margin_top = -10.0 margin_bottom = 29.0 -rect_min_size = Vector2(0, 40) +rect_min_size = Vector2( 0, 40 ) focus_mode = 0 -script = ExtResource("2") +script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false } @@ -48,7 +48,7 @@ __meta__ = { margin_left = 1240.0 margin_right = 1268.0 margin_bottom = 28.0 -icon = ExtResource("1") +icon = ExtResource( 1 ) [connection signal="pressed" from="." to="." method="_on_pressed"] [connection signal="pressed" from="MarginContainer/HBoxContainer/Delete" to="." method="_on_delete"] diff --git a/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/save_preset.tscn b/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/save_preset.tscn index cb94237..65e7922 100644 --- a/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/save_preset.tscn +++ b/addons/proton_scatter/src/stack/inspector_plugin/ui/presets/save_preset.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://bo5muy4v7klwy"] +[gd_scene load_steps=2 format=3] [ext_resource type="Script" path="res://addons/proton_scatter/src/stack/inspector_plugin/ui/presets/save_preset.gd" id="1"] @@ -16,7 +16,7 @@ size_flags_horizontal = 5 size_flags_vertical = 5 window_title = "Save Preset" resizable = true -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -44,7 +44,7 @@ __meta__ = { } [node name="Warning" type="Label" parent="MarginContainer/VBoxContainer"] -modulate = Color(1, 0.513726, 0.278431, 1) +modulate = Color( 1, 0.513726, 0.278431, 1 ) margin_right = 312.0 margin_bottom = 48.0 text = "Preset name must be a valid file name. diff --git a/addons/proton_scatter/tests/unit_testing.tscn b/addons/proton_scatter/tests/unit_testing.tscn index d2d6a45..bb677ef 100644 --- a/addons/proton_scatter/tests/unit_testing.tscn +++ b/addons/proton_scatter/tests/unit_testing.tscn @@ -50,7 +50,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_8vei7"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_a0khl")]) +stack = Array[Resource]([SubResource("Resource_a0khl")]) [sub_resource type="Resource" id="Resource_g8bsm"] script = ExtResource("6_ma1h0") @@ -67,7 +67,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_wajph"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_mdhrf")]) +stack = Array[Resource]([SubResource("Resource_mdhrf")]) [sub_resource type="Resource" id="Resource_nwd3r"] script = ExtResource("6_ma1h0") @@ -84,7 +84,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_axkfo"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_rityo")]) +stack = Array[Resource]([SubResource("Resource_rityo")]) [sub_resource type="Resource" id="Resource_y8aw6"] script = ExtResource("6_ma1h0") @@ -101,7 +101,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_4lehm"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_gfasn")]) +stack = Array[Resource]([SubResource("Resource_gfasn")]) [sub_resource type="Resource" id="Resource_fr8ni"] script = ExtResource("6_ma1h0") @@ -119,7 +119,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_rfrgg"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_dvb4u")]) +stack = Array[Resource]([SubResource("Resource_dvb4u")]) [sub_resource type="Resource" id="Resource_ve5u2"] script = ExtResource("6_ma1h0") @@ -137,7 +137,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_j4x61"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_f2e4b")]) +stack = Array[Resource]([SubResource("Resource_f2e4b")]) [sub_resource type="Resource" id="Resource_gywyd"] script = ExtResource("6_ma1h0") @@ -156,7 +156,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_syjiv"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_1knwg")]) +stack = Array[Resource]([SubResource("Resource_1knwg")]) [sub_resource type="Resource" id="Resource_eofyd"] script = ExtResource("6_ma1h0") @@ -175,7 +175,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_rrmii"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_f8pmu")]) +stack = Array[Resource]([SubResource("Resource_f8pmu")]) [sub_resource type="Resource" id="Resource_yleso"] script = ExtResource("6_ma1h0") @@ -195,7 +195,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_b1fel"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_hrm74")]) +stack = Array[Resource]([SubResource("Resource_hrm74")]) [sub_resource type="Resource" id="Resource_1vjos"] script = ExtResource("6_ma1h0") @@ -215,7 +215,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_i6uqa"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_18q2p")]) +stack = Array[Resource]([SubResource("Resource_18q2p")]) [sub_resource type="Curve3D" id="Curve3D_5o4l7"] _data = { @@ -252,7 +252,7 @@ reference_frame = 2 [sub_resource type="Resource" id="Resource_uox5l"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_42dco"), SubResource("Resource_877np")]) +stack = Array[Resource]([SubResource("Resource_42dco"), SubResource("Resource_877np")]) [sub_resource type="Resource" id="Resource_1fk1d"] script = ExtResource("6_ma1h0") @@ -304,7 +304,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_f6tel"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_nqb4l"), SubResource("Resource_bw4o3"), SubResource("Resource_3bvlc")]) +stack = Array[Resource]([SubResource("Resource_nqb4l"), SubResource("Resource_bw4o3"), SubResource("Resource_3bvlc")]) [sub_resource type="Resource" id="Resource_02pho"] script = ExtResource("16_mv3jg") @@ -319,7 +319,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_ec8t1"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_02pho")]) +stack = Array[Resource]([SubResource("Resource_02pho")]) [sub_resource type="Resource" id="Resource_qtf2k"] script = ExtResource("16_mv3jg") @@ -334,7 +334,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_mmyxv"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_qtf2k")]) +stack = Array[Resource]([SubResource("Resource_qtf2k")]) [sub_resource type="Resource" id="Resource_73pjb"] script = ExtResource("7_h0gb3") @@ -364,7 +364,6 @@ mask_offset = Vector2(0, 8.56) mask_scale = Vector2(1, 1) pixel_to_unit_ratio = 32.0 remove_below = 0.1 -remove_above = 1.0 scale_transforms = true enabled = true override_global_seed = false @@ -374,7 +373,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_1qaw8"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_73pjb"), SubResource("Resource_blv75"), SubResource("Resource_j0n8o")]) +stack = Array[Resource]([SubResource("Resource_73pjb"), SubResource("Resource_blv75"), SubResource("Resource_j0n8o")]) [sub_resource type="Resource" id="Resource_a5k4o"] script = ExtResource("6_ma1h0") @@ -408,7 +407,6 @@ mask_offset = Vector2(0, 8.56) mask_scale = Vector2(1, 1) pixel_to_unit_ratio = 32.0 remove_below = 0.4 -remove_above = 1.0 scale_transforms = false enabled = true override_global_seed = false @@ -418,7 +416,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_lgfwt"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_t8qwo"), SubResource("Resource_bbajx"), SubResource("Resource_mysoe")]) +stack = Array[Resource]([SubResource("Resource_t8qwo"), SubResource("Resource_bbajx"), SubResource("Resource_mysoe")]) [sub_resource type="Resource" id="Resource_y5kok"] script = ExtResource("6_ma1h0") @@ -456,7 +454,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_1jtvd"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_rvnu4"), SubResource("Resource_1pc4a"), SubResource("Resource_iv1l5")]) +stack = Array[Resource]([SubResource("Resource_rvnu4"), SubResource("Resource_1pc4a"), SubResource("Resource_iv1l5")]) [sub_resource type="Resource" id="Resource_cf36a"] script = ExtResource("6_ma1h0") @@ -494,7 +492,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_osg78"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_lqllm"), SubResource("Resource_utrbb"), SubResource("Resource_lg2ny")]) +stack = Array[Resource]([SubResource("Resource_lqllm"), SubResource("Resource_utrbb"), SubResource("Resource_lg2ny")]) [sub_resource type="Resource" id="Resource_m5v8r"] script = ExtResource("6_ma1h0") @@ -532,7 +530,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_ggowg"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_lnjcs"), SubResource("Resource_7rgdv"), SubResource("Resource_2yqfv")]) +stack = Array[Resource]([SubResource("Resource_lnjcs"), SubResource("Resource_7rgdv"), SubResource("Resource_2yqfv")]) [sub_resource type="Resource" id="Resource_b0fis"] script = ExtResource("6_ma1h0") @@ -570,7 +568,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_4d70d"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_kr5cl"), SubResource("Resource_xhov2"), SubResource("Resource_dpvhh")]) +stack = Array[Resource]([SubResource("Resource_kr5cl"), SubResource("Resource_xhov2"), SubResource("Resource_dpvhh")]) [sub_resource type="Resource" id="Resource_kebi0"] script = ExtResource("6_ma1h0") @@ -608,7 +606,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_j0g8b"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_tj3qn"), SubResource("Resource_culo7"), SubResource("Resource_dcn1b")]) +stack = Array[Resource]([SubResource("Resource_tj3qn"), SubResource("Resource_culo7"), SubResource("Resource_dcn1b")]) [sub_resource type="Resource" id="Resource_f2qcq"] script = ExtResource("6_ma1h0") @@ -646,7 +644,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_ojwb1"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_5e2iu"), SubResource("Resource_5x3va"), SubResource("Resource_wxvdn")]) +stack = Array[Resource]([SubResource("Resource_5e2iu"), SubResource("Resource_5x3va"), SubResource("Resource_wxvdn")]) [sub_resource type="Resource" id="Resource_hp05y"] script = ExtResource("6_ma1h0") @@ -684,7 +682,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_ndd04"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_eobi8"), SubResource("Resource_drprl"), SubResource("Resource_8bivh")]) +stack = Array[Resource]([SubResource("Resource_eobi8"), SubResource("Resource_drprl"), SubResource("Resource_8bivh")]) [sub_resource type="Resource" id="Resource_n0ty0"] script = ExtResource("6_ma1h0") @@ -708,7 +706,6 @@ remove_points_on_miss = false align_with_collision_normal = true max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -717,7 +714,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_tml5i"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_ufee4"), SubResource("Resource_ghxnv")]) +stack = Array[Resource]([SubResource("Resource_ufee4"), SubResource("Resource_ghxnv")]) [sub_resource type="Resource" id="Resource_vq7kx"] script = ExtResource("6_ma1h0") @@ -752,7 +749,6 @@ remove_points_on_miss = false align_with_collision_normal = false max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -761,7 +757,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_5wv3k"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_74wa8"), SubResource("Resource_t2kop"), SubResource("Resource_gn4jn")]) +stack = Array[Resource]([SubResource("Resource_74wa8"), SubResource("Resource_t2kop"), SubResource("Resource_gn4jn")]) [sub_resource type="Resource" id="Resource_nwkwt"] script = ExtResource("6_ma1h0") @@ -796,7 +792,6 @@ remove_points_on_miss = true align_with_collision_normal = false max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -805,7 +800,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_wcnr2"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_itdfg"), SubResource("Resource_3mnoc"), SubResource("Resource_sud0j")]) +stack = Array[Resource]([SubResource("Resource_itdfg"), SubResource("Resource_3mnoc"), SubResource("Resource_sud0j")]) [sub_resource type="Resource" id="Resource_h12gh"] script = ExtResource("6_ma1h0") @@ -829,7 +824,6 @@ remove_points_on_miss = false align_with_collision_normal = false max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -838,7 +832,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_p6kkt"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_sc6yw"), SubResource("Resource_yfh80")]) +stack = Array[Resource]([SubResource("Resource_sc6yw"), SubResource("Resource_yfh80")]) [sub_resource type="Resource" id="Resource_5ddch"] script = ExtResource("6_ma1h0") @@ -873,7 +867,6 @@ remove_points_on_miss = false align_with_collision_normal = false max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -882,7 +875,7 @@ reference_frame = 2 [sub_resource type="Resource" id="Resource_66aqb"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_mn02k"), SubResource("Resource_up1et"), SubResource("Resource_eeqjr")]) +stack = Array[Resource]([SubResource("Resource_mn02k"), SubResource("Resource_up1et"), SubResource("Resource_eeqjr")]) [sub_resource type="Resource" id="Resource_phfha"] script = ExtResource("6_ma1h0") @@ -917,7 +910,6 @@ remove_points_on_miss = false align_with_collision_normal = false max_slope = 90.0 collision_mask = 1 -exclude_mask = 0 enabled = true override_global_seed = false custom_seed = 0 @@ -926,7 +918,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_xxh5g"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_0ovty"), SubResource("Resource_hvbao"), SubResource("Resource_w1c4k")]) +stack = Array[Resource]([SubResource("Resource_0ovty"), SubResource("Resource_hvbao"), SubResource("Resource_w1c4k")]) [sub_resource type="Resource" id="Resource_eifot"] script = ExtResource("6_ma1h0") @@ -935,7 +927,6 @@ radius = 1.6059 [sub_resource type="Resource" id="Resource_ycnav"] script = ExtResource("21_5pgs0") scatter_node = NodePath("../Source") -auto_rebuild = true enabled = true override_global_seed = false custom_seed = 0 @@ -944,7 +935,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_u7eis"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_ycnav")]) +stack = Array[Resource]([SubResource("Resource_ycnav")]) [sub_resource type="Resource" id="Resource_wowj4"] script = ExtResource("6_ma1h0") @@ -953,7 +944,6 @@ radius = 1.6059 [sub_resource type="Resource" id="Resource_se8q6"] script = ExtResource("21_5pgs0") scatter_node = NodePath("../Source") -auto_rebuild = true enabled = true override_global_seed = false custom_seed = 0 @@ -965,7 +955,6 @@ script = ExtResource("21_h4uuj") iterations = 3 offset_step = 0.3 consecutive_step_multiplier = 0.5 -use_computeshader = true enabled = true override_global_seed = false custom_seed = 0 @@ -974,7 +963,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_d7vu4"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_se8q6"), SubResource("Resource_18oia")]) +stack = Array[Resource]([SubResource("Resource_se8q6"), SubResource("Resource_18oia")]) [sub_resource type="Resource" id="Resource_82ud0"] script = ExtResource("6_ma1h0") @@ -1002,7 +991,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_7up6y"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_x2nmf"), SubResource("Resource_4e7pm")]) +stack = Array[Resource]([SubResource("Resource_x2nmf"), SubResource("Resource_4e7pm")]) [sub_resource type="Resource" id="Resource_7kw48"] script = ExtResource("6_ma1h0") @@ -1030,7 +1019,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_c2lcy"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_4grs6"), SubResource("Resource_so4tv")]) +stack = Array[Resource]([SubResource("Resource_4grs6"), SubResource("Resource_so4tv")]) [sub_resource type="Resource" id="Resource_8al8a"] script = ExtResource("6_ma1h0") @@ -1058,7 +1047,7 @@ reference_frame = 2 [sub_resource type="Resource" id="Resource_t34ex"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_2vim7"), SubResource("Resource_jx3rx")]) +stack = Array[Resource]([SubResource("Resource_2vim7"), SubResource("Resource_jx3rx")]) [sub_resource type="Resource" id="Resource_c5k2f"] script = ExtResource("6_ma1h0") @@ -1078,7 +1067,6 @@ script = ExtResource("21_h4uuj") iterations = 5 offset_step = 0.3 consecutive_step_multiplier = 0.6 -use_computeshader = true enabled = true override_global_seed = false custom_seed = 0 @@ -1087,7 +1075,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_ncnfw"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_tlhxg"), SubResource("Resource_cbe88")]) +stack = Array[Resource]([SubResource("Resource_tlhxg"), SubResource("Resource_cbe88")]) [sub_resource type="Resource" id="Resource_pnh7s"] script = ExtResource("6_ma1h0") @@ -1107,7 +1095,6 @@ script = ExtResource("21_h4uuj") iterations = 5 offset_step = 0.3 consecutive_step_multiplier = 0.6 -use_computeshader = true enabled = true override_global_seed = false custom_seed = 0 @@ -1116,7 +1103,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_1wqmj"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_68u82"), SubResource("Resource_2fbms")]) +stack = Array[Resource]([SubResource("Resource_68u82"), SubResource("Resource_2fbms")]) [sub_resource type="Resource" id="Resource_lsc8o"] script = ExtResource("6_ma1h0") @@ -1153,7 +1140,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_rh222"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_cvv4j"), SubResource("Resource_bcg1s"), SubResource("Resource_ditx6")]) +stack = Array[Resource]([SubResource("Resource_cvv4j"), SubResource("Resource_bcg1s"), SubResource("Resource_ditx6")]) [sub_resource type="Resource" id="Resource_nnf16"] script = ExtResource("6_ma1h0") @@ -1190,7 +1177,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_thdr8"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_rq4m2"), SubResource("Resource_hjmp1"), SubResource("Resource_14l50")]) +stack = Array[Resource]([SubResource("Resource_rq4m2"), SubResource("Resource_hjmp1"), SubResource("Resource_14l50")]) [sub_resource type="Resource" id="Resource_t87ux"] script = ExtResource("6_ma1h0") @@ -1211,7 +1198,7 @@ reference_frame = 1 [sub_resource type="Resource" id="Resource_nvyeo"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_hcorr")]) +stack = Array[Resource]([SubResource("Resource_hcorr")]) [sub_resource type="Resource" id="Resource_t1kde"] script = ExtResource("6_ma1h0") @@ -1228,7 +1215,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_cidgu"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_behou")]) +stack = Array[Resource]([SubResource("Resource_behou")]) [sub_resource type="Resource" id="Resource_4qlye"] script = ExtResource("11_36l2y") @@ -1245,7 +1232,7 @@ reference_frame = 0 [sub_resource type="Resource" id="Resource_ywyj6"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_qsibf")]) +stack = Array[Resource]([SubResource("Resource_qsibf")]) [sub_resource type="Curve3D" id="Curve3D_mco2w"] _data = { @@ -1282,7 +1269,7 @@ reference_frame = 2 [sub_resource type="Resource" id="Resource_yl5xk"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_e8esq"), SubResource("Resource_p3662")]) +stack = Array[Resource]([SubResource("Resource_e8esq"), SubResource("Resource_p3662")]) [sub_resource type="Resource" id="Resource_x5d01"] script = ExtResource("6_ma1h0") @@ -1310,11 +1297,10 @@ reference_frame = 2 [sub_resource type="Resource" id="Resource_gavpu"] script = ExtResource("2_y5xi5") -stack = Array[Resource("res://addons/proton_scatter/src/modifiers/base_modifier.gd")]([SubResource("Resource_g6tkw"), SubResource("Resource_4jaem")]) +stack = Array[Resource]([SubResource("Resource_g6tkw"), SubResource("Resource_4jaem")]) [sub_resource type="ShaderMaterial" id="ShaderMaterial_7sbin"] shader = ExtResource("27_vj2yt") -shader_parameter/global_transform = null [sub_resource type="Resource" id="Resource_o7cnt"] script = ExtResource("6_ma1h0") diff --git a/addons/zylann.hterrain/hterrain.gd b/addons/zylann.hterrain/hterrain.gd index 6d31bbc..44366cd 100644 --- a/addons/zylann.hterrain/hterrain.gd +++ b/addons/zylann.hterrain/hterrain.gd @@ -540,7 +540,7 @@ func _on_texture_set_changed(): func get_shader_param(param_name: String): - return _material.get_shader_parameter(param_name) + return HT_Util.get_shader_material_parameter(_material, param_name) func set_shader_param(param_name: String, v): diff --git a/addons/zylann.hterrain/hterrain_detail_layer.gd b/addons/zylann.hterrain/hterrain_detail_layer.gd index 6a7b60c..bfdce34 100644 --- a/addons/zylann.hterrain/hterrain_detail_layer.gd +++ b/addons/zylann.hterrain/hterrain_detail_layer.gd @@ -280,7 +280,7 @@ func _set(key: StringName, v): func get_shader_param(param_name: String): - return _material.get_shader_parameter(param_name) + return HT_Util.get_shader_material_parameter(_material, param_name) func set_shader_param(param_name: String, v): diff --git a/addons/zylann.hterrain/models/grass_quad.obj.import b/addons/zylann.hterrain/models/grass_quad.obj.import index 8630f8d..fe93f30 100644 --- a/addons/zylann.hterrain/models/grass_quad.obj.import +++ b/addons/zylann.hterrain/models/grass_quad.obj.import @@ -19,4 +19,3 @@ generate_tangents=true scale_mesh=Vector3(1, 1, 1) offset_mesh=Vector3(0, 0, 0) optimize_mesh=true -force_disable_mesh_compression=false diff --git a/addons/zylann.hterrain/models/grass_quad_x2.obj.import b/addons/zylann.hterrain/models/grass_quad_x2.obj.import index a682190..926711a 100644 --- a/addons/zylann.hterrain/models/grass_quad_x2.obj.import +++ b/addons/zylann.hterrain/models/grass_quad_x2.obj.import @@ -19,4 +19,3 @@ generate_tangents=true scale_mesh=Vector3(1, 1, 1) offset_mesh=Vector3(0, 0, 0) optimize_mesh=true -force_disable_mesh_compression=false diff --git a/addons/zylann.hterrain/models/grass_quad_x3.obj.import b/addons/zylann.hterrain/models/grass_quad_x3.obj.import index 3ac01b1..f358c1e 100644 --- a/addons/zylann.hterrain/models/grass_quad_x3.obj.import +++ b/addons/zylann.hterrain/models/grass_quad_x3.obj.import @@ -19,4 +19,3 @@ generate_tangents=true scale_mesh=Vector3(1, 1, 1) offset_mesh=Vector3(0, 0, 0) optimize_mesh=true -force_disable_mesh_compression=false diff --git a/addons/zylann.hterrain/models/grass_quad_x4.obj.import b/addons/zylann.hterrain/models/grass_quad_x4.obj.import index c67bd98..79a4caa 100644 --- a/addons/zylann.hterrain/models/grass_quad_x4.obj.import +++ b/addons/zylann.hterrain/models/grass_quad_x4.obj.import @@ -19,4 +19,3 @@ generate_tangents=true scale_mesh=Vector3(1, 1, 1) offset_mesh=Vector3(0, 0, 0) optimize_mesh=true -force_disable_mesh_compression=false diff --git a/addons/zylann.hterrain/shaders/low_poly.gdshader b/addons/zylann.hterrain/shaders/low_poly.gdshader index cd47bf9..ab1e954 100644 --- a/addons/zylann.hterrain/shaders/low_poly.gdshader +++ b/addons/zylann.hterrain/shaders/low_poly.gdshader @@ -12,6 +12,8 @@ uniform sampler2D u_terrain_colormap;// : hint_albedo; uniform mat4 u_terrain_inverse_transform; uniform mat3 u_terrain_normal_basis; +uniform float u_specular = 0.5; + varying flat vec4 v_tint; @@ -59,5 +61,6 @@ void fragment() { ALBEDO = v_tint.rgb; ROUGHNESS = 1.0; NORMAL = normalize(cross(dFdy(VERTEX), dFdx(VERTEX))); + SPECULAR = u_specular; } diff --git a/addons/zylann.hterrain/shaders/multisplat16.gdshader b/addons/zylann.hterrain/shaders/multisplat16.gdshader index 2176b3b..bd3273d 100644 --- a/addons/zylann.hterrain/shaders/multisplat16.gdshader +++ b/addons/zylann.hterrain/shaders/multisplat16.gdshader @@ -27,6 +27,7 @@ uniform bool u_depth_blending = true; uniform float u_globalmap_blend_start; uniform float u_globalmap_blend_distance; uniform bool u_tile_reduction = false; +uniform float u_specular = 0.5; varying float v_hole; varying vec3 v_tint; @@ -370,4 +371,5 @@ void fragment() { // } NORMAL = (VIEW_MATRIX * (vec4(normal, 0.0))).xyz; + SPECULAR = u_specular; } diff --git a/addons/zylann.hterrain/shaders/multisplat16_lite.gdshader b/addons/zylann.hterrain/shaders/multisplat16_lite.gdshader index 1c44564..7bac466 100644 --- a/addons/zylann.hterrain/shaders/multisplat16_lite.gdshader +++ b/addons/zylann.hterrain/shaders/multisplat16_lite.gdshader @@ -25,6 +25,7 @@ uniform float u_ground_uv_scale = 20.0; uniform bool u_depth_blending = true; uniform float u_globalmap_blend_start; uniform float u_globalmap_blend_distance; +uniform float u_specular = 0.5; varying float v_hole; varying vec3 v_tint; @@ -251,4 +252,5 @@ void fragment() { // } NORMAL = (VIEW_MATRIX * (vec4(terrain_normal_world, 0.0))).xyz; + SPECULAR = u_specular; } diff --git a/addons/zylann.hterrain/shaders/simple4.gdshader b/addons/zylann.hterrain/shaders/simple4.gdshader index 0b9967a..f3ef5ce 100644 --- a/addons/zylann.hterrain/shaders/simple4.gdshader +++ b/addons/zylann.hterrain/shaders/simple4.gdshader @@ -44,6 +44,8 @@ uniform float u_globalmap_blend_distance; uniform vec4 u_colormap_opacity_per_texture = vec4(1.0, 1.0, 1.0, 1.0); +uniform float u_specular = 0.5; + varying float v_hole; varying vec3 v_tint0; varying vec3 v_tint1; @@ -326,4 +328,5 @@ void fragment() { // } NORMAL = (VIEW_MATRIX * (vec4(normal, 0.0))).xyz; + SPECULAR = u_specular; } diff --git a/addons/zylann.hterrain/shaders/simple4_lite.gdshader b/addons/zylann.hterrain/shaders/simple4_lite.gdshader index 25ef46d..90bff36 100644 --- a/addons/zylann.hterrain/shaders/simple4_lite.gdshader +++ b/addons/zylann.hterrain/shaders/simple4_lite.gdshader @@ -24,6 +24,7 @@ uniform bool u_depth_blending = true; uniform bool u_triplanar = false; // Each component corresponds to a ground texture. Set greater than zero to enable. uniform vec4 u_tile_reduction = vec4(0.0, 0.0, 0.0, 0.0); +uniform float u_specular = 0.5; varying vec4 v_tint; varying vec4 v_splat; @@ -204,6 +205,7 @@ void fragment() { ROUGHNESS = 1.0; NORMAL = (VIEW_MATRIX * (vec4(terrain_normal_world, 0.0))).xyz; + SPECULAR = u_specular; //ALBEDO = w.rgb; //ALBEDO = v_ground_uv.xyz; diff --git a/addons/zylann.hterrain/tools/generate_mesh_dialog.tscn b/addons/zylann.hterrain/tools/generate_mesh_dialog.tscn index 3ade702..12f3d4a 100644 --- a/addons/zylann.hterrain/tools/generate_mesh_dialog.tscn +++ b/addons/zylann.hterrain/tools/generate_mesh_dialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://ci0da54goyo5o"] [ext_resource type="Script" path="res://addons/zylann.hterrain/tools/generate_mesh_dialog.gd" id="1"] -[ext_resource type="PackedScene" uid="uid://cb5dbv8gsr627" path="res://addons/zylann.hterrain/tools/util/dialog_fitter.tscn" id="2"] +[ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/util/dialog_fitter.tscn" id="2"] [node name="GenerateMeshDialog" type="AcceptDialog"] title = "Generate full mesh" diff --git a/addons/zylann.hterrain/tools/generator/generator_dialog.tscn b/addons/zylann.hterrain/tools/generator/generator_dialog.tscn index 0419cf5..5d911e3 100644 --- a/addons/zylann.hterrain/tools/generator/generator_dialog.tscn +++ b/addons/zylann.hterrain/tools/generator/generator_dialog.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://cgfo1ocbdi1ug"] [ext_resource type="Script" path="res://addons/zylann.hterrain/tools/generator/generator_dialog.gd" id="1"] -[ext_resource type="PackedScene" uid="uid://dfjip6c4olemn" path="res://addons/zylann.hterrain/tools/inspector/inspector.tscn" id="2"] -[ext_resource type="PackedScene" uid="uid://bue2flijnxa3p" path="res://addons/zylann.hterrain/tools/terrain_preview.tscn" id="3"] +[ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/inspector/inspector.tscn" id="2"] +[ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/terrain_preview.tscn" id="3"] [ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/util/dialog_fitter.tscn" id="4"] [node name="GeneratorDialog" type="AcceptDialog"] diff --git a/addons/zylann.hterrain/tools/importer/importer_dialog.tscn b/addons/zylann.hterrain/tools/importer/importer_dialog.tscn index 083df89..0c2d267 100644 --- a/addons/zylann.hterrain/tools/importer/importer_dialog.tscn +++ b/addons/zylann.hterrain/tools/importer/importer_dialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://on7x7xkovsc8"] [ext_resource type="Script" path="res://addons/zylann.hterrain/tools/importer/importer_dialog.gd" id="1"] -[ext_resource type="PackedScene" uid="uid://dfjip6c4olemn" path="res://addons/zylann.hterrain/tools/inspector/inspector.tscn" id="2"] +[ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/inspector/inspector.tscn" id="2"] [ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/util/dialog_fitter.tscn" id="3"] [node name="WindowDialog" type="AcceptDialog"] diff --git a/addons/zylann.hterrain/tools/panel.tscn b/addons/zylann.hterrain/tools/panel.tscn index 79bb38d..33e856f 100644 --- a/addons/zylann.hterrain/tools/panel.tscn +++ b/addons/zylann.hterrain/tools/panel.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://addons/zylann.hterrain/tools/panel.gd" id="1"] [ext_resource type="PackedScene" uid="uid://bd42ig216p216" path="res://addons/zylann.hterrain/tools/brush/brush_editor.tscn" id="2"] -[ext_resource type="PackedScene" uid="uid://c06ccmyxvkx82" path="res://addons/zylann.hterrain/tools/texture_editor/texture_editor.tscn" id="3"] +[ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/texture_editor/texture_editor.tscn" id="3"] [ext_resource type="PackedScene" uid="uid://do3c3jse5p7hx" path="res://addons/zylann.hterrain/tools/detail_editor/detail_editor.tscn" id="4"] [ext_resource type="PackedScene" uid="uid://cba6k3hrwhrke" path="res://addons/zylann.hterrain/tools/minimap/minimap.tscn" id="5"] [ext_resource type="Script" path="res://addons/zylann.hterrain/tools/minimap/ratio_container.gd" id="6"] diff --git a/addons/zylann.hterrain/tools/texture_editor/texture_editor.tscn b/addons/zylann.hterrain/tools/texture_editor/texture_editor.tscn index 9f138bb..885f344 100644 --- a/addons/zylann.hterrain/tools/texture_editor/texture_editor.tscn +++ b/addons/zylann.hterrain/tools/texture_editor/texture_editor.tscn @@ -1,19 +1,19 @@ -[gd_scene load_steps=3 format=3 uid="uid://c06ccmyxvkx82"] +[gd_scene load_steps=3 format=2] -[ext_resource type="Script" path="res://addons/zylann.hterrain/tools/texture_editor/texture_editor.gd" id="1"] -[ext_resource type="PackedScene" path="res://addons/zylann.hterrain/tools/texture_editor/texture_list.tscn" id="2"] +[ext_resource path="res://addons/zylann.hterrain/tools/texture_editor/texture_editor.gd" type="Script" id=1] +[ext_resource path="res://addons/zylann.hterrain/tools/texture_editor/texture_list.tscn" type="PackedScene" id=2] [node name="TextureEditor" type="Control"] offset_right = 352.0 offset_bottom = 104.0 -custom_minimum_size = Vector2(100, 0) +custom_minimum_size = Vector2( 100, 0 ) size_flags_horizontal = 3 -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } -[node name="TextureList" parent="." instance=ExtResource("2")] +[node name="TextureList" parent="." instance=ExtResource( 2 )] offset_bottom = -26.0 [node name="HBoxContainer" type="HBoxContainer" parent="."] @@ -42,7 +42,6 @@ offset_top = 5.0 offset_right = 179.0 offset_bottom = 19.0 text = "Textures" - [connection signal="item_activated" from="TextureList" to="." method="_on_TextureList_item_activated"] [connection signal="item_selected" from="TextureList" to="." method="_on_TextureList_item_selected"] [connection signal="pressed" from="HBoxContainer/EditButton" to="." method="_on_EditButton_pressed"] diff --git a/addons/zylann.hterrain/tools/texture_editor/texture_list.tscn b/addons/zylann.hterrain/tools/texture_editor/texture_list.tscn index 0119700..df5e1e2 100644 --- a/addons/zylann.hterrain/tools/texture_editor/texture_list.tscn +++ b/addons/zylann.hterrain/tools/texture_editor/texture_list.tscn @@ -1,13 +1,13 @@ -[gd_scene load_steps=3 format=3 uid="uid://cybrw01pqkdjj"] +[gd_scene load_steps=3 format=2] -[ext_resource type="Script" path="res://addons/zylann.hterrain/tools/texture_editor/texture_list.gd" id="1"] -[ext_resource type="Script" path="res://addons/zylann.hterrain/tools/texture_editor/flow_container.gd" id="2"] +[ext_resource path="res://addons/zylann.hterrain/tools/texture_editor/texture_list.gd" type="Script" id=1] +[ext_resource path="res://addons/zylann.hterrain/tools/texture_editor/flow_container.gd" type="Script" id=2] [node name="TextureList" type="ScrollContainer"] anchor_right = 1.0 anchor_bottom = 1.0 scroll_horizontal_enabled = false -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -15,6 +15,6 @@ __meta__ = { [node name="Container" type="Container" parent="."] offset_right = 800.0 offset_bottom = 82.0 -custom_minimum_size = Vector2(0, 82) +custom_minimum_size = Vector2( 0, 82 ) size_flags_horizontal = 3 -script = ExtResource("2") +script = ExtResource( 2 ) diff --git a/addons/zylann.hterrain/tools/util/dialog_fitter.tscn b/addons/zylann.hterrain/tools/util/dialog_fitter.tscn index 14ba578..2e3b00c 100644 --- a/addons/zylann.hterrain/tools/util/dialog_fitter.tscn +++ b/addons/zylann.hterrain/tools/util/dialog_fitter.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=2 format=3 uid="uid://cb5dbv8gsr627"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Script" path="res://addons/zylann.hterrain/tools/util/dialog_fitter.gd" id="1"] +[ext_resource path="res://addons/zylann.hterrain/tools/util/dialog_fitter.gd" type="Script" id=1] [node name="DialogFitter" type="Control"] mouse_filter = 2 -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/addons/zylann.hterrain/tools/util/spin_slider.tscn b/addons/zylann.hterrain/tools/util/spin_slider.tscn index 5e132ca..70a0da8 100644 --- a/addons/zylann.hterrain/tools/util/spin_slider.tscn +++ b/addons/zylann.hterrain/tools/util/spin_slider.tscn @@ -1,13 +1,13 @@ -[gd_scene load_steps=2 format=3 uid="uid://b2ix128q0q5mm"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Script" path="res://addons/zylann.hterrain/tools/util/spin_slider.gd" id="1"] +[ext_resource path="res://addons/zylann.hterrain/tools/util/spin_slider.gd" type="Script" id=1] [node name="SpinSlider" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -rect_min_size = Vector2(32, 28) +rect_min_size = Vector2( 32, 28 ) mouse_default_cursor_shape = 10 -script = ExtResource("1") +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/addons/zylann.hterrain/util/util.gd b/addons/zylann.hterrain/util/util.gd index e2cd32c..b3b93ca 100644 --- a/addons/zylann.hterrain/util/util.gd +++ b/addons/zylann.hterrain/util/util.gd @@ -547,3 +547,16 @@ static func update_texture_partial( fuck.blit_rect(im, src_rect, dst_pos) tex.update(fuck) + +# Should be used because if `set_shader_parameter` has never been called, `get_shader_parameter` +# will return null even if the shader's corresponding uniform has a default value. +# See https://github.com/godotengine/godot/issues/44454 +static func get_shader_material_parameter(material: ShaderMaterial, param_name: StringName): + var v = material.get_shader_parameter(param_name) + if v == null: + var shader : Shader = material.shader + if shader != null: + v = RenderingServer.shader_get_parameter_default(shader.get_rid(), param_name) + return v + + diff --git a/scenes/interface/page_login.tscn b/scenes/interface/page_login.tscn index d52fefa..9753467 100644 --- a/scenes/interface/page_login.tscn +++ b/scenes/interface/page_login.tscn @@ -59,7 +59,6 @@ theme_override_styles/normal = SubResource("StyleBoxFlat_mci7p") placeholder_text = "#todo Usermane" [node name="text_password" type="TextEdit" parent="boxContainer_login/vBoxContainer_login"] -visible = false custom_minimum_size = Vector2(0, 40) layout_mode = 2 theme_override_font_sizes/font_size = 20