diff --git a/3d/procedural_materials/materials/glass.tres b/3d/procedural_materials/materials/glass.tres new file mode 100644 index 0000000000..4cf55d1196 --- /dev/null +++ b/3d/procedural_materials/materials/glass.tres @@ -0,0 +1,16 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://68rvwiamrckm"] + +[ext_resource type="Texture2D" uid="uid://dyyjawpfnrh0w" path="res://materials/textures/glass_normal.tres" id="1_ulrqn"] +[ext_resource type="Texture2D" uid="uid://cd8ptni1nkv0a" path="res://materials/textures/glass_refraction.tres" id="2_ggkhk"] + +[resource] +transparency = 1 +albedo_color = Color(0.423529, 0.517647, 0.623529, 0.627451) +roughness = 0.3 +normal_enabled = true +normal_scale = 2.0 +normal_texture = ExtResource("1_ulrqn") +refraction_enabled = true +refraction_texture = ExtResource("2_ggkhk") +uv1_world_triplanar = true +texture_filter = 5 diff --git a/3d/procedural_materials/materials/textures/glass_normal.tres b/3d/procedural_materials/materials/textures/glass_normal.tres new file mode 100644 index 0000000000..529c7bbb0a --- /dev/null +++ b/3d/procedural_materials/materials/textures/glass_normal.tres @@ -0,0 +1,16 @@ +[gd_resource type="NoiseTexture2D" load_steps=2 format=3 uid="uid://dyyjawpfnrh0w"] + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_fr1s0"] +noise_type = 2 +frequency = 0.02 +fractal_type = 0 +cellular_distance_function = 1 +cellular_jitter = 4.0 +cellular_return_type = 6 + +[resource] +width = 1024 +height = 1024 +seamless = true +as_normal_map = true +noise = SubResource("FastNoiseLite_fr1s0") diff --git a/3d/procedural_materials/materials/textures/glass_refraction.tres b/3d/procedural_materials/materials/textures/glass_refraction.tres new file mode 100644 index 0000000000..c248721b7b --- /dev/null +++ b/3d/procedural_materials/materials/textures/glass_refraction.tres @@ -0,0 +1,15 @@ +[gd_resource type="NoiseTexture2D" load_steps=2 format=3 uid="uid://cd8ptni1nkv0a"] + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_fr1s0"] +noise_type = 2 +frequency = 0.02 +fractal_type = 0 +cellular_distance_function = 1 +cellular_jitter = 4.0 +cellular_return_type = 6 + +[resource] +width = 1024 +height = 1024 +seamless = true +noise = SubResource("FastNoiseLite_fr1s0") diff --git a/3d/procedural_materials/materials/textures/trypophobia_albedo.tres b/3d/procedural_materials/materials/textures/trypophobia_albedo.tres deleted file mode 100644 index 6d78cb29b9..0000000000 --- a/3d/procedural_materials/materials/textures/trypophobia_albedo.tres +++ /dev/null @@ -1,19 +0,0 @@ -[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://dw4mslgkir1bd"] - -[sub_resource type="Gradient" id="Gradient_d5vv8"] -offsets = PackedFloat32Array(0.00813008, 0.341463, 0.674797, 1) -colors = PackedColorArray(0.05, 0.05, 0.05, 1, 0.510312, 0.415082, 0.239094, 1, 0.95, 0.799267, 0.627, 1, 1, 1, 1, 1) - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_65rwj"] -noise_type = 2 -frequency = 0.005 -fractal_type = 3 -fractal_octaves = 9 -fractal_ping_pong_strength = 5.84 - -[resource] -width = 1024 -height = 1024 -seamless = true -color_ramp = SubResource("Gradient_d5vv8") -noise = SubResource("FastNoiseLite_65rwj") diff --git a/3d/procedural_materials/materials/textures/trypophobia_normal.tres b/3d/procedural_materials/materials/textures/trypophobia_normal.tres deleted file mode 100644 index 2b56ac69bb..0000000000 --- a/3d/procedural_materials/materials/textures/trypophobia_normal.tres +++ /dev/null @@ -1,21 +0,0 @@ -[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://dd5i28wnuc2cs"] - -[sub_resource type="Gradient" id="Gradient_3xmi8"] -offsets = PackedFloat32Array(0.00813008, 0.341463, 0.674797, 1) -colors = PackedColorArray(0.05, 0.05, 0.05, 1, 0.43, 0.43, 0.43, 1, 0.89, 0.89, 0.89, 1, 1, 1, 1, 1) - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_6p36u"] -noise_type = 2 -frequency = 0.005 -fractal_type = 3 -fractal_octaves = 9 -fractal_ping_pong_strength = 5.84 - -[resource] -width = 1024 -height = 1024 -seamless = true -as_normal_map = true -bump_strength = 3.0 -color_ramp = SubResource("Gradient_3xmi8") -noise = SubResource("FastNoiseLite_6p36u") diff --git a/3d/procedural_materials/materials/textures/trypophobia_roughness.tres b/3d/procedural_materials/materials/textures/trypophobia_roughness.tres deleted file mode 100644 index 8246bc5cf5..0000000000 --- a/3d/procedural_materials/materials/textures/trypophobia_roughness.tres +++ /dev/null @@ -1,19 +0,0 @@ -[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://muqmqaqefsrm"] - -[sub_resource type="Gradient" id="Gradient_2rffn"] -offsets = PackedFloat32Array(0.00813008, 0.341463, 0.674797, 1) -colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1, 0.89, 0.89, 0.89, 1, 1, 1, 1, 1) - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_65rwj"] -noise_type = 2 -frequency = 0.005 -fractal_type = 3 -fractal_octaves = 9 -fractal_ping_pong_strength = 5.84 - -[resource] -width = 1024 -height = 1024 -seamless = true -color_ramp = SubResource("Gradient_2rffn") -noise = SubResource("FastNoiseLite_65rwj") diff --git a/3d/procedural_materials/materials/trypophobia.tres b/3d/procedural_materials/materials/trypophobia.tres deleted file mode 100644 index eae1df0717..0000000000 --- a/3d/procedural_materials/materials/trypophobia.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://b2588u4jkfiog"] - -[ext_resource type="Texture2D" uid="uid://dw4mslgkir1bd" path="res://materials/textures/trypophobia_albedo.tres" id="1_1gqoj"] -[ext_resource type="Texture2D" uid="uid://dd5i28wnuc2cs" path="res://materials/textures/trypophobia_normal.tres" id="2_0h02x"] -[ext_resource type="Texture2D" uid="uid://muqmqaqefsrm" path="res://materials/textures/trypophobia_roughness.tres" id="2_2fvnl"] - -[resource] -albedo_texture = ExtResource("1_1gqoj") -roughness_texture = ExtResource("2_2fvnl") -normal_enabled = true -normal_texture = ExtResource("2_0h02x") -texture_filter = 5 diff --git a/3d/procedural_materials/project.godot b/3d/procedural_materials/project.godot index 0314f9f8c8..e7a863f2a4 100644 --- a/3d/procedural_materials/project.godot +++ b/3d/procedural_materials/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Procedural Materials" run/main_scene="res://loading.tscn" -config/features=PackedStringArray("4.0") +config/features=PackedStringArray("4.1") config/icon="res://icon.webp" [display] diff --git a/3d/procedural_materials/test.tscn b/3d/procedural_materials/test.tscn index 5a78b472b2..dd19cedcf2 100644 --- a/3d/procedural_materials/test.tscn +++ b/3d/procedural_materials/test.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=40 format=3 uid="uid://c4i1xdk0nc7s0"] -[ext_resource type="Material" uid="uid://b2588u4jkfiog" path="res://materials/trypophobia.tres" id="3_322sv"] [ext_resource type="Material" uid="uid://chsncadr63hoc" path="res://materials/grass.tres" id="4_gplko"] [ext_resource type="Material" uid="uid://3odjrwml2nes" path="res://materials/sand.tres" id="5_12jug"] [ext_resource type="Material" uid="uid://cw85kxowmkj37" path="res://materials/wet_concrete.tres" id="6_q1c2f"] [ext_resource type="Material" uid="uid://c5wve1c3hypfo" path="res://materials/marble.tres" id="7_ebvqo"] [ext_resource type="Material" uid="uid://cbijbaq5qol7n" path="res://materials/ice.tres" id="7_k1q1v"] [ext_resource type="Material" uid="uid://b74tdcluvrao6" path="res://materials/lava.tres" id="8_jphcw"] +[ext_resource type="Material" uid="uid://68rvwiamrckm" path="res://materials/glass.tres" id="9_vei4q"] [ext_resource type="Script" path="res://scripts/grid.gd" id="10_wwlcf"] [ext_resource type="Shader" path="res://shaders/plasma.gdshader" id="11_aoush"] [ext_resource type="Texture2D" uid="uid://chjqieyps5n5r" path="res://checker.png" id="14"] @@ -337,19 +337,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.5, 0) mesh = SubResource("BoxMesh_opf1g") surface_material_override/0 = ExtResource("8_jphcw") -[node name="NoiseTextureTrypophobia" type="Node3D" parent="Testers"] +[node name="NoiseTextureGlass" type="Node3D" parent="Testers"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.025, -6) -[node name="MeshInstance3D" type="MeshInstance3D" parent="Testers/NoiseTextureTrypophobia"] +[node name="MeshInstance3D" type="MeshInstance3D" parent="Testers/NoiseTextureGlass"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00275182, -0.244153, -0.000101089) mesh = SubResource("SphereMesh_be5u0") skeleton = NodePath("../../..") -surface_material_override/0 = ExtResource("3_322sv") +surface_material_override/0 = ExtResource("9_vei4q") -[node name="MeshInstance3D2" type="MeshInstance3D" parent="Testers/NoiseTextureTrypophobia"] +[node name="MeshInstance3D2" type="MeshInstance3D" parent="Testers/NoiseTextureGlass"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.5, 0) mesh = SubResource("BoxMesh_opf1g") -surface_material_override/0 = ExtResource("3_322sv") +surface_material_override/0 = ExtResource("9_vei4q") [node name="NoiseTexturePixelArt" type="Node3D" parent="Testers"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.025, -10)