Skip to content

Commit

Permalink
Update demos
Browse files Browse the repository at this point in the history
  • Loading branch information
TokisanGames committed Dec 6, 2023
1 parent 3413211 commit b6812df
Show file tree
Hide file tree
Showing 40 changed files with 642 additions and 90 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Normalize EOL for all files that Git considers text files.
* text=auto eol=lf
*.res filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.glb filter=lfs diff=lfs merge=lfs -text
*.occ filter=lfs diff=lfs merge=lfs -text
*.dds filter=lfs diff=lfs merge=lfs -text
4 changes: 2 additions & 2 deletions project/demo/CodeGenerated.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gd_scene load_steps=8 format=3 uid="uid://cofnhdcclon1w"]

[ext_resource type="Script" path="res://demo/src/CodeGenerated.gd" id="1_h7vyv"]
[ext_resource type="PackedScene" path="res://demo/components/Player.tscn" id="2_3v2uf"]
[ext_resource type="PackedScene" uid="uid://domhm87hbhbg1" path="res://demo/components/Player.tscn" id="2_3v2uf"]
[ext_resource type="PackedScene" uid="uid://bb2lp50sjndus" path="res://demo/components/World.tscn" id="3_71ikj"]
[ext_resource type="PackedScene" uid="uid://di5fovhcyd7re" path="res://demo/components/Enemy.tscn" id="4_p8qry"]
[ext_resource type="PackedScene" path="res://demo/components/UI.tscn" id="4_x5ge4"]
[ext_resource type="PackedScene" uid="uid://d2jihfohphuue" path="res://demo/components/UI.tscn" id="4_x5ge4"]
[ext_resource type="Script" path="res://demo/src/RuntimeNavigationBaker.gd" id="5_445ur"]

[sub_resource type="NavigationMesh" id="NavigationMesh_vs6am"]
Expand Down
80 changes: 44 additions & 36 deletions project/demo/Demo.tscn
Original file line number Diff line number Diff line change
@@ -1,63 +1,71 @@
[gd_scene load_steps=17 format=3 uid="uid://dyt8c2xqmddo2"]
[gd_scene load_steps=12 format=3 uid="uid://chol2xlfbq7cu"]

[ext_resource type="Script" path="res://demo/src/DemoScene.gd" id="1_k7qca"]
[ext_resource type="PackedScene" uid="uid://bb2lp50sjndus" path="res://demo/components/World.tscn" id="2_2yeq8"]
[ext_resource type="PackedScene" path="res://demo/components/Borders.tscn" id="3_cw38j"]
[ext_resource type="PackedScene" path="res://demo/components/Player.tscn" id="3_ht63y"]
[ext_resource type="PackedScene" path="res://demo/components/UI.tscn" id="4_gk532"]
[ext_resource type="PackedScene" uid="uid://bb2lp50sjndus" path="res://demo/components/World.tscn" id="2_75yik"]
[ext_resource type="PackedScene" uid="uid://d2jihfohphuue" path="res://demo/components/UI.tscn" id="2_nqak5"]
[ext_resource type="PackedScene" uid="uid://dwnhqfjq7v1pq" path="res://demo/components/Borders.tscn" id="3_cw38j"]
[ext_resource type="PackedScene" uid="uid://domhm87hbhbg1" path="res://demo/components/Player.tscn" id="3_ht63y"]
[ext_resource type="PackedScene" uid="uid://djhl3foqkj4e2" path="res://demo/components/Tunnel.tscn" id="3_kdh0b"]
[ext_resource type="Terrain3DStorage" uid="uid://lalq1xnmbjdl" path="res://demo/data/terrain_storage.res" id="5_sl43a"]
[ext_resource type="Texture2D" path="res://demo/textures/ground037_alb_ht.dds" id="7_hqga3"]
[ext_resource type="Texture2D" path="res://demo/textures/ground037_nrm_rgh.dds" id="8_pd4vo"]
[ext_resource type="Texture2D" path="res://demo/textures/rock028_alb_ht.dds" id="9_rm006"]
[ext_resource type="Texture2D" path="res://demo/textures/rock028_nrm_rgh.dds" id="10_i3tb8"]
[ext_resource type="Terrain3DTextureList" uid="uid://dal3jhw6241qg" path="res://demo/data/texture_list.tres" id="8_g2of2"]

[sub_resource type="FastNoiseLite" id="FastNoiseLite_20lj2"]
[sub_resource type="FastNoiseLite" id="FastNoiseLite_7glc1"]
noise_type = 0

