From e5d6d47e35f1f6de2b2367a405f8d991dcc0d384 Mon Sep 17 00:00:00 2001 From: Josef Date: Fri, 18 Jul 2025 16:45:42 +0200 Subject: [PATCH] RAL Sync --- Example Grass/Example-Grass.tscn | 69 ++++++++++++++++++++++---------- addons/rokojori_action_library | 2 +- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/Example Grass/Example-Grass.tscn b/Example Grass/Example-Grass.tscn index 7926052..c261e39 100644 --- a/Example Grass/Example-Grass.tscn +++ b/Example Grass/Example-Grass.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=75 format=4 uid="uid://bi4sydudfwap6"] +[gd_scene load_steps=79 format=4 uid="uid://bi4sydudfwap6"] [ext_resource type="Script" uid="uid://bo0awqfi5eqg4" path="res://addons/rokojori_action_library/Runtime/Procedural/Assets/Grass/GrassPatch.cs" id="1_ajxn3"] [ext_resource type="Texture2D" uid="uid://bs16srd4audv6" path="res://Example Grass/Sky.jpg" id="1_wf46h"] @@ -10,6 +10,7 @@ [ext_resource type="Script" uid="uid://c5ia5ogtg1725" path="res://addons/rokojori_action_library/Runtime/Rendering/Assets/Foliage/MeshInstanceFoliageData.cs" id="6_ukfl2"] [ext_resource type="Texture2D" uid="uid://c30nul6romace" path="res://addons/rokojori_action_library/Runtime/Procedural/Noise/RGB 3D Noise.png" id="7_q33fm"] [ext_resource type="Script" uid="uid://c4hg6rvrmjm6j" path="res://addons/rokojori_action_library/Runtime/Rendering/Assets/Foliage/GPUFoliageShaderMaterial.cs" id="8_3k1et"] +[ext_resource type="Script" uid="uid://bdcpb8ug5evdx" path="res://addons/rokojori_action_library/Runtime/Rendering/Assets/Foliage/FoliageQualitySettings.cs" id="9_n7e3p"] [ext_resource type="Shader" uid="uid://brk5g221ccd2x" path="res://addons/rokojori_action_library/Runtime/Rendering/Assets/Foliage/GPUFoliageShader.gdshader" id="9_wf46h"] [ext_resource type="Script" uid="uid://cl36x2jgfuypo" path="res://addons/rokojori_action_library/Runtime/Actions/OnProcess.cs" id="11_3k1et"] [ext_resource type="Script" uid="uid://bdjcmayust2t0" path="res://addons/rokojori_action_library/Runtime/Procedural/Assets/Grass/UpdateGrassPatch.cs" id="12_wf46h"] @@ -357,12 +358,13 @@ _surfaces = [{ [sub_resource type="Resource" id="Resource_8t2rj"] script = ExtResource("6_ukfl2") meshInstanceReference = NodePath("../GrassPatch/MeshInstance3D") -cellSize = 0.6215 -visibilityRange = 30.0 +cellSize = 0.8475 +visibilityRange = 40.0 visibilityFadeRelative = 0.72 visibilityFadeAbsolute = 0.0 visibilityFadeHidingOffset = -0.5322 renderPriority = 0 +qualitySettings = [] layerName = "" positionVarianceMaxOffset = Vector3(3, 0, 3) positionVarianceScale = 0.2135 @@ -393,6 +395,7 @@ visibilityFadeRelative = 0.5 visibilityFadeAbsolute = 0.0 visibilityFadeHidingOffset = -0.023 renderPriority = 0 +qualitySettings = [] layerName = "" positionVarianceMaxOffset = Vector3(10, 0, 10) positionVarianceScale = 3.0 @@ -414,13 +417,34 @@ occupancyVarianceScale = 1.0 occupancyVarianceOffset = Vector2(0, 0) metadata/_custom_type_script = "uid://c5ia5ogtg1725" -[sub_resource type="ShaderMaterial" id="ShaderMaterial_twcim"] +[sub_resource type="Resource" id="Resource_lvhug"] +script = ExtResource("9_n7e3p") +qualityLevel = 0.0 +cellSizeMultiply = 1.452 +visibilityRangeMultiply = 0.5225 +metadata/_custom_type_script = "uid://bdcpb8ug5evdx" + +[sub_resource type="Resource" id="Resource_6u5q2"] +script = ExtResource("9_n7e3p") +qualityLevel = 100.0 +cellSizeMultiply = 1.0 +visibilityRangeMultiply = 1.0 +metadata/_custom_type_script = "uid://bdcpb8ug5evdx" + +[sub_resource type="Resource" id="Resource_3k2ek"] +script = ExtResource("9_n7e3p") +qualityLevel = 200.0 +cellSizeMultiply = 0.77 +visibilityRangeMultiply = 1.6195 +metadata/_custom_type_script = "uid://bdcpb8ug5evdx" + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_uh2yf"] shader = ExtResource("9_wf46h") -shader_parameter/cameraPosition = Vector3(1.85335, 2.1225, -1.56369) +shader_parameter/cameraPosition = Vector3(45.0788, 3.24521, 3.59066) shader_parameter/yaw = 0.0 -shader_parameter/cellSize = 0.6215 -shader_parameter/width = 98 -shader_parameter/height = 98 +shader_parameter/cellSize = 0.652575 +shader_parameter/width = 200 +shader_parameter/height = 200 shader_parameter/positionVariance = ExtResource("7_q33fm") shader_parameter/maxPositionOffset = Vector3(3, 0, 3) shader_parameter/positionUVScale = Vector2(0.2135, 0.2135) @@ -444,20 +468,20 @@ shader_parameter/occupancyHideScale = 0.135 shader_parameter/occupancyVariance = ExtResource("7_q33fm") shader_parameter/occupancyUVScale = Vector2(0.7285, 0.7285) shader_parameter/occupancyUVOffset = Vector2(0, 0) -shader_parameter/hideStart = 8.4 -shader_parameter/hideMax = 30.0 +shader_parameter/hideStart = 18.1384 +shader_parameter/hideMax = 64.78 shader_parameter/hideOffset = -0.5322 shader_parameter/mapSize = Vector2(1024, 1024) shader_parameter/mapCenter = Vector2(0, 0) script = ExtResource("8_3k1et") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_kjgep"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_jsf0k"] shader = ExtResource("9_wf46h") -shader_parameter/cameraPosition = Vector3(1.85335, 2.1225, -1.56369) +shader_parameter/cameraPosition = Vector3(45.0788, 3.24521, 3.59066) shader_parameter/yaw = 0.0 -shader_parameter/cellSize = 0.548 -shader_parameter/width = 20 -shader_parameter/height = 20 +shader_parameter/cellSize = 0.42196 +shader_parameter/width = 40 +shader_parameter/height = 40 shader_parameter/positionVariance = ExtResource("7_q33fm") shader_parameter/maxPositionOffset = Vector3(10, 0, 10) shader_parameter/positionUVScale = Vector2(3, 3) @@ -481,8 +505,8 @@ shader_parameter/occupancyHideScale = 0.044 shader_parameter/occupancyVariance = ExtResource("7_q33fm") shader_parameter/occupancyUVScale = Vector2(1, 1) shader_parameter/occupancyUVOffset = Vector2(0, 0) -shader_parameter/hideStart = 2.5 -shader_parameter/hideMax = 5.0 +shader_parameter/hideStart = 4.04875 +shader_parameter/hideMax = 8.0975 shader_parameter/hideOffset = -0.023 shader_parameter/mapSize = Vector2(1024, 1024) shader_parameter/mapCenter = Vector2(0, 0) @@ -582,35 +606,38 @@ highCurve = SubResource("Curve_mcpgn") metadata/_custom_type_script = "uid://bo0awqfi5eqg4" [node name="Grass Patch" type="MeshInstance3D" parent="GrassPatch2"] +visible = false mesh = SubResource("ArrayMesh_rkenn") [node name="FoliageRenderer" type="Node3D" parent="."] script = ExtResource("5_pne4w") foliage = [SubResource("Resource_8t2rj"), SubResource("Resource_0em6d")] +quality = 200.0 +qualitySettingsAll = [SubResource("Resource_lvhug"), SubResource("Resource_6u5q2"), SubResource("Resource_3k2ek")] updateLayers = false noise = ExtResource("7_q33fm") metadata/_custom_type_script = "uid://b1sjdhnriaeg6" [node name="GpuParticles3D" type="GPUParticles3D" parent="FoliageRenderer"] custom_aabb = AABB(-5000, -5000, -5000, 10000, 10000, 10000) -amount = 9604 +amount = 40000 lifetime = 0.01 explosiveness = 1.0 fixed_fps = 0 interpolate = false fract_delta = false -process_material = SubResource("ShaderMaterial_twcim") +process_material = SubResource("ShaderMaterial_uh2yf") draw_pass_1 = SubResource("ArrayMesh_3k2ek") [node name="GpuParticles3D2" type="GPUParticles3D" parent="FoliageRenderer"] custom_aabb = AABB(-5000, -5000, -5000, 10000, 10000, 10000) -amount = 400 +amount = 1600 lifetime = 0.01 explosiveness = 1.0 fixed_fps = 0 interpolate = false fract_delta = false -process_material = SubResource("ShaderMaterial_kjgep") +process_material = SubResource("ShaderMaterial_jsf0k") draw_pass_1 = SubResource("ArrayMesh_rkenn") [node name="OnProcess" type="Node" parent="."] diff --git a/addons/rokojori_action_library b/addons/rokojori_action_library index 82faa6c..843b407 160000 --- a/addons/rokojori_action_library +++ b/addons/rokojori_action_library @@ -1 +1 @@ -Subproject commit 82faa6c117353fb714fb4610ebf14b9a679c130d +Subproject commit 843b407bf559a3f3e713a5c2633edd784f54d79a