Compare commits

..

34 Commits

Author SHA1 Message Date
417d9f5a6b changed main scene
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 14s
Create tag and build when new code gets to main / Export (push) Successful in 9m35s
2025-10-16 17:17:13 +02:00
591993a1f2 textures
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 15s
Create tag and build when new code gets to main / Export (push) Successful in 8m38s
2025-10-16 11:27:55 +02:00
e39620ce52 F O G
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 16s
Create tag and build when new code gets to main / Export (push) Successful in 5m14s
2025-10-15 13:57:44 +02:00
7312b2b22b second part of city well on track
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 14s
Create tag and build when new code gets to main / Export (push) Successful in 3m36s
2025-10-14 23:15:55 +02:00
45e8ac2f3c mor city
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 3m17s
2025-10-13 17:12:03 +02:00
46bea7ba14 more greyboxing
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 3m17s
2025-10-07 10:28:11 +02:00
c35ce49669 more greyboxing
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Successful in 3m9s
2025-10-03 16:55:24 +02:00
c1e8235895 moving away from blend files and using explicit imports through gltf
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 3m37s
2025-10-03 15:45:40 +02:00
1813973daa weapon clip fix
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Has been cancelled
2025-09-16 11:01:31 +02:00
7b036c5889 fixed mantle after dash bug
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Failing after 2s
2025-09-16 10:28:41 +02:00
88d20431ce updated CI to godot 4.5
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Failing after 2s
2025-09-16 09:43:21 +02:00
d15542e4ed ported to Godot 5 and fixed collisions on tooling script
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Has been cancelled
2025-09-16 09:40:20 +02:00
63ea62ff74 some greyboxing attempt
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Failing after 3h13m16s
2025-09-15 17:33:48 +02:00
c563390796 Merge branch 'main' of https://git.game-dev.space/minimata/MovementTests
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Failing after 3h5m23s
2025-09-13 19:15:41 +02:00
5f37f39558 deleted useless stuss 2025-09-13 19:15:38 +02:00
4922e597d9 Merge pull request 'test adding a blend file mesh' (#2) from more-rework into main
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Has been cancelled
Reviewed-on: #2
2025-09-13 17:14:19 +00:00
739968afbf test adding a clend file mesh 2025-09-13 19:11:50 +02:00
e0301064bb Merge pull request 'more-rework' (#1) from more-rework into main
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Failing after 3m58s
Reviewed-on: #1
2025-09-13 16:57:41 +00:00
925b7004c0 complete move patterns 2025-09-13 18:57:11 +02:00
e6cdb26ee0 throwing weapon back on 2025-09-12 14:54:08 +02:00
49ba007613 mantling seems to work 2025-09-11 18:12:34 +02:00
285365becf least worst version 2025-09-11 16:36:27 +02:00
00c4c1ddfa scene saved 2025-09-09 16:23:45 +02:00
f4d5a02e42 fucked up 2025-09-09 16:09:59 +02:00
5087cb58bc god dayum wall hugging on point man 2025-08-18 14:54:41 +02:00
4f9005d016 revamped megajump and air control 2025-08-07 16:13:21 +02:00
f905e55f65 revamped jump 2025-08-05 12:12:07 +02:00
0d6d1c86de moved movement code to player 2025-07-29 16:41:31 +02:00
ffdb3366a5 two empoered actions on cooldown 2025-07-29 11:08:02 +02:00
cd9e6da4e9 trying with cooldown 2025-07-28 18:51:51 +02:00
77c62c74de changing acceleration factors 2025-07-28 17:27:23 +02:00
3df89c6d28 i dunno man 2025-07-22 16:18:43 +02:00
9d29ec8ee4 trying other setup 2025-07-22 11:51:48 +02:00
4c16ad4f9a dash and jump 2025-07-21 14:40:48 +02:00
118 changed files with 6140 additions and 2182 deletions

View File

@@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest
needs: BumpTag
container:
image: barichello/godot-ci:mono-4.4.1
image: barichello/godot-ci:mono-4.5
steps:
- name: Install node, curl and zip

View File

@@ -1,4 +1,4 @@
<Project Sdk="Godot.NET.Sdk/4.4.1">
<Project Sdk="Godot.NET.Sdk/4.5.0">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>

131
Movement tests.csproj.old Normal file
View File

@@ -0,0 +1,131 @@
<Project Sdk="Godot.NET.Sdk/4.4.1">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
<RootNamespace>Movementtests</RootNamespace>
</PropertyGroup>
<ItemGroup>
<Content Include="export_presets.cfg" />
<Content Include="menus\assets\git_logo\Git-Logo-2Color.png" />
<Content Include="menus\assets\git_logo\Git-Logo-2Color.png.import" />
<Content Include="menus\assets\git_logo\LICENSE.txt" />
<Content Include="menus\assets\godot_engine_logo\LICENSE.txt" />
<Content Include="menus\assets\godot_engine_logo\logo_vertical_color_dark.png" />
<Content Include="menus\assets\godot_engine_logo\logo_vertical_color_dark.png.import" />
<Content Include="menus\assets\icon.png" />
<Content Include="menus\assets\icon.png.import" />
<Content Include="menus\ATTRIBUTION.md" />
<Content Include="menus\resources\themes\expedition.tres" />
<Content Include="menus\resources\themes\gravity.tres" />
<Content Include="menus\resources\themes\grow.tres" />
<Content Include="menus\resources\themes\lab.tres" />
<Content Include="menus\resources\themes\lore.tres" />
<Content Include="menus\resources\themes\steal_this_theme.tres" />
<Content Include="menus\scenes\credits\scrollable_credits.gd" />
<Content Include="menus\scenes\credits\scrollable_credits.gd.uid" />
<Content Include="menus\scenes\credits\scrollable_credits.tscn" />
<Content Include="menus\scenes\credits\scrolling_credits.gd" />
<Content Include="menus\scenes\credits\scrolling_credits.gd.uid" />
<Content Include="menus\scenes\credits\scrolling_credits.tscn" />
<Content Include="menus\scenes\end_credits\end_credits.gd" />
<Content Include="menus\scenes\end_credits\end_credits.gd.uid" />
<Content Include="menus\scenes\end_credits\end_credits.tscn" />
<Content Include="menus\scenes\game_scene\configurable_sub_viewport.gd" />
<Content Include="menus\scenes\game_scene\configurable_sub_viewport.gd.uid" />
<Content Include="menus\scenes\game_scene\game_ui.tscn" />
<Content Include="menus\scenes\game_scene\input_display_label.gd" />
<Content Include="menus\scenes\game_scene\input_display_label.gd.uid" />
<Content Include="menus\scenes\game_scene\levels\level.gd" />
<Content Include="menus\scenes\game_scene\levels\level.gd.uid" />
<Content Include="menus\scenes\game_scene\levels\level_1.tscn" />
<Content Include="menus\scenes\game_scene\levels\level_2.tscn" />
<Content Include="menus\scenes\game_scene\levels\level_3.tscn" />
<Content Include="menus\scenes\game_scene\tutorials\tutorial_1.tscn" />
<Content Include="menus\scenes\game_scene\tutorials\tutorial_2.tscn" />
<Content Include="menus\scenes\game_scene\tutorials\tutorial_3.tscn" />
<Content Include="menus\scenes\game_scene\tutorial_manager.gd" />
<Content Include="menus\scenes\game_scene\tutorial_manager.gd.uid" />
<Content Include="menus\scenes\loading_screen\level_loading_screen.tscn" />
<Content Include="menus\scenes\loading_screen\loading_screen.gd" />
<Content Include="menus\scenes\loading_screen\loading_screen.gd.uid" />
<Content Include="menus\scenes\loading_screen\loading_screen.tscn" />
<Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.gd" />
<Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.gd.uid" />
<Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.tscn" />
<Content Include="menus\scenes\menus\level_select_menu\level_select_menu.gd" />
<Content Include="menus\scenes\menus\level_select_menu\level_select_menu.gd.uid" />
<Content Include="menus\scenes\menus\level_select_menu\level_select_menu.tscn" />
<Content Include="menus\scenes\menus\main_menu\main_menu.gd" />
<Content Include="menus\scenes\menus\main_menu\main_menu.gd.uid" />
<Content Include="menus\scenes\menus\main_menu\main_menu.tscn" />
<Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.gd" />
<Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.gd.uid" />
<Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.tscn" />
<Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.gd" />
<Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.tscn" />
<Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.gd" />
<Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.tscn" />
<Content Include="menus\scenes\menus\options_menu\game\game_options_menu.gd" />
<Content Include="menus\scenes\menus\options_menu\game\game_options_menu.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\game\game_options_menu.tscn" />
<Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.gd" />
<Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.tscn" />
<Content Include="menus\scenes\menus\options_menu\input\input_extras_menu.tscn" />
<Content Include="menus\scenes\menus\options_menu\input\input_options_menu.gd" />
<Content Include="menus\scenes\menus\options_menu\input\input_options_menu.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\input\input_options_menu.tscn" />
<Content Include="menus\scenes\menus\options_menu\input\input_options_menu_with_mouse_sensitivity.tscn" />
<Content Include="menus\scenes\menus\options_menu\master_options_menu.gd" />
<Content Include="menus\scenes\menus\options_menu\master_options_menu.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\master_options_menu.tscn" />
<Content Include="menus\scenes\menus\options_menu\master_options_menu_with_tabs.tscn" />
<Content Include="menus\scenes\menus\options_menu\mini_options_menu.gd" />
<Content Include="menus\scenes\menus\options_menu\mini_options_menu.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\mini_options_menu.tscn" />
<Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.gd" />
<Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.tscn" />
<Content Include="menus\scenes\menus\options_menu\video\video_options_menu.gd" />
<Content Include="menus\scenes\menus\options_menu\video\video_options_menu.gd.uid" />
<Content Include="menus\scenes\menus\options_menu\video\video_options_menu.tscn" />
<Content Include="menus\scenes\menus\options_menu\video\video_options_menu_with_extras.tscn" />
<Content Include="menus\scenes\opening\opening.gd" />
<Content Include="menus\scenes\opening\opening.gd.uid" />
<Content Include="menus\scenes\opening\opening.tscn" />
<Content Include="menus\scenes\opening\opening_with_logo.tscn" />
<Content Include="menus\scenes\overlaid_menus\game_won_menu.gd" />
<Content Include="menus\scenes\overlaid_menus\game_won_menu.gd.uid" />
<Content Include="menus\scenes\overlaid_menus\game_won_menu.tscn" />
<Content Include="menus\scenes\overlaid_menus\level_lost_menu.gd" />
<Content Include="menus\scenes\overlaid_menus\level_lost_menu.gd.uid" />
<Content Include="menus\scenes\overlaid_menus\level_lost_menu.tscn" />
<Content Include="menus\scenes\overlaid_menus\level_won_menu.gd" />
<Content Include="menus\scenes\overlaid_menus\level_won_menu.gd.uid" />
<Content Include="menus\scenes\overlaid_menus\level_won_menu.tscn" />
<Content Include="menus\scenes\overlaid_menus\mini_options_overlaid_menu.tscn" />
<Content Include="menus\scenes\overlaid_menus\overlaid_menu.gd" />
<Content Include="menus\scenes\overlaid_menus\overlaid_menu.gd.uid" />
<Content Include="menus\scenes\overlaid_menus\overlaid_menu.tscn" />
<Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.gd" />
<Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.gd.uid" />
<Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.tscn" />
<Content Include="menus\scenes\overlaid_menus\pause_menu.gd" />
<Content Include="menus\scenes\overlaid_menus\pause_menu.gd.uid" />
<Content Include="menus\scenes\overlaid_menus\pause_menu.tscn" />
<Content Include="menus\scripts\game_state.gd" />
<Content Include="menus\scripts\game_state.gd.uid" />
<Content Include="menus\scripts\level_list_and_state_manager.gd" />
<Content Include="menus\scripts\level_list_and_state_manager.gd.uid" />
<Content Include="menus\scripts\level_state.gd" />
<Content Include="menus\scripts\level_state.gd.uid" />
</ItemGroup>
<ItemGroup>
<Folder Include="addons\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="RustyOptions" Version="0.10.1" />
</ItemGroup>
</Project>

View File

@@ -250,5 +250,3 @@ func _editor_name() -> String:
return name
return resource_path.get_file().replace(".tres", "")

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://2huty67y1g5w"
path="res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"
[deps]
source_file="res://assets/greyboxing/Guard tower.glb"
dest_files=["res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
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
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={}
gltf/naming_version=2
gltf/embedded_image_handling=1

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,33 @@
[gd_resource type="ShaderMaterial" load_steps=6 format=3 uid="uid://crmfn3ffj8oi4"]
[ext_resource type="Shader" uid="uid://clgsf8uqgmqa6" path="res://assets/materials/walls/walls.gdshader" id="1_0e3id"]
[ext_resource type="Texture2D" uid="uid://b7bj41iep7068" path="res://assets/materials/walls/textures/clay_roof_tiles_02_disp_4k.png" id="2_0e3id"]
[ext_resource type="Texture2D" uid="uid://djj0wp5xhwp7e" path="res://assets/materials/walls/textures/clay_roof_tiles_02_nor_gl_4k.png" id="3_f1b6h"]
[ext_resource type="Texture2D" uid="uid://b76lrrh6vyg4m" path="res://assets/materials/walls/textures/clay_roof_tiles_02_rough_4k.png" id="4_rir86"]
[ext_resource type="Texture2D" uid="uid://dickf0midb32u" path="res://assets/materials/walls/textures/clay_roof_tiles_02_diff_4k.jpg" id="5_7jlns"]
[resource]
render_priority = 0
shader = ExtResource("1_0e3id")
shader_parameter/blendSharpness = 0.0
shader_parameter/specular = 0.08
shader_parameter/albedoTint = Color(0.9542733, 0.7775326, 0.7131461, 1)
shader_parameter/roughnessMultiplier = 1.0
shader_parameter/floorAlbedoTint = Color(0.94823223, 0.7557853, 0.6872866, 1)
shader_parameter/floorRoughnessMultiplier = 1.0
shader_parameter/textureMap = ExtResource("5_7jlns")
shader_parameter/roughnessMap = ExtResource("4_rir86")
shader_parameter/normalMap = ExtResource("3_f1b6h")
shader_parameter/heightMap = ExtResource("2_0e3id")
shader_parameter/normalMapStrength = 1.0
shader_parameter/uvScale = 0.2
shader_parameter/enableFloor = true
shader_parameter/floorTextureMap = ExtResource("5_7jlns")
shader_parameter/floorRoughnessMap = ExtResource("4_rir86")
shader_parameter/floorNormalMap = ExtResource("3_f1b6h")
shader_parameter/floorHeightMap = ExtResource("2_0e3id")
shader_parameter/floorUvScale = 0.5
shader_parameter/enablePom = true
shader_parameter/heightMinLayers = 8
shader_parameter/heightMaxLayers = 64
shader_parameter/heightScale = 0.08

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dickf0midb32u"
path.s3tc="res://.godot/imported/clay_roof_tiles_02_diff_4k.jpg-5823ff540d82d50496805d95ee6e788b.s3tc.ctex"
path.etc2="res://.godot/imported/clay_roof_tiles_02_diff_4k.jpg-5823ff540d82d50496805d95ee6e788b.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/clay_roof_tiles_02_diff_4k.jpg"
dest_files=["res://.godot/imported/clay_roof_tiles_02_diff_4k.jpg-5823ff540d82d50496805d95ee6e788b.s3tc.ctex", "res://.godot/imported/clay_roof_tiles_02_diff_4k.jpg-5823ff540d82d50496805d95ee6e788b.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b7bj41iep7068"
path.s3tc="res://.godot/imported/clay_roof_tiles_02_disp_4k.png-623bc22b41a0fdec3dfe6f2c8672c482.s3tc.ctex"
path.etc2="res://.godot/imported/clay_roof_tiles_02_disp_4k.png-623bc22b41a0fdec3dfe6f2c8672c482.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/clay_roof_tiles_02_disp_4k.png"
dest_files=["res://.godot/imported/clay_roof_tiles_02_disp_4k.png-623bc22b41a0fdec3dfe6f2c8672c482.s3tc.ctex", "res://.godot/imported/clay_roof_tiles_02_disp_4k.png-623bc22b41a0fdec3dfe6f2c8672c482.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://djj0wp5xhwp7e"
path.s3tc="res://.godot/imported/clay_roof_tiles_02_nor_gl_4k.png-071f5ce21d7d297bca4c1992cdceffb9.s3tc.ctex"
path.etc2="res://.godot/imported/clay_roof_tiles_02_nor_gl_4k.png-071f5ce21d7d297bca4c1992cdceffb9.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/clay_roof_tiles_02_nor_gl_4k.png"
dest_files=["res://.godot/imported/clay_roof_tiles_02_nor_gl_4k.png-071f5ce21d7d297bca4c1992cdceffb9.s3tc.ctex", "res://.godot/imported/clay_roof_tiles_02_nor_gl_4k.png-071f5ce21d7d297bca4c1992cdceffb9.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b76lrrh6vyg4m"
path.s3tc="res://.godot/imported/clay_roof_tiles_02_rough_4k.png-e6cb436c6ff4afdea2a51fc78cdc6859.s3tc.ctex"
path.etc2="res://.godot/imported/clay_roof_tiles_02_rough_4k.png-e6cb436c6ff4afdea2a51fc78cdc6859.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/clay_roof_tiles_02_rough_4k.png"
dest_files=["res://.godot/imported/clay_roof_tiles_02_rough_4k.png-e6cb436c6ff4afdea2a51fc78cdc6859.s3tc.ctex", "res://.godot/imported/clay_roof_tiles_02_rough_4k.png-e6cb436c6ff4afdea2a51fc78cdc6859.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://q8t2qoldgk82"
path.s3tc="res://.godot/imported/patterned_paving_02_diff_4k.jpg-c6ee059f93e958798864fe8d9db3e0ef.s3tc.ctex"
path.etc2="res://.godot/imported/patterned_paving_02_diff_4k.jpg-c6ee059f93e958798864fe8d9db3e0ef.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/patterned_paving_02_diff_4k.jpg"
dest_files=["res://.godot/imported/patterned_paving_02_diff_4k.jpg-c6ee059f93e958798864fe8d9db3e0ef.s3tc.ctex", "res://.godot/imported/patterned_paving_02_diff_4k.jpg-c6ee059f93e958798864fe8d9db3e0ef.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bxthsx73n827h"
path.s3tc="res://.godot/imported/patterned_paving_02_disp_4k.png-daefa5776b6478ffe3897406047e8fef.s3tc.ctex"
path.etc2="res://.godot/imported/patterned_paving_02_disp_4k.png-daefa5776b6478ffe3897406047e8fef.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/patterned_paving_02_disp_4k.png"
dest_files=["res://.godot/imported/patterned_paving_02_disp_4k.png-daefa5776b6478ffe3897406047e8fef.s3tc.ctex", "res://.godot/imported/patterned_paving_02_disp_4k.png-daefa5776b6478ffe3897406047e8fef.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b5vh20x8tvigd"
path.s3tc="res://.godot/imported/patterned_paving_02_nor_gl_4k.png-ff3cbcf6401937fecbf6812daa49f87a.s3tc.ctex"
path.etc2="res://.godot/imported/patterned_paving_02_nor_gl_4k.png-ff3cbcf6401937fecbf6812daa49f87a.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/patterned_paving_02_nor_gl_4k.png"
dest_files=["res://.godot/imported/patterned_paving_02_nor_gl_4k.png-ff3cbcf6401937fecbf6812daa49f87a.s3tc.ctex", "res://.godot/imported/patterned_paving_02_nor_gl_4k.png-ff3cbcf6401937fecbf6812daa49f87a.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dd7n608qw6wjy"
path.s3tc="res://.godot/imported/patterned_paving_02_rough_4k.png-60a85611c735eef075b0aa47e32ed6c6.s3tc.ctex"
path.etc2="res://.godot/imported/patterned_paving_02_rough_4k.png-60a85611c735eef075b0aa47e32ed6c6.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/patterned_paving_02_rough_4k.png"
dest_files=["res://.godot/imported/patterned_paving_02_rough_4k.png-60a85611c735eef075b0aa47e32ed6c6.s3tc.ctex", "res://.godot/imported/patterned_paving_02_rough_4k.png-60a85611c735eef075b0aa47e32ed6c6.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/materials/walls/textures/rock_wall_03_diff_4k.jpg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ne3nxvx6338v"
path.s3tc="res://.godot/imported/rock_wall_03_diff_4k.jpg-4adbda3b1f8e8232766d25539b5a03d4.s3tc.ctex"
path.etc2="res://.godot/imported/rock_wall_03_diff_4k.jpg-4adbda3b1f8e8232766d25539b5a03d4.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/rock_wall_03_diff_4k.jpg"
dest_files=["res://.godot/imported/rock_wall_03_diff_4k.jpg-4adbda3b1f8e8232766d25539b5a03d4.s3tc.ctex", "res://.godot/imported/rock_wall_03_diff_4k.jpg-4adbda3b1f8e8232766d25539b5a03d4.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/materials/walls/textures/rock_wall_03_disp_4k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cp25nnta7haq1"
path.s3tc="res://.godot/imported/rock_wall_03_disp_4k.png-0d0dc46b7d4cd4b82d0864d8870ed278.s3tc.ctex"
path.etc2="res://.godot/imported/rock_wall_03_disp_4k.png-0d0dc46b7d4cd4b82d0864d8870ed278.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/rock_wall_03_disp_4k.png"
dest_files=["res://.godot/imported/rock_wall_03_disp_4k.png-0d0dc46b7d4cd4b82d0864d8870ed278.s3tc.ctex", "res://.godot/imported/rock_wall_03_disp_4k.png-0d0dc46b7d4cd4b82d0864d8870ed278.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/materials/walls/textures/rock_wall_03_nor_gl_4k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://mc1ioc2s54jx"
path.s3tc="res://.godot/imported/rock_wall_03_nor_gl_4k.png-b18a23f6754f58a73c151d0f2295aac5.s3tc.ctex"
path.etc2="res://.godot/imported/rock_wall_03_nor_gl_4k.png-b18a23f6754f58a73c151d0f2295aac5.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/rock_wall_03_nor_gl_4k.png"
dest_files=["res://.godot/imported/rock_wall_03_nor_gl_4k.png-b18a23f6754f58a73c151d0f2295aac5.s3tc.ctex", "res://.godot/imported/rock_wall_03_nor_gl_4k.png-b18a23f6754f58a73c151d0f2295aac5.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/materials/walls/textures/rock_wall_03_rough_4k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://wky0g4ab2rsf"
path.s3tc="res://.godot/imported/rock_wall_03_rough_4k.png-3ba3ada829166ae83e32e01cd4364da9.s3tc.ctex"
path.etc2="res://.godot/imported/rock_wall_03_rough_4k.png-3ba3ada829166ae83e32e01cd4364da9.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/rock_wall_03_rough_4k.png"
dest_files=["res://.godot/imported/rock_wall_03_rough_4k.png-3ba3ada829166ae83e32e01cd4364da9.s3tc.ctex", "res://.godot/imported/rock_wall_03_rough_4k.png-3ba3ada829166ae83e32e01cd4364da9.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/materials/walls/textures/wood_planks_dirt_diff_4k.jpg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dm31fykckwfts"
path.s3tc="res://.godot/imported/wood_planks_dirt_diff_4k.jpg-4152d8d1931227d064fbf97b075b9334.s3tc.ctex"
path.etc2="res://.godot/imported/wood_planks_dirt_diff_4k.jpg-4152d8d1931227d064fbf97b075b9334.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/wood_planks_dirt_diff_4k.jpg"
dest_files=["res://.godot/imported/wood_planks_dirt_diff_4k.jpg-4152d8d1931227d064fbf97b075b9334.s3tc.ctex", "res://.godot/imported/wood_planks_dirt_diff_4k.jpg-4152d8d1931227d064fbf97b075b9334.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/materials/walls/textures/wood_planks_dirt_disp_4k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dunt7q5302f8i"
path.s3tc="res://.godot/imported/wood_planks_dirt_disp_4k.png-3a13bc3595b10649d9b46da9fc33d923.s3tc.ctex"
path.etc2="res://.godot/imported/wood_planks_dirt_disp_4k.png-3a13bc3595b10649d9b46da9fc33d923.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/wood_planks_dirt_disp_4k.png"
dest_files=["res://.godot/imported/wood_planks_dirt_disp_4k.png-3a13bc3595b10649d9b46da9fc33d923.s3tc.ctex", "res://.godot/imported/wood_planks_dirt_disp_4k.png-3a13bc3595b10649d9b46da9fc33d923.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cju0ury64ricq"
path.s3tc="res://.godot/imported/wood_planks_dirt_nor_gl_4k.png-078b342977d15f2ba8dec7d6bf8182a5.s3tc.ctex"
path.etc2="res://.godot/imported/wood_planks_dirt_nor_gl_4k.png-078b342977d15f2ba8dec7d6bf8182a5.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/wood_planks_dirt_nor_gl_4k.png"
dest_files=["res://.godot/imported/wood_planks_dirt_nor_gl_4k.png-078b342977d15f2ba8dec7d6bf8182a5.s3tc.ctex", "res://.godot/imported/wood_planks_dirt_nor_gl_4k.png-078b342977d15f2ba8dec7d6bf8182a5.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b8ukrfsw0x6q6"
path.s3tc="res://.godot/imported/wood_planks_dirt_rough_4k.png-1b25c1288e791143eb79273718a1ca6d.s3tc.ctex"
path.etc2="res://.godot/imported/wood_planks_dirt_rough_4k.png-1b25c1288e791143eb79273718a1ca6d.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/materials/walls/textures/wood_planks_dirt_rough_4k.png"
dest_files=["res://.godot/imported/wood_planks_dirt_rough_4k.png-1b25c1288e791143eb79273718a1ca6d.s3tc.ctex", "res://.godot/imported/wood_planks_dirt_rough_4k.png-1b25c1288e791143eb79273718a1ca6d.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -0,0 +1,188 @@
shader_type spatial;
uniform float blendSharpness;
uniform float specular = 0.0;
uniform vec4 albedoTint : source_color = vec4(1.0);
uniform float roughnessMultiplier = 1.0;
uniform vec4 floorAlbedoTint : source_color = vec4(1.0);
uniform float floorRoughnessMultiplier = 1.0;
uniform sampler2D textureMap : source_color;
uniform sampler2D roughnessMap : hint_roughness_gray;
uniform sampler2D normalMap : hint_normal;
uniform sampler2D heightMap : hint_default_white;
uniform float normalMapStrength : hint_range(0, 1) = 1.0;
uniform float uvScale = 1.0;
uniform bool enableFloor = false;
uniform sampler2D floorTextureMap : source_color;
uniform sampler2D floorRoughnessMap : hint_roughness_gray;
uniform sampler2D floorNormalMap : hint_normal;
uniform sampler2D floorHeightMap : hint_default_white;
uniform float floorUvScale = 1.0;
uniform bool enablePom = true;
uniform int heightMinLayers = 8;
uniform int heightMaxLayers = 64;
uniform float heightScale = 1.0;
varying vec3 worldPos;
varying vec3 worldNormal;
void vertex() {
// Transform the vertex position to world space
worldPos = (MODEL_MATRIX * vec4(VERTEX, 1.0)).xyz;
// Transform the vertex normal to world space
worldNormal = normalize((MODEL_MATRIX * vec4(NORMAL, 0.0)).xyz);
}
// TODO conditionals...
vec2 scaleUV(float yDot, vec2 uv) {
return uv * (enableFloor && yDot > 0.0 ? floorUvScale : uvScale);
}
// TODO conditionals...
vec4 sampleColor(float yDot, vec2 uv) {
return enableFloor && yDot > 0.0 ? texture(floorTextureMap, uv)*floorAlbedoTint : texture(textureMap, uv)*albedoTint;
}
// TODO conditionals...
vec4 sampleRoughness(float yDot, vec2 uv) {
return enableFloor && yDot > 0.0 ? texture(floorRoughnessMap, uv)*floorRoughnessMultiplier : texture(roughnessMap, uv)*roughnessMultiplier;
}
// TODO conditionals...
vec4 sampleHeight(float yDot, vec2 uv) {
return enableFloor && yDot > 0.0 ? texture(floorHeightMap, uv) : texture(heightMap, uv);
}
// TODO conditionals...
vec4 sampleNormal(float yDot, vec2 uv) {
return enableFloor && yDot > 0.0 ? texture(floorNormalMap, uv) : texture(normalMap, uv);
}
vec4 triplanarSample(vec2 uvX, vec2 uvY, vec2 uvZ, vec3 blend, float yDot) {
// Sample the texture using the calculated texture coordinates
vec4 texColorX = texture(textureMap, uvX);
vec4 texColorY = sampleColor(yDot, uvY);
vec4 texColorZ = texture(textureMap, uvZ);
// Blend the samples together
return texColorX * blend.x
+ texColorY * blend.y
+ texColorZ * blend.z;
}
vec4 triplanarRoughness(vec2 uvX, vec2 uvY, vec2 uvZ, vec3 blend, float yDot) {
// Sample the texture using the calculated texture coordinates
vec4 texColorX = texture(textureMap, uvX);
vec4 texColorY = sampleRoughness(yDot, uvY);
vec4 texColorZ = texture(textureMap, uvZ);
// Blend the samples together
return texColorX * blend.x
+ texColorY * blend.y
+ texColorZ * blend.z;
}
// The simplest appoach suggested in the goat's article:
// https://bgolus.medium.com/normal-mapping-for-a-triplanar-shader-10bf39dca05a
vec3 triplanarNormal(float yDot, vec2 uvX, vec2 uvY, vec2 uvZ, vec3 blend) {
// Tangent space normal maps
vec3 tnormalX = texture(normalMap, uvX).rgb;
vec3 tnormalY = sampleNormal(yDot, uvY).rgb;
vec3 tnormalZ = texture(normalMap, uvZ).rgb;
// Get the sign (-1 or 1) of the surface normal
vec3 axisSign = sign(worldNormal);
// Flip tangent normal z to account for surface normal facing
tnormalX.z *= axisSign.x;
tnormalY.z *= axisSign.y;
tnormalZ.z *= axisSign.z;
// Swizzle tangent normals to match world orientation and triblend
return normalize(
tnormalX.zyx * blend.x +
tnormalY.xzy * blend.y +
tnormalZ.xyz * blend.z
);
}
// Adapted from the tutorial. Changed to accept a viewDir which represents each plane.
// https://www.youtube.com/watch?v=LrnE5f3h2SU
vec2 pomUV(float yDot, vec2 m_base_uv, vec3 viewDir) {
float viewDot = dot(viewDir, vec3(1, 0, 0));
float minLayers = float(min(heightMinLayers, heightMaxLayers));
float maxLayers = float(max(heightMinLayers, heightMaxLayers));
float numLayers = mix(maxLayers, minLayers, abs(viewDot));
numLayers = clamp(numLayers, minLayers, maxLayers);
float layerDepth = 1.0f / numLayers;
vec2 uvOffset = viewDir.xy * heightScale / numLayers;
// tracks how "deep" we are on each iteration
float currentLayerDepth = 0.0;
// tracks how deep the heightmap; adjusted on each iteration as UVs shift
float depthMapValue = 1.0 - sampleHeight(yDot, m_base_uv).r;
// loop until the current layer is deeper than the heightmap (hit)
// the 100 iteration cap is because I'm paranoid
for (int i = 0; i < 100 && currentLayerDepth < depthMapValue; i++) {
m_base_uv -= uvOffset;
depthMapValue = 1.0 - sampleHeight(yDot, m_base_uv).r;
currentLayerDepth += layerDepth;
}
// occlusion (interpolate with prev value)
vec2 prevUV = m_base_uv + uvOffset;
float afterDepth = depthMapValue - currentLayerDepth;
float beforeDepth = 1.0 - sampleHeight(yDot, prevUV).r - currentLayerDepth + layerDepth;
float weight = afterDepth / (afterDepth - beforeDepth);
m_base_uv = prevUV * weight + m_base_uv * (1.0 - weight);
return m_base_uv;
}
void fragment() {
// Calculate blending
float yDot = dot(worldNormal, vec3(0.0, 1.0, 0.0));
vec3 blend = vec3(
smoothstep(blendSharpness, 1.0, abs(dot(worldNormal, vec3(1.0, 0.0, 0.0)))),
smoothstep(blendSharpness, 1.0, abs(yDot)),
smoothstep(blendSharpness, 1.0, abs(dot(worldNormal, vec3(0.0, 0.0, 1.0))))
);
// view dir will be swizzled to match coordinates
vec3 viewDir = normalize(CAMERA_POSITION_WORLD - worldPos);
// Calculate texture coordinates
vec2 texCoordX = worldPos.zy * uvScale;
vec2 texCoordY = scaleUV(yDot, worldPos.zx);
vec2 texCoordZ = worldPos.xy * uvScale;
// TODO conditionals...
if (enablePom) {
texCoordX = pomUV(yDot, texCoordX, viewDir.zyx);
texCoordY = pomUV(yDot, texCoordY, viewDir.zxy);
texCoordZ = pomUV(yDot, texCoordZ, viewDir.xyz);
}
// sample and output
SPECULAR = specular;
ALBEDO = triplanarSample(texCoordX, texCoordY, texCoordZ, blend, yDot).rgb;
ROUGHNESS = triplanarRoughness(texCoordX, texCoordY, texCoordZ, blend, yDot).r;
NORMAL = mix(worldNormal, triplanarNormal(yDot, texCoordX, texCoordY, texCoordZ, blend), normalMapStrength);
NORMAL = normalize((VIEW_MATRIX * vec4(NORMAL, 0.0)).xyz);
}
//void light() {
// // Called for every pixel for every light affecting the material.
// // Uncomment to replace the default light processing function with this one.
//}

View File

@@ -0,0 +1 @@
uid://clgsf8uqgmqa6

View File

@@ -0,0 +1,37 @@
[gd_resource type="ShaderMaterial" load_steps=10 format=3 uid="uid://crqalmyy5wynf"]
[ext_resource type="Shader" uid="uid://clgsf8uqgmqa6" path="res://assets/materials/walls/walls.gdshader" id="1_i648i"]
[ext_resource type="Texture2D" uid="uid://bxthsx73n827h" path="res://assets/materials/walls/textures/patterned_paving_02_disp_4k.png" id="2_4vhk1"]
[ext_resource type="Texture2D" uid="uid://b5vh20x8tvigd" path="res://assets/materials/walls/textures/patterned_paving_02_nor_gl_4k.png" id="3_ytvoj"]
[ext_resource type="Texture2D" uid="uid://q8t2qoldgk82" path="res://assets/materials/walls/textures/patterned_paving_02_diff_4k.jpg" id="4_4ogtk"]
[ext_resource type="Texture2D" uid="uid://dd7n608qw6wjy" path="res://assets/materials/walls/textures/patterned_paving_02_rough_4k.png" id="4_4vhk1"]
[ext_resource type="Texture2D" uid="uid://cp25nnta7haq1" path="res://assets/materials/walls/textures/rock_wall_03_disp_4k.png" id="5_0ulld"]
[ext_resource type="Texture2D" uid="uid://mc1ioc2s54jx" path="res://assets/materials/walls/textures/rock_wall_03_nor_gl_4k.png" id="6_llsjo"]
[ext_resource type="Texture2D" uid="uid://ne3nxvx6338v" path="res://assets/materials/walls/textures/rock_wall_03_diff_4k.jpg" id="7_l87d0"]
[ext_resource type="Texture2D" uid="uid://wky0g4ab2rsf" path="res://assets/materials/walls/textures/rock_wall_03_rough_4k.png" id="8_ytvoj"]
[resource]
render_priority = 0
shader = ExtResource("1_i648i")
shader_parameter/blendSharpness = 0.0
shader_parameter/specular = 0.08
shader_parameter/albedoTint = Color(1, 1, 1, 1)
shader_parameter/roughnessMultiplier = 1.0
shader_parameter/floorAlbedoTint = Color(0.99232787, 0.92830753, 0.851413, 1)
shader_parameter/floorRoughnessMultiplier = 1.0
shader_parameter/textureMap = ExtResource("7_l87d0")
shader_parameter/roughnessMap = ExtResource("8_ytvoj")
shader_parameter/normalMap = ExtResource("6_llsjo")
shader_parameter/heightMap = ExtResource("5_0ulld")
shader_parameter/normalMapStrength = 1.0
shader_parameter/uvScale = 0.3
shader_parameter/enableFloor = true
shader_parameter/floorTextureMap = ExtResource("4_4ogtk")
shader_parameter/floorRoughnessMap = ExtResource("4_4vhk1")
shader_parameter/floorNormalMap = ExtResource("3_ytvoj")
shader_parameter/floorHeightMap = ExtResource("2_4vhk1")
shader_parameter/floorUvScale = 0.5
shader_parameter/enablePom = true
shader_parameter/heightMinLayers = 8
shader_parameter/heightMaxLayers = 64
shader_parameter/heightScale = 0.2

View File

@@ -0,0 +1,33 @@
[gd_resource type="ShaderMaterial" load_steps=6 format=3 uid="uid://cy7yon430rfy3"]
[ext_resource type="Shader" uid="uid://clgsf8uqgmqa6" path="res://assets/materials/walls/walls.gdshader" id="1_roy1o"]
[ext_resource type="Texture2D" uid="uid://dunt7q5302f8i" path="res://assets/materials/walls/textures/wood_planks_dirt_disp_4k.png" id="2_roy1o"]
[ext_resource type="Texture2D" uid="uid://cju0ury64ricq" path="res://assets/materials/walls/textures/wood_planks_dirt_nor_gl_4k.png" id="3_ff2cr"]
[ext_resource type="Texture2D" uid="uid://b8ukrfsw0x6q6" path="res://assets/materials/walls/textures/wood_planks_dirt_rough_4k.png" id="4_ob11h"]
[ext_resource type="Texture2D" uid="uid://dm31fykckwfts" path="res://assets/materials/walls/textures/wood_planks_dirt_diff_4k.jpg" id="5_gbaep"]
[resource]
render_priority = 0
shader = ExtResource("1_roy1o")
shader_parameter/blendSharpness = 0.0
shader_parameter/specular = 0.08
shader_parameter/albedoTint = Color(1, 1, 1, 1)
shader_parameter/roughnessMultiplier = 1.0
shader_parameter/floorAlbedoTint = Color(0.6487552, 0.5087499, 0.40841186, 1)
shader_parameter/floorRoughnessMultiplier = 1.0
shader_parameter/textureMap = ExtResource("5_gbaep")
shader_parameter/roughnessMap = ExtResource("4_ob11h")
shader_parameter/normalMap = ExtResource("3_ff2cr")
shader_parameter/heightMap = ExtResource("2_roy1o")
shader_parameter/normalMapStrength = 1.0
shader_parameter/uvScale = 0.3
shader_parameter/enableFloor = true
shader_parameter/floorTextureMap = ExtResource("5_gbaep")
shader_parameter/floorRoughnessMap = ExtResource("4_ob11h")
shader_parameter/floorNormalMap = ExtResource("3_ff2cr")
shader_parameter/floorHeightMap = ExtResource("2_roy1o")
shader_parameter/floorUvScale = 0.5
shader_parameter/enablePom = true
shader_parameter/heightMinLayers = 8
shader_parameter/heightMaxLayers = 64
shader_parameter/heightScale = 1.0

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d1w1flf6xdy6f"
path.bptc="res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.bptc.ctex"
path.astc="res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.astc.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/sky/citrus_orchard_road_puresky_4k.exr"
dest_files=["res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.bptc.ctex", "res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.astc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -0,0 +1,9 @@
[gd_resource type="ProceduralSkyMaterial" format=3 uid="uid://bb4c25ot8f4rt"]
[resource]
sky_top_color = Color(0.68341744, 0.41567144, 0.87147236, 1)
sky_horizon_color = Color(0.9058611, 0.56007004, 0.5634753, 1)
ground_bottom_color = Color(0.68235296, 0.41568628, 0.87058824, 1)
ground_horizon_color = Color(0.90588236, 0.56078434, 0.5647059, 1)
ground_curve = 0.14420073
sun_angle_max = 10.0

BIN
assets/sky/sky_12_2k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dtkyhk8q5qitp"
path.s3tc="res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.s3tc.ctex"
path.etc2="res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/sky/sky_12_2k.png"
dest_files=["res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.s3tc.ctex", "res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/sky/sky_12_cubemap_2k/cubemap_layout.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://7v8n5l1jwqms"
path="res://.godot/imported/cubemap_layout.png-b6dae0db04ee7c9cbc9a7aadeb5ccab7.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/cubemap_layout.png"
dest_files=["res://.godot/imported/cubemap_layout.png-b6dae0db04ee7c9cbc9a7aadeb5ccab7.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/nx.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://hdkvbhxv74j6"
path="res://.godot/imported/nx.png-e15247724725306f62acfb90c21225be.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/nx.png"
dest_files=["res://.godot/imported/nx.png-e15247724725306f62acfb90c21225be.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/ny.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b5i6hyvrf6wr6"
path="res://.godot/imported/ny.png-edb2c080597642cc467608a8c1b7d3bd.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/ny.png"
dest_files=["res://.godot/imported/ny.png-edb2c080597642cc467608a8c1b7d3bd.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/nz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bujopqmkixx3e"
path="res://.godot/imported/nz.png-af180c68b72cd850f86875d2f15512e2.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/nz.png"
dest_files=["res://.godot/imported/nz.png-af180c68b72cd850f86875d2f15512e2.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/px.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://balk16vpipwxi"
path="res://.godot/imported/px.png-7ea47271df79321386b0e32cb687208d.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/px.png"
dest_files=["res://.godot/imported/px.png-7ea47271df79321386b0e32cb687208d.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/py.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cf2j8rtis5j7m"
path="res://.godot/imported/py.png-0d93a31a98aa56298cb968aa366790ff.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/py.png"
dest_files=["res://.godot/imported/py.png-0d93a31a98aa56298cb968aa366790ff.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/pz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bm7ihmtlp53ae"
path="res://.godot/imported/pz.png-651528e7a908f53bf85a39c4afb837c5.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/pz.png"
dest_files=["res://.godot/imported/pz.png-651528e7a908f53bf85a39c4afb837c5.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_2k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ca4kkq3w8cd4n"
path.s3tc="res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.s3tc.ctex"
path.etc2="res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/sky/sky_15_2k.png"
dest_files=["res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.s3tc.ctex", "res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/sky/sky_15_cubemap_2k/cubemap_layout.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d1glcaopf33pm"
path="res://.godot/imported/cubemap_layout.png-6cd743dfe803537ed52cf90d8f87fc09.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/cubemap_layout.png"
dest_files=["res://.godot/imported/cubemap_layout.png-6cd743dfe803537ed52cf90d8f87fc09.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/nx.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ha35oqdprgxn"
path="res://.godot/imported/nx.png-9940f01cf2d318eac22e77aed0924dea.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/nx.png"
dest_files=["res://.godot/imported/nx.png-9940f01cf2d318eac22e77aed0924dea.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/ny.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://7nv6cngqgxck"
path="res://.godot/imported/ny.png-aa2c4907898777556ecbcdf7f8c9cc9b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/ny.png"
dest_files=["res://.godot/imported/ny.png-aa2c4907898777556ecbcdf7f8c9cc9b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/nz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bmpoy5dldy4qb"
path="res://.godot/imported/nz.png-353d3b652e87892a2437b1cd16e570dc.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/nz.png"
dest_files=["res://.godot/imported/nz.png-353d3b652e87892a2437b1cd16e570dc.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/px.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://qsqveq4oifw4"
path="res://.godot/imported/px.png-34404ac21659a59edf3d6c7f85f54bcb.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/px.png"
dest_files=["res://.godot/imported/px.png-34404ac21659a59edf3d6c7f85f54bcb.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/py.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://m3475w1xwy25"
path="res://.godot/imported/py.png-9566cd2f8ccdd1ce1116f23c6b3eb3a1.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/py.png"
dest_files=["res://.godot/imported/py.png-9566cd2f8ccdd1ce1116f23c6b3eb3a1.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/pz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cpebv08pjd3m5"
path="res://.godot/imported/pz.png-dc8cc0e23d6ad35898672269481b4221.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/pz.png"
dest_files=["res://.godot/imported/pz.png-dc8cc0e23d6ad35898672269481b4221.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

View File

@@ -0,0 +1,88 @@
shader_type spatial;
uniform vec3 albedo : source_color;
uniform vec3 albedo2 : source_color;
uniform float metallic : hint_range(0.0, 1.0, 0.01) = 0;
uniform float roughness : hint_range(0.0, 1.0, 0.01) = 0.02;
uniform sampler2D texture_normal;
uniform sampler2D texture_normal2;
uniform vec2 wave_direction = vec2(0.0, 0.0);
uniform vec2 wave_direction2 = vec2(0.0, 0.0);
uniform float time_scale : hint_range(0.0, 0.2, 0.005) = 0.025;
uniform sampler2D depth_texture : hint_depth_texture, repeat_disable, filter_nearest;
uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest;
uniform vec4 color_deep : source_color;
uniform vec4 color_shallow : source_color;
uniform float beers_law = 2.0;
uniform float depth_offset = -0.75;
uniform float depth_color_change = 5.0;
uniform float edge_scale = 0.1;
uniform float near = 1.0;
uniform float far = 100.0;
uniform vec3 edge_color : source_color;
uniform sampler2D waves;
uniform float noise_scale = 10.0;
uniform float height_scale = 0.15;
varying float height;
varying vec3 world_pos;
float fresnel(float amount, vec3 normal, vec3 view)
{
return pow((1.0 - clamp(dot(normalize(normal), normalize(view)), 0.0, 1.0)), amount);
}
float edge(float depth)
{
depth = 1.0 - 2.0*depth;
return near * far / (far + depth * (near - far));
}
void vertex() {
world_pos = (MODEL_MATRIX * vec4(VERTEX, 1.0)).xyz;
height = texture(waves, world_pos.xz / noise_scale + TIME * time_scale).r;
VERTEX.y += height * height_scale;
}
void fragment() {
float depth_tex = clamp(pow(texture(depth_texture, SCREEN_UV).r * depth_color_change, 5.0), 0.0, 1.0);
float depth = PROJECTION_MATRIX[3][2] / (clamp(depth_tex, 0.0, 1.0) + PROJECTION_MATRIX[2][2]);
float depth_blend = exp((depth+VERTEX.z + depth_offset) * -beers_law);
depth_blend = clamp(1.0 - depth_blend, 0.0, 1.0);
float depth_blend_power = clamp(pow(depth_blend, 2.5), 0.0, 1.0);
vec3 screen_color = textureLod(screen_texture, SCREEN_UV, 0.0).rgb;
vec3 depth_color = mix(color_shallow.rgb, color_deep.rgb, depth_blend_power);
vec3 color = mix(screen_color*depth_color, depth_color*0.25, depth_blend_power*0.5);
float z_depth = edge(texture(depth_texture, SCREEN_UV).x);
float z_pos = edge(FRAGCOORD.z);
float z_dif = z_depth - z_pos;
vec2 time = (TIME * wave_direction) * time_scale;
vec2 time2 = (TIME * wave_direction2) * time_scale;
vec3 normal = mix(texture(texture_normal, world_pos.xz/(noise_scale*2.0) + time).rgb, texture(texture_normal2, world_pos.xz/noise_scale + time2).rgb, 0.5);
float fresnel_alpha = fresnel(5.0, NORMAL, VIEW);
vec3 surface_color = mix(albedo, albedo2, fresnel_alpha);
vec3 surface_and_depth_color = mix(surface_color, color, 0.75);
vec3 with_edges = mix(edge_color, surface_color, step(edge_scale, z_dif));
ALBEDO = vec3(surface_color);
METALLIC = metallic;
ROUGHNESS = roughness;
NORMAL_MAP = normal;
}
//void light() {
// // Called for every pixel for every light affecting the material.
// // Uncomment to replace the default light processing function with this one.
//}

View File

@@ -0,0 +1 @@
uid://l11jog608jo1

56
assets/water/water.tres Normal file
View File

@@ -0,0 +1,56 @@
[gd_resource type="ShaderMaterial" load_steps=8 format=3 uid="uid://bibpkiinj8gq7"]
[ext_resource type="Shader" uid="uid://l11jog608jo1" path="res://assets/water/water.gdshader" id="1_441rt"]
[sub_resource type="FastNoiseLite" id="FastNoiseLite_441rt"]
noise_type = 3
fractal_type = 2
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_qceba"]
noise = SubResource("FastNoiseLite_441rt")
seamless = true
as_normal_map = true
bump_strength = 6.9
[sub_resource type="FastNoiseLite" id="FastNoiseLite_v5uja"]
noise_type = 3
seed = 10
fractal_type = 2
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_oqpjr"]
noise = SubResource("FastNoiseLite_v5uja")
seamless = true
as_normal_map = true
bump_strength = 2.4
[sub_resource type="FastNoiseLite" id="FastNoiseLite_qceba"]
fractal_octaves = 3
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_v5uja"]
noise = SubResource("FastNoiseLite_qceba")
seamless = true
[resource]
render_priority = 0
shader = ExtResource("1_441rt")
shader_parameter/albedo = Color(0, 0.32156864, 0.43137255, 1)
shader_parameter/albedo2 = Color(0.23849446, 0.558395, 0.6758933, 1)
shader_parameter/metallic = 0.01999999955296
shader_parameter/roughness = 0.01999999955296
shader_parameter/texture_normal = SubResource("NoiseTexture2D_qceba")
shader_parameter/texture_normal2 = SubResource("NoiseTexture2D_oqpjr")
shader_parameter/wave_direction = Vector2(2, 0)
shader_parameter/wave_direction2 = Vector2(0, 1)
shader_parameter/time_scale = 0.0249999994412
shader_parameter/color_deep = Color(0, 0.32156864, 0.43137255, 1)
shader_parameter/color_shallow = Color(0.37512296, 0.8792228, 0.9831924, 1)
shader_parameter/beers_law = 0.01
shader_parameter/depth_offset = -0.75
shader_parameter/depth_color_change = 73.16
shader_parameter/edge_scale = 0.395
shader_parameter/near = 1.0
shader_parameter/far = 100.0
shader_parameter/edge_color = Color(0.816028, 0.99999994, 0.9852888, 1)
shader_parameter/waves = SubResource("NoiseTexture2D_v5uja")
shader_parameter/noise_scale = 10.0
shader_parameter/height_scale = 0.1

13
assets/water/water.tscn Normal file
View File

@@ -0,0 +1,13 @@
[gd_scene load_steps=3 format=3 uid="uid://c066hc7yu36wx"]
[ext_resource type="Material" uid="uid://bibpkiinj8gq7" path="res://assets/water/water.tres" id="1_6nw2d"]
[sub_resource type="PlaneMesh" id="PlaneMesh_i6g1k"]
size = Vector2(1, 1)
subdivide_width = 200
subdivide_depth = 200
[node name="Water" type="MeshInstance3D"]
cast_shadow = 0
mesh = SubResource("PlaneMesh_i6g1k")
surface_material_override/0 = ExtResource("1_6nw2d")

0
authoring/.gdignore Normal file
View File

Binary file not shown.

Binary file not shown.

View File

@@ -2,12 +2,12 @@
[ext_resource type="Texture2D" uid="uid://bgw8xgbwc2flx" path="res://godot_state_charts_examples/history_states/white_rectangle.svg" id="1_3v23e"]
[ext_resource type="PackedScene" uid="uid://bcwkugn6v3oy7" path="res://addons/godot_state_charts/utilities/state_chart_debugger.tscn" id="2_fgw1q"]
[ext_resource type="Script" path="res://addons/godot_state_charts/state_chart.gd" id="2_pqmip"]
[ext_resource type="Script" path="res://godot_state_charts_examples/history_states/history_demo.gd" id="2_vphtk"]
[ext_resource type="Script" path="res://addons/godot_state_charts/compound_state.gd" id="3_nsw2j"]
[ext_resource type="Script" path="res://addons/godot_state_charts/history_state.gd" id="4_0qaqv"]
[ext_resource type="Script" path="res://addons/godot_state_charts/atomic_state.gd" id="5_lh5sp"]
[ext_resource type="Script" path="res://addons/godot_state_charts/transition.gd" id="6_xvm5g"]
[ext_resource type="Script" uid="uid://couw105c3bde4" path="res://addons/godot_state_charts/state_chart.gd" id="2_pqmip"]
[ext_resource type="Script" uid="uid://bad613wfktgah" path="res://godot_state_charts_examples/history_states/history_demo.gd" id="2_vphtk"]
[ext_resource type="Script" uid="uid://jk2jm1g6q853" path="res://addons/godot_state_charts/compound_state.gd" id="3_nsw2j"]
[ext_resource type="Script" uid="uid://b4dwolbvt8our" path="res://addons/godot_state_charts/history_state.gd" id="4_0qaqv"]
[ext_resource type="Script" uid="uid://cytafq8i1y8qm" path="res://addons/godot_state_charts/atomic_state.gd" id="5_lh5sp"]
[ext_resource type="Script" uid="uid://cf1nsco3w0mf6" path="res://addons/godot_state_charts/transition.gd" id="6_xvm5g"]
[ext_resource type="Theme" uid="uid://s2bj74tt0y7f" path="res://godot_state_charts_examples/new_theme.tres" id="8_najew"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_kl3ga"]

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 637 B

View File

@@ -1,36 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://lp2pt8mtj7ty"
path.s3tc="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex"
path.etc2="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png"
dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex", "res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -1,33 +0,0 @@
using Godot;
// This script is an example of how you can create game systems that
// interact with PlayerController. This script applies a low gravity effect
// to any PlayerController that enters the Area3D. It does this by modifying
// the value of AdditionalGravityPower owned by the Gravity child of
// PlayerController.
namespace Movementtests.player_controller.Examples.MovementTestbed;
public partial class LowGravityArea3D : Area3D
{
[Export] public float GravityReduction { set; get; } = 0.4f;
public override void _Ready()
{
BodyEntered += (Node3D body) =>
{
if (body is PlayerController player) {
player.Gravity.AdditionalGravityPower *= GravityReduction;
GD.Print("Low Gravity Zone Entered");
}
};
BodyExited += (Node3D body) =>
{
if (body is PlayerController player) {
player.Gravity.AdditionalGravityPower /= GravityReduction;
GD.Print("Low Gravity Zone Exited");
}
};
}
}

View File

@@ -1 +0,0 @@
uid://ctypnlbfptf03

File diff suppressed because one or more lines are too long

View File

@@ -1,31 +1,32 @@
[gd_scene load_steps=41 format=3 uid="uid://bei4nhkf8lwdo"]
[gd_scene load_steps=43 format=3 uid="uid://bei4nhkf8lwdo"]
[ext_resource type="Script" uid="uid://bbbrf5ckydfna" path="res://player_controller/Scripts/PlayerController.cs" id="1_poq2x"]
[ext_resource type="Curve" uid="uid://c2a8soliruf35" path="res://systems/dash/dash_time_dilation.tres" id="2_2q0ik"]
[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="3_cresl"]
[ext_resource type="Resource" uid="uid://cpdaw41ah5gic" path="res://systems/inputs/base_mode/rotate_y.tres" id="4_rxwoh"]
[ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="5_4u7i3"]
[ext_resource type="Script" uid="uid://dv7v1ywmbvvcd" path="res://player_controller/Scripts/HealthSystem.cs" id="5_umw0l"]
[ext_resource type="Script" uid="uid://vuq8rjq3vegn" path="res://player_controller/Scripts/Stamina.cs" id="6_lxtc4"]
[ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://player_controller/Scripts/StairsSystem.cs" id="7_bmt5a"]
[ext_resource type="Resource" uid="uid://dgfww8118d8gj" path="res://systems/inputs/base_mode/aim.tres" id="7_cresl"]
[ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/base_mode/aim_release.tres" id="8_lhb11"]
[ext_resource type="Script" uid="uid://dd1yrt7eiiyf4" path="res://player_controller/Scripts/CapsuleCollider.cs" id="8_lmtjd"]
[ext_resource type="Resource" uid="uid://c3e0ivgaxrsyb" path="res://systems/inputs/base_mode/aim_down.tres" id="8_obsfv"]
[ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="8_qu4wy"]
[ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/base_mode/aim_cancel.tres" id="9_5p2qc"]
[ext_resource type="Script" uid="uid://bt0xv2q8iv1vn" path="res://player_controller/Scripts/Gravity.cs" id="9_lsueh"]
[ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="9_nob5r"]
[ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="10_4u7i3"]
[ext_resource type="Script" uid="uid://g8idirw62qe0" path="res://player_controller/Scripts/Bobbing.cs" id="10_7wk1w"]
[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/empower_down.tres" id="10_nodcl"]
[ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="11_cresl"]
[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/empower_release.tres" id="11_ruloh"]
[ext_resource type="PackedScene" uid="uid://0ysqmqphq6mq" path="res://systems/head/head_system.tscn" id="11_rxwoh"]
[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/drop.tres" id="12_34snm"]
[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="12_34snm"]
[ext_resource type="Script" uid="uid://b6k73aj5povgv" path="res://player_controller/Scripts/FieldOfView.cs" id="12_m2mxi"]
[ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="13_nob5r"]
[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="13_r7i3q"]
[ext_resource type="Resource" uid="uid://bw5k2gsv3jqcv" path="res://systems/inputs/base_mode/throw.tres" id="16_nob5r"]
[ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"]
[ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="17_h6vvl"]
[ext_resource type="PackedScene" uid="uid://cqduhd4opgwvm" path="res://systems/dash/dash_system.tscn" id="18_q5h8a"]
[ext_resource type="Script" uid="uid://dyy5njw6pxoh4" path="res://systems/move/MoveSystem.cs" id="20_rxwoh"]
[ext_resource type="PackedScene" uid="uid://dbe5f0p6lvqtr" path="res://systems/tween_queue/tween_queue_system.tscn" id="22_rpwev"]
[ext_resource type="PackedScene" uid="uid://bcwkugn6v3oy7" path="res://addons/godot_state_charts/utilities/state_chart_debugger.tscn" id="24_q5h8a"]
[ext_resource type="Script" uid="uid://couw105c3bde4" path="res://addons/godot_state_charts/state_chart.gd" id="25_wv70j"]
@@ -38,6 +39,7 @@
[ext_resource type="Script" uid="uid://bhuwv2nlcrunt" path="res://player_controller/PlayerUi.cs" id="30_2ghaa"]
[ext_resource type="Texture2D" uid="uid://bnwj7ltdfximr" path="res://icon.svg" id="30_h23go"]
[ext_resource type="Texture2D" uid="uid://chvt6g0xn5c2m" path="res://systems/dash/light-ring.jpg" id="32_lgpc8"]
[ext_resource type="Script" uid="uid://b4dwolbvt8our" path="res://addons/godot_state_charts/history_state.gd" id="41_ruloh"]
[sub_resource type="CapsuleMesh" id="CapsuleMesh_xc2g5"]
height = 1.7
@@ -47,10 +49,29 @@ blend_mode = 1
[node name="Player" type="CharacterBody3D"]
script = ExtResource("1_poq2x")
TimeScaleAimInAir = 0.15
MaxJumpBoostAfterDashing = 0.7
MaxNumberOfDashActions = 2
DashTimeDilationCurve = ExtResource("2_2q0ik")
WalkSpeed = 7.5
AccelerationAir = 2.0
DecelerationAir = 0.1
Weight = 5.0
MantleTime = 0.2
SimpleJumpStartVelocity = 8.0
SimpleJumpHangTimeInFrames = 1
SimpleJumpGravityLesseningFactor = 2.5
DoubleJumpStartVelocity = 15.0
DoubleJumpHangTimeInFrames = 3
DoubleJumpGravityLesseningFactor = 1.5
MegaJumpStartVelocity = 30.0
MegaJumpHangTimeInFrames = 12
MegaJumpGravityLesseningFactor = 1.2
WallJumpStartVelocity = 8.0
MaxNumberOfEmpoweredActions = 3
SimpleDashStrength = 15.0
PoweredDashStrength = 30.0
AimedDashTime = 0.2
PostDashSpeed = 30.0
WallHugGravityLesseningFactor = 15.0
WallHugDownwardMaxSpeed = 8.0
WallHugHorizontalDeceleration = 0.5
[node name="InputController" type="Node3D" parent="."]
script = ExtResource("16_v31n3")
@@ -58,13 +79,17 @@ base_mode = ExtResource("3_cresl")
move = ExtResource("17_h6vvl")
rotate_y = ExtResource("4_rxwoh")
rotate_floorplane = ExtResource("5_4u7i3")
aim_pressed = ExtResource("7_cresl")
aim_down = ExtResource("8_obsfv")
aim_pressed = ExtResource("9_nob5r")
aim_released = ExtResource("8_lhb11")
aim_canceled = ExtResource("9_5p2qc")
jump = ExtResource("10_4u7i3")
jump_pressed = ExtResource("13_nob5r")
empower_down = ExtResource("10_nodcl")
empower_released = ExtResource("11_ruloh")
aim_canceled = ExtResource("9_5p2qc")
hit = ExtResource("11_cresl")
drop = ExtResource("12_34snm")
dash = ExtResource("12_34snm")
throw = ExtResource("16_nob5r")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
@@ -74,6 +99,7 @@ mesh = SubResource("CapsuleMesh_xc2g5")
[node name="CapsuleCollider" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
shape = ExtResource("13_r7i3q")
debug_color = Color(0, 0.6, 0.701961, 0.341176)
script = ExtResource("8_lmtjd")
CapsuleDefaultHeight = 1.7
@@ -126,18 +152,6 @@ target_position = Vector3(0, 1, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.296, 1.4, 0)
target_position = Vector3(0, 1, 0)
[node name="MoveSystem" type="Node3D" parent="."]
script = ExtResource("20_rxwoh")
WalkSpeed = 7.2
DecelerationSpeedFactorFloor = 7.0
ApexHoldTime = 0.1
[node name="Gravity" type="Node3D" parent="."]
script = ExtResource("9_lsueh")
Weight = 3.5
StartVelocity = 0.7
JumpFromDashSpeedFactor = 4.0
[node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")]
[node name="WallHugSystem" type="Node3D" parent="."]
@@ -171,12 +185,11 @@ transform = Transform3D(1, 0, 0, 0, 0.173648, -0.984808, 0, 0.984808, 0.173648,
ThrowForce = 15.0
StraightThrowDuration = 0.05
[node name="CoyoteTime" type="Timer" parent="."]
wait_time = 0.2
[node name="DashCooldown" type="Timer" parent="."]
one_shot = true
[node name="DashCooldown" type="Timer" parent="."]
wait_time = 0.2
[node name="PowerCooldown" type="Timer" parent="."]
wait_time = 2.0
one_shot = true
[node name="TimeScaleAimInAir" type="Timer" parent="."]
@@ -184,15 +197,12 @@ wait_time = 2.0
one_shot = true
ignore_time_scale = true
[node name="TimeAfterDashing" type="Timer" parent="."]
wait_time = 0.3
one_shot = true
[node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")]
offset_left = 1524.0
offset_top = 1.0
offset_right = -8.0
offset_bottom = 1.0
enabled = false
initial_node_to_watch = NodePath("../StateChart")
[node name="UI" type="CanvasLayer" parent="."]
@@ -225,6 +235,13 @@ layout_mode = 2
texture = ExtResource("30_h23go")
expand_mode = 2
[node name="DashCooldownIndicator" type="ColorRect" parent="UI"]
unique_name_in_owner = true
offset_left = 910.0
offset_top = 549.0
offset_right = 1010.0
offset_bottom = 559.0
[node name="CenterContainer" type="CenterContainer" parent="UI"]
custom_minimum_size = Vector2(1920, 1080)
offset_right = 1919.0
@@ -237,13 +254,6 @@ layout_mode = 2
texture = ExtResource("32_lgpc8")
expand_mode = 1
[node name="DashIndicator" type="TextureRect" parent="UI/CenterContainer"]
unique_name_in_owner = true
material = SubResource("CanvasItemMaterial_2q0ik")
layout_mode = 2
texture = ExtResource("32_lgpc8")
expand_mode = 1
[node name="StateChart" type="Node" parent="."]
script = ExtResource("25_wv70j")
metadata/_custom_type_script = "uid://couw105c3bde4"
@@ -251,99 +261,148 @@ metadata/_custom_type_script = "uid://couw105c3bde4"
[node name="Root" type="Node" parent="StateChart"]
script = ExtResource("27_infe6")
[node name="Actions" type="Node" parent="StateChart/Root"]
[node name="Aim" type="Node" parent="StateChart/Root"]
script = ExtResource("26_infe6")
initial_state = NodePath("WeaponInHand")
metadata/_custom_type_script = "uid://c1vp0ojjvaby1"
initial_state = NodePath("Off")
[node name="AimCanceled" type="Node" parent="StateChart/Root/Actions"]
script = ExtResource("27_34snm")
[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/AimCanceled"]
[node name="ToOff" type="Node" parent="StateChart/Root/Aim"]
script = ExtResource("28_n7qhm")
to = NodePath("../../WeaponInHand")
to = NodePath("../Off")
event = &"aim_released"
delay_in_seconds = "0.0"
[node name="WeaponInHand" type="Node" parent="StateChart/Root/Actions"]
[node name="Off" type="Node" parent="StateChart/Root/Aim"]
script = ExtResource("27_34snm")
[node name="ToAiming" type="Node" parent="StateChart/Root/Actions/WeaponInHand"]
[node name="ToOn" type="Node" parent="StateChart/Root/Aim/Off"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Aiming")
to = NodePath("../../On")
event = &"aim_down"
delay_in_seconds = "0.0"
[node name="Aiming" type="Node" parent="StateChart/Root/Actions"]
[node name="On" type="Node" parent="StateChart/Root/Aim"]
script = ExtResource("27_34snm")
[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/Aiming"]
[node name="ToCancel" type="Node" parent="StateChart/Root/Aim/On"]
script = ExtResource("28_n7qhm")
to = NodePath("../../AimCanceled")
event = &"aim_canceled"
to = NodePath("../../Canceled")
event = &"cancel_aim"
delay_in_seconds = "0.0"
[node name="ToDashing" type="Node" parent="StateChart/Root/Actions/Aiming"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Dashing")
event = &"aim_released"
delay_in_seconds = "0.0"
[node name="ToWeaponThrown" type="Node" parent="StateChart/Root/Actions/Aiming"]
script = ExtResource("28_n7qhm")
to = NodePath("../../WeaponThrown")
event = &"hit_pressed"
delay_in_seconds = "0.0"
[node name="Dashing" type="Node" parent="StateChart/Root/Actions"]
[node name="Canceled" type="Node" parent="StateChart/Root/Aim"]
script = ExtResource("27_34snm")
[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/Dashing"]
script = ExtResource("28_n7qhm")
to = NodePath("../../WeaponInHand")
event = &"dash_ended"
delay_in_seconds = "0.0"
[node name="Empower" type="Node" parent="StateChart/Root"]
script = ExtResource("26_infe6")
initial_state = NodePath("Off")
[node name="ToHanging" type="Node" parent="StateChart/Root/Actions/Dashing"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Hanging")
event = &"dash_to_planted"
delay_in_seconds = "0.0"
[node name="WeaponThrown" type="Node" parent="StateChart/Root/Actions"]
[node name="Off" type="Node" parent="StateChart/Root/Empower"]
script = ExtResource("27_34snm")
[node name="OnAim" type="Node" parent="StateChart/Root/Actions/WeaponThrown"]
[node name="ToOn" type="Node" parent="StateChart/Root/Empower/Off"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Dashing")
event = &"aim_pressed"
to = NodePath("../../On")
event = &"empower_down"
delay_in_seconds = "0.0"
[node name="Hanging" type="Node" parent="StateChart/Root/Actions"]
[node name="On" type="Node" parent="StateChart/Root/Empower"]
script = ExtResource("27_34snm")
[node name="OnJump" type="Node" parent="StateChart/Root/Actions/Hanging"]
[node name="ToOff" type="Node" parent="StateChart/Root/Empower/On"]
script = ExtResource("28_n7qhm")
to = NodePath("../../WeaponInHand")
event = &"jump"
to = NodePath("../../Off")
event = &"empower_released"
delay_in_seconds = "0.0"
[node name="OnDrop" type="Node" parent="StateChart/Root/Actions/Hanging"]
[node name="PowerReserve" type="Node" parent="StateChart/Root"]
script = ExtResource("26_infe6")
initial_state = NodePath("Full")
[node name="ToExpired" type="Node" parent="StateChart/Root/PowerReserve"]
script = ExtResource("28_n7qhm")
to = NodePath("../../WeaponInHand")
event = &"crouch"
to = NodePath("../Expired")
event = &"expired"
delay_in_seconds = "0.0"
[node name="OnMantle" type="Node" parent="StateChart/Root/Actions/Hanging"]
[node name="Recharge" type="Node" parent="StateChart/Root/PowerReserve"]
script = ExtResource("28_n7qhm")
to = NodePath("../../WeaponInHand")
event = &"mantle"
to = NodePath("../AtLeastOneCharge")
event = &"recharge"
delay_in_seconds = "0.0"
[node name="ToFull" type="Node" parent="StateChart/Root/PowerReserve"]
script = ExtResource("28_n7qhm")
to = NodePath("../Full")
event = &"fully_charged"
delay_in_seconds = "0.0"
[node name="Expired" type="Node" parent="StateChart/Root/PowerReserve"]
script = ExtResource("27_34snm")
[node name="AtLeastOneCharge" type="Node" parent="StateChart/Root/PowerReserve"]
script = ExtResource("27_34snm")
[node name="Full" type="Node" parent="StateChart/Root/PowerReserve"]
script = ExtResource("27_34snm")
[node name="PowerUsed" type="Node" parent="StateChart/Root/PowerReserve/Full"]
script = ExtResource("28_n7qhm")
to = NodePath("../../AtLeastOneCharge")
event = &"power_used"
delay_in_seconds = "0.0"
[node name="WeaponState" type="Node" parent="StateChart/Root"]
script = ExtResource("26_infe6")
initial_state = NodePath("InHand")
metadata/_custom_type_script = "uid://c1vp0ojjvaby1"
[node name="ToPlanted" type="Node" parent="StateChart/Root/WeaponState"]
script = ExtResource("28_n7qhm")
to = NodePath("../Planted")
event = &"plant_weapon"
delay_in_seconds = "0.0"
[node name="ToHand" type="Node" parent="StateChart/Root/WeaponState"]
script = ExtResource("28_n7qhm")
to = NodePath("../InHand")
event = &"recover_weapond"
delay_in_seconds = "0.0"
[node name="InHand" type="Node" parent="StateChart/Root/WeaponState"]
script = ExtResource("27_34snm")
[node name="ToThrown" type="Node" parent="StateChart/Root/WeaponState/InHand"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Flying")
event = &"throw"
delay_in_seconds = "0.0"
[node name="Flying" type="Node" parent="StateChart/Root/WeaponState"]
script = ExtResource("27_34snm")
[node name="ToPlanted" type="Node" parent="StateChart/Root/WeaponState/Flying"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Planted")
event = &"plant_weapon"
delay_in_seconds = "0.0"
[node name="Planted" type="Node" parent="StateChart/Root/WeaponState"]
script = ExtResource("27_34snm")
[node name="Movement" type="Node" parent="StateChart/Root"]
script = ExtResource("26_infe6")
initial_state = NodePath("Grounded")
[node name="Reset" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("41_ruloh")
default_state = NodePath("../Grounded")
[node name="OnFall" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("28_n7qhm")
to = NodePath("../Airborne/Falling")
event = &"falling"
delay_in_seconds = "0.0"
[node name="OnMantle" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("28_n7qhm")
to = NodePath("../Mantling")
@@ -352,117 +411,179 @@ delay_in_seconds = "0.0"
[node name="OnHang" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("28_n7qhm")
to = NodePath("../Hanging")
to = NodePath("../OnWall/Hanging")
event = &"dash_to_planted"
delay_in_seconds = "0.0"
[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("26_infe6")
initial_state = NodePath("Standing")
[node name="Standing" type="Node" parent="StateChart/Root/Movement/Grounded"]
script = ExtResource("27_34snm")
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
[node name="OnPoweredDash" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/Jump")
event = &"jump"
to = NodePath("../Dashing/PoweredDash")
event = &"powered_dash"
delay_in_seconds = "0.0"
[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
[node name="OnAimedDash" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/CoyoteEnabled")
event = &"start_falling"
to = NodePath("../Dashing/AimedDash")
event = &"aimed_dash"
delay_in_seconds = "0.0"
[node name="OnCrouch" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
[node name="OnWeaponDash" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Crouched")
event = &"crouch"
to = NodePath("../Dashing/ToWeaponDash")
event = &"weapon_dash"
delay_in_seconds = "0.0"
[node name="Crouched" type="Node" parent="StateChart/Root/Movement/Grounded"]
script = ExtResource("27_34snm")
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded/Crouched"]
[node name="ToPlantedWeapon" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/Jump")
event = &"jump"
delay_in_seconds = "0.0"
[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded/Crouched"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/CoyoteEnabled")
event = &"start_falling"
delay_in_seconds = "0.0"
[node name="OnStandUp" type="Node" parent="StateChart/Root/Movement/Grounded/Crouched"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Standing")
event = &"crouch"
to = NodePath("../OnWall/Hanging")
event = &"to_planted"
delay_in_seconds = "0.0"
[node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("27_34snm")
[node name="ToGrounded" type="Node" parent="StateChart/Root/Movement/Mantling"]
[node name="OnMantleFinished" type="Node" parent="StateChart/Root/Movement/Mantling"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Grounded/Standing")
event = &"to_grounded"
to = NodePath("../../Grounded")
event = &"grounded"
delay_in_seconds = "0.0"
[node name="Hanging" type="Node" parent="StateChart/Root/Movement"]
[node name="Jump" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("26_infe6")
initial_state = NodePath("SimpleJump")
[node name="SimpleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
script = ExtResource("27_34snm")
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Hanging"]
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Airborne/JumpFromWall")
to = NodePath("../../MegaJump")
event = &"megajump"
delay_in_seconds = "0.0"
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/DoubleJumpEnabled")
event = &"jump_ended"
delay_in_seconds = "0.0"
[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
script = ExtResource("27_34snm")
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
script = ExtResource("28_n7qhm")
to = NodePath("../../MegaJump")
event = &"megajump"
delay_in_seconds = "0.0"
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/Falling")
event = &"jump_ended"
delay_in_seconds = "0.0"
[node name="MegaJump" type="Node" parent="StateChart/Root/Movement/Jump"]
script = ExtResource("27_34snm")
[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/MegaJump"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/Falling")
event = &"jump_ended"
delay_in_seconds = "0.0"
[node name="Dashing" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("26_infe6")
initial_state = NodePath("Dash")
[node name="OnDashEnded" type="Node" parent="StateChart/Root/Movement/Dashing"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Airborne/Reset")
event = &"dash_finished"
delay_in_seconds = "0.0"
[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Dashing"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Mantling")
event = &"mantle"
delay_in_seconds = "0.0"
[node name="Dash" type="Node" parent="StateChart/Root/Movement/Dashing"]
script = ExtResource("27_34snm")
[node name="PoweredDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
script = ExtResource("27_34snm")
[node name="AimedDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
script = ExtResource("27_34snm")
[node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
script = ExtResource("27_34snm")
[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("27_34snm")
[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Dashing/Dash")
event = &"dash"
delay_in_seconds = "0.0"
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Jump/SimpleJump")
event = &"jump"
delay_in_seconds = "0.0"
[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/Hanging"]
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Grounded"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Jump/MegaJump")
event = &"megajump"
delay_in_seconds = "0.0"
[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Airborne/CoyoteEnabled")
event = &"crouch"
event = &"start_falling"
delay_in_seconds = "0.0"
[node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("26_infe6")
initial_state = NodePath("CoyoteEnabled")
[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Grounded/Standing")
event = &"grounded"
delay_in_seconds = "0.0"
[node name="Reset" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("41_ruloh")
default_state = NodePath("../CoyoteEnabled")
[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("28_n7qhm")
to = NodePath("../WallHugging")
to = NodePath("../../OnWall/Hugging")
event = &"wall_hug"
delay_in_seconds = "0.0"
[node name="WallHugging" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("27_34snm")
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/WallHugging"]
[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("28_n7qhm")
to = NodePath("../../JumpFromWall")
event = &"jump"
to = NodePath("../../Dashing/Dash")
event = &"dash"
delay_in_seconds = "0.0"
[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/Airborne/WallHugging"]
[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Falling")
event = &"start_falling"
to = NodePath("../../Grounded")
event = &"grounded"
delay_in_seconds = "0.0"
[node name="CoyoteEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("27_34snm")
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Jump/MegaJump")
event = &"megajump"
delay_in_seconds = "0.0"
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Jump")
to = NodePath("../../../Jump/SimpleJump")
event = &"jump"
delay_in_seconds = "0.0"
@@ -472,52 +593,19 @@ to = NodePath("../../DoubleJumpEnabled")
event = &"coyote_expired"
delay_in_seconds = "0.0"
[node name="Jump" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("27_34snm")
[node name="ToDoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne/Jump"]
script = ExtResource("28_n7qhm")
to = NodePath("../../DoubleJumpEnabled")
event = &"to_double_jump"
delay_in_seconds = "0.0"
[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/Jump"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Falling")
event = &"jump_from_dash"
delay_in_seconds = "0.0"
[node name="JumpFromWall" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("27_34snm")
[node name="JumpedFromWall" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Falling")
event = &"jump_from_wall"
delay_in_seconds = "0.0"
[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Falling")
event = &"jump_from_dash"
delay_in_seconds = "0.0"
[node name="DoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("27_34snm")
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
script = ExtResource("28_n7qhm")
to = NodePath("../../DoubleJump")
event = &"jump"
to = NodePath("../../../Jump/MegaJump")
event = &"megajump"
delay_in_seconds = "0.0"
[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne"]
script = ExtResource("27_34snm")
[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJump"]
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Falling")
event = &"to_falling"
to = NodePath("../../../Jump/DoubleJump")
event = &"jump"
delay_in_seconds = "0.0"
[node name="Falling" type="Node" parent="StateChart/Root/Movement/Airborne"]
@@ -529,13 +617,80 @@ to = NodePath("../../DoubleJumpEnabled")
event = &"enable_double_jump"
delay_in_seconds = "0.0"
[node name="OnWall" type="Node" parent="StateChart/Root/Movement"]
script = ExtResource("26_infe6")
initial_state = NodePath("Hugging")
[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/OnWall"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Grounded")
event = &"grounded"
delay_in_seconds = "0.0"
[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Jump/SimpleJump")
event = &"jump"
delay_in_seconds = "0.0"
[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/OnWall"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Jump/MegaJump")
event = &"megajump"
delay_in_seconds = "0.0"
[node name="HugCanceled" type="Node" parent="StateChart/Root/Movement/OnWall"]
script = ExtResource("27_34snm")
[node name="ToHanging" type="Node" parent="StateChart/Root/Movement/OnWall/HugCanceled"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Hanging")
event = &"oh_hit_wall"
delay_in_seconds = "0.0"
[node name="Hugging" type="Node" parent="StateChart/Root/Movement/OnWall"]
script = ExtResource("27_34snm")
[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Grounded")
event = &"grounded"
delay_in_seconds = "0.0"
[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
script = ExtResource("28_n7qhm")
to = NodePath("../../../Airborne/CoyoteEnabled")
event = &"start_falling"
delay_in_seconds = "0.0"
[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
script = ExtResource("28_n7qhm")
to = NodePath("../../HugCanceled")
event = &"dash"
delay_in_seconds = "0.0"
[node name="Hanging" type="Node" parent="StateChart/Root/Movement/OnWall"]
script = ExtResource("27_34snm")
[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/OnWall/Hanging"]
script = ExtResource("28_n7qhm")
to = NodePath("../../Hugging")
event = &"dash"
delay_in_seconds = "0.0"
[connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"]
[connection signal="input_aim_down" from="InputController" to="." method="OnInputAimDown"]
[connection signal="input_aim_pressed" from="InputController" to="." method="OnInputAimPressed"]
[connection signal="input_aim_released" from="InputController" to="." method="OnInputAimReleased"]
[connection signal="input_drop" from="InputController" to="." method="OnInputDropPressed"]
[connection signal="input_dash" from="InputController" to="." method="OnInputDashPressed"]
[connection signal="input_empower_down" from="InputController" to="." method="OnInputEmpowerDown"]
[connection signal="input_empower_released" from="InputController" to="." method="OnInputEmpowerReleased"]
[connection signal="input_hit" from="InputController" to="." method="OnInputHitPressed"]
[connection signal="input_jump" from="InputController" to="." method="OnInputJumpPressed"]
[connection signal="input_jump_ended" from="InputController" to="." method="OnInputJumpEnded"]
[connection signal="input_jump_ongoing" from="InputController" to="." method="OnInputJumpOngoing"]
[connection signal="input_jump_started" from="InputController" to="." method="OnInputJumpStarted"]
[connection signal="input_move" from="InputController" to="." method="OnInputMove"]
[connection signal="input_rotate_floorplane" from="InputController" to="." method="OnInputRotateFloorplane"]
[connection signal="input_rotate_y" from="InputController" to="." method="OnInputRotateY"]
[connection signal="input_throw" from="InputController" to="." method="OnInputThrowPressed"]
[connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]

View File

@@ -107,7 +107,6 @@ public partial class HealthSystem : Node3D
private float _currentHealthInPrevFrame;
private float _currentVelocityYInAir;
private Gravity _gravity;
private CharacterBody3D _characterBody3D;
@@ -144,7 +143,6 @@ public partial class HealthSystem : Node3D
public struct HealthSystemInitParams
{
public Gravity Gravity;
public CharacterBody3D Parent;
public Camera3D Camera;
public Node3D Head;
@@ -160,7 +158,6 @@ public partial class HealthSystem : Node3D
_currentSpeed = SpeedMin;
_gravity = initParams.Gravity;
_characterBody3D = initParams.Parent;
_camera = initParams.Camera;

File diff suppressed because it is too large Load Diff

View File

@@ -15,8 +15,8 @@ warnings/check_invalid_track_paths=false
[application]
config/name="Movement tests"
run/main_scene="uid://dwo50456dv6va"
config/features=PackedStringArray("4.4", "C#", "Forward Plus")
run/main_scene="uid://dmkw8cmalm5k"
config/features=PackedStringArray("4.5", "C#", "Forward Plus")
config/icon="res://icon.svg"
[autoload]
@@ -133,3 +133,5 @@ copy_path="res://scenes"
[rendering]
textures/vram_compression/import_etc2_astc=true
environment/volumetric_fog/volume_size=192
environment/volumetric_fog/volume_depth=192

Some files were not shown because too many files have changed in this diff Show More