[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_rl0jm"]
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_pvx8q"]
generate_mipmaps = false
seamless = true
noise = SubResource("FastNoiseLite_20lj2")
noise = SubResource("FastNoiseLite_7glc1")

[sub_resource type="Terrain3DMaterial" id="Terrain3DMaterial_dljqs"]
[sub_resource type="Terrain3DMaterial" id="Terrain3DMaterial_jrc01"]
_shader_parameters = {
"auto_base_texture": 0,
"auto_height_reduction": 0.1,
"auto_overlay_texture": 1,
"auto_shader": true,
"auto_slope": 1.0,
"blend_sharpness": 0.87,
"dual_scale_far": 170.0,
"dual_scale_near": 100.0,
"dual_scale_reduction": 0.3,
"dual_scale_texture": 0,
"dual_scaling": true,
"height_blending": true,
"noise_scale": 0.1,
"noise_texture": SubResource("NoiseTexture2D_rl0jm")
"noise_texture": SubResource("NoiseTexture2D_pvx8q"),
"tri_scale_reduction": 0.3,
"world_noise_blend_far": 1.0,
"world_noise_blend_near": 0.7,
"world_noise_height": 35.5,
"world_noise_lod_distance": 7500.0,
"world_noise_max_octaves": 4,
"world_noise_min_octaves": 2,
"world_noise_offset": Vector3(-1.425, -1.615, -0.52),
"world_noise_scale": 9.9
}

[sub_resource type="Terrain3DTexture" id="Terrain3DTexture_56fwf"]
name = "Grass"
albedo_color = Color(0.784314, 0.8, 0.776471, 1)
albedo_texture = ExtResource("7_hqga3")
normal_texture = ExtResource("8_pd4vo")

[sub_resource type="Terrain3DTexture" id="Terrain3DTexture_x74kb"]
name = "Rock"
texture_id = 1
albedo_color = Color(0.815686, 0.815686, 0.815686, 1)
albedo_texture = ExtResource("9_rm006")
normal_texture = ExtResource("10_i3tb8")

[sub_resource type="Terrain3DTextureList" id="Terrain3DTextureList_6biym"]
textures = Array[Terrain3DTexture]([SubResource("Terrain3DTexture_56fwf"), SubResource("Terrain3DTexture_x74kb")])
world_background = 2

[node name="Demo" type="Node"]
script = ExtResource("1_k7qca")

[node name="UI" parent="." instance=ExtResource("4_gk532")]
[node name="UI" parent="." instance=ExtResource("2_nqak5")]

[node name="World" parent="." instance=ExtResource("2_2yeq8")]
[node name="World" parent="." instance=ExtResource("2_75yik")]

[node name="Borders" parent="." instance=ExtResource("3_cw38j")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 512, 0, 512)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 512, -3, 512)
collision_mask = 3

[node name="Tunnel" parent="." instance=ExtResource("3_kdh0b")]

[node name="Player" parent="." instance=ExtResource("3_ht63y")]
transform = Transform3D(0.0774673, 0, -0.996995, 0, 1, 0, 0.996995, 0, 0.0774673, 253.094, 115.487, -1838.16)
transform = Transform3D(0.176947, 0, -0.98422, 0, 1, 0, 0.98422, 0, 0.176947, 223.143, 105.348, -1833.08)

[node name="Terrain3D" type="Terrain3D" parent="."]
storage = ExtResource("5_sl43a")
material = SubResource("Terrain3DMaterial_dljqs")
texture_list = SubResource("Terrain3DTextureList_6biym")
material = SubResource("Terrain3DMaterial_jrc01")
texture_list = ExtResource("8_g2of2")
render_cull_margin = 916.383
collision_mask = 3
clipmap_size = 64
transform = Transform3D(1, 0, 1.49012e-08, 0, 1, 0, -1.49012e-08, 0, 1, -3.05176e-05, 0, 0)
51 changes: 24 additions & 27 deletions project/demo/NavigationDemo.tscn
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
[gd_scene load_steps=19 format=3 uid="uid://x34e4v60vdmy"]
[gd_scene load_steps=14 format=3 uid="uid://x34e4v60vdmy"]

[ext_resource type="Script" path="res://demo/src/DemoScene.gd" id="1_po4vw"]
[ext_resource type="PackedScene" uid="uid://bb2lp50sjndus" path="res://demo/components/World.tscn" id="2_i74wg"]
[ext_resource type="PackedScene" path="res://demo/components/Borders.tscn" id="3_3upu0"]
[ext_resource type="PackedScene" path="res://demo/components/Player.tscn" id="4_fk3ul"]
[ext_resource type="PackedScene" path="res://demo/components/UI.tscn" id="5_rc7e2"]
[ext_resource type="PackedScene" uid="uid://dwnhqfjq7v1pq" path="res://demo/components/Borders.tscn" id="3_3upu0"]
[ext_resource type="PackedScene" uid="uid://domhm87hbhbg1" path="res://demo/components/Player.tscn" id="4_fk3ul"]
[ext_resource type="PackedScene" uid="uid://djhl3foqkj4e2" path="res://demo/components/Tunnel.tscn" id="5_2lvlr"]
[ext_resource type="PackedScene" uid="uid://d2jihfohphuue" path="res://demo/components/UI.tscn" id="5_rc7e2"]
[ext_resource type="Terrain3DStorage" uid="uid://lalq1xnmbjdl" path="res://demo/data/terrain_storage.res" id="7_d7eri"]
[ext_resource type="NavigationMesh" uid="uid://yf3fu23666k8" path="res://demo/data/navmesh.res" id="7_jmtvv"]
[ext_resource type="Texture2D" path="res://demo/textures/ground037_alb_ht.dds" id="8_qnmu8"]
[ext_resource type="Texture2D" path="res://demo/textures/ground037_nrm_rgh.dds" id="9_glb8t"]
[ext_resource type="Texture2D" path="res://demo/textures/rock028_alb_ht.dds" id="10_cggtx"]
[ext_resource type="Texture2D" path="res://demo/textures/rock028_nrm_rgh.dds" id="11_irxj1"]
[ext_resource type="Terrain3DTextureList" uid="uid://dal3jhw6241qg" path="res://demo/data/texture_list.tres" id="10_qmhh8"]
[ext_resource type="PackedScene" uid="uid://di5fovhcyd7re" path="res://demo/components/Enemy.tscn" id="12_b2xl8"]

[sub_resource type="FastNoiseLite" id="FastNoiseLite_i4tyq"]
Expand All @@ -23,27 +21,23 @@ noise = SubResource("FastNoiseLite_i4tyq")

[sub_resource type="Terrain3DMaterial" id="Terrain3DMaterial_5dxhb"]
_shader_parameters = {
"auto_base_texture": 0,
"auto_height_reduction": 0.1,
"auto_overlay_texture": 1,
"auto_shader": true,
"auto_slope": 1.0,
"blend_sharpness": 0.87,
"dual_scale_far": 170.0,
"dual_scale_near": 100.0,
"dual_scale_reduction": 0.3,
"dual_scale_texture": 0,
"dual_scaling": true,
"height_blending": true,
"noise_scale": 0.1,
"noise_texture": SubResource("NoiseTexture2D_8x4ho")
"noise_texture": SubResource("NoiseTexture2D_8x4ho"),
"tri_scale_reduction": 1.0
}

[sub_resource type="Terrain3DTexture" id="Terrain3DTexture_56fwf"]
name = "Grass"
albedo_color = Color(0.784314, 0.8, 0.776471, 1)
albedo_texture = ExtResource("8_qnmu8")
normal_texture = ExtResource("9_glb8t")

[sub_resource type="Terrain3DTexture" id="Terrain3DTexture_x74kb"]
name = "Rock"
texture_id = 1
albedo_color = Color(0.815686, 0.815686, 0.815686, 1)
albedo_texture = ExtResource("10_cggtx")
normal_texture = ExtResource("11_irxj1")

[sub_resource type="Terrain3DTextureList" id="Terrain3DTextureList_6biym"]
textures = Array[Terrain3DTexture]([SubResource("Terrain3DTexture_56fwf"), SubResource("Terrain3DTexture_x74kb")])
world_background = 0

[node name="Demo" type="Node"]
script = ExtResource("1_po4vw")
Expand All @@ -53,7 +47,9 @@ script = ExtResource("1_po4vw")
[node name="World" parent="." instance=ExtResource("2_i74wg")]

[node name="Borders" parent="." instance=ExtResource("3_3upu0")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 512, 0, 512)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 512, -2.5, 512)

[node name="Tunnel" parent="." instance=ExtResource("5_2lvlr")]

[node name="Player" parent="." instance=ExtResource("4_fk3ul")]
transform = Transform3D(0.0774673, 0, -0.996995, 0, 1, 0, 0.996995, 0, 0.0774673, 253.094, 115.487, -1838.16)
Expand All @@ -68,5 +64,6 @@ navigation_mesh = ExtResource("7_jmtvv")
[node name="Terrain3D" type="Terrain3D" parent="NavigationRegion3D"]
storage = ExtResource("7_d7eri")
material = SubResource("Terrain3DMaterial_5dxhb")
texture_list = SubResource("Terrain3DTextureList_6biym")
texture_list = ExtResource("10_qmhh8")
collision_mask = 3
clipmap_size = 64
26 changes: 26 additions & 0 deletions project/demo/assets/materials/M_crystal_blue.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://fkhkir6t1hml"]

[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_alb_ht.dds" id="1_ahc02"]
[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_nrm_rgh.dds" id="2_glxvb"]

[resource]
transparency = 1
albedo_color = Color(0.4, 1, 1, 0.647059)
metallic_specular = 1.0
roughness = 0.2
roughness_texture = ExtResource("2_glxvb")
roughness_texture_channel = 3
emission_enabled = true
emission = Color(0, 0.145098, 0.776471, 1)
emission_energy_multiplier = 1.4
normal_enabled = true
normal_scale = 0.4
normal_texture = ExtResource("2_glxvb")
rim_enabled = true
rim = 0.25
clearcoat_roughness = 0.0
ao_light_affect = 1.0
ao_texture = ExtResource("1_ahc02")
ao_texture_channel = 3
refraction_enabled = true
refraction_scale = -0.1
25 changes: 25 additions & 0 deletions project/demo/assets/materials/M_crystal_purple.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cso4f2iyuxpmc"]

[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_alb_ht.dds" id="1_uwd12"]
[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_nrm_rgh.dds" id="2_0wyvn"]

[resource]
transparency = 1
albedo_color = Color(0.4, 0.4, 1, 0.556863)
metallic_specular = 1.0
roughness = 0.2
roughness_texture = ExtResource("2_0wyvn")
roughness_texture_channel = 3
emission_enabled = true
emission = Color(0.235294, 0.145098, 0.776471, 1)
normal_enabled = true
normal_scale = 0.4
normal_texture = ExtResource("2_0wyvn")
rim_enabled = true
rim = 0.25
clearcoat_roughness = 0.0
ao_light_affect = 1.0
ao_texture = ExtResource("1_uwd12")
ao_texture_channel = 3
refraction_enabled = true
refraction_scale = -0.1
13 changes: 13 additions & 0 deletions project/demo/assets/materials/M_rock30.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dlmtxs0c66hj3"]

[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_alb_ht.dds" id="1_j5sdo"]
[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_nrm_rgh.dds" id="2_yyurh"]

[resource]
albedo_color = Color(1, 0.984314, 0.941176, 1)
albedo_texture = ExtResource("1_j5sdo")
normal_enabled = true
normal_texture = ExtResource("2_yyurh")
uv1_scale = Vector3(4, 4, 4)
uv1_triplanar_sharpness = 6.06286
texture_filter = 5
14 changes: 14 additions & 0 deletions project/demo/assets/materials/M_rock30_tp.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dkvsksxpkl1vj"]

[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_alb_ht.dds" id="1_j5sdo"]
[ext_resource type="Texture2D" path="res://demo/assets/textures/rock030_nrm_rgh.dds" id="2_yyurh"]

[resource]
albedo_color = Color(1, 0.968627, 0.890196, 1)
albedo_texture = ExtResource("1_j5sdo")
normal_enabled = true
normal_texture = ExtResource("2_yyurh")
uv1_scale = Vector3(0.04, 0.04, 0.04)
uv1_triplanar = true
uv1_triplanar_sharpness = 6.06286
texture_filter = 5
16 changes: 16 additions & 0 deletions project/demo/assets/models/CrystalC.tscn

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions project/demo/assets/models/RockA.glb
Git LFS file not shown
39 changes: 39 additions & 0 deletions project/demo/assets/models/RockA.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bxwiqxgwoh630"
path="res://.godot/imported/RockA.glb-2e416adf16cd89c5c5afc8e204027147.scn"

[deps]

source_file="res://demo/assets/models/RockA.glb"
dest_files=["res://.godot/imported/RockA.glb-2e416adf16cd89c5c5afc8e204027147.scn"]

[params]

nodes/root_type="StaticBody3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={
"materials": {
"@MATERIAL:0": {
"use_external/enabled": true,
"use_external/path": "res://demo/assets/materials/M_rock30.tres"
}
}
}
gltf/embedded_image_handling=1
16 changes: 16 additions & 0 deletions project/demo/assets/models/RockA.tscn

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions project/demo/assets/models/RockB.glb
Git LFS file not shown
39 changes: 39 additions & 0 deletions project/demo/assets/models/RockB.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://nta3sef6c2el"
path="res://.godot/imported/RockB.glb-d0df90244ab14da61106a961f4faa07f.scn"

[deps]

source_file="res://demo/assets/models/RockB.glb"
dest_files=["res://.godot/imported/RockB.glb-d0df90244ab14da61106a961f4faa07f.scn"]

[params]

nodes/root_type="StaticBody3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={
"materials": {
"@MATERIAL:0": {
"use_external/enabled": true,
"use_external/path": "res://demo/assets/materials/M_rock30.tres"
}
}
}
gltf/embedded_image_handling=1
16 changes: 16 additions & 0 deletions project/demo/assets/models/RockB.tscn

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions project/demo/assets/models/RockC.glb
Git LFS file not shown
Loading

0 comments on commit b6812df

Please sign in to comment.