Compare commits

...

14 Commits

Author SHA1 Message Date
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
100 changed files with 4831 additions and 1368 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>

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

Binary file not shown.

View File

@@ -1,53 +0,0 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b7w8cn15vsiy0"
path="res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn"
[deps]
source_file="res://assets/greyboxing/city.blend"
dest_files=["res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
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=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

Binary file not shown.

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.

File diff suppressed because it is too large Load Diff

View File

@@ -53,6 +53,7 @@ WalkSpeed = 7.5
AccelerationAir = 2.0
DecelerationAir = 0.1
Weight = 5.0
MantleTime = 0.2
SimpleJumpStartVelocity = 8.0
SimpleJumpHangTimeInFrames = 1
SimpleJumpGravityLesseningFactor = 2.5
@@ -201,6 +202,7 @@ 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="."]

View File

@@ -310,7 +310,7 @@ public partial class PlayerController : CharacterBody3D
// Movement stuff
// Getting universal setting from GODOT editor to be in sync
_gravity = (float)ProjectSettings.GetSetting("physics/3d/default_gravity");
MantleSystem.Init(HeadSystem);
MantleSystem.Init();
StairsSystem.Init(stairsBelowRayCast3D, stairsAheadRayCast3D, cameraSmooth);
DashSystem.Init(HeadSystem, camera, TweenQueueSystem);
WeaponSystem.Init(HeadSystem, camera);
@@ -438,7 +438,7 @@ public partial class PlayerController : CharacterBody3D
{
if (CanMantle())
{
MantleToLocation(MantleSystem.FindMantleInFrontOfPlayer().Unwrap());
MantleToLocation(MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y).Unwrap());
return;
}
@@ -871,7 +871,7 @@ public partial class PlayerController : CharacterBody3D
{
// Try mantling but don't know if this is useful
if (CanMantle())
MantleToLocation(MantleSystem.FindMantleInFrontOfPlayer().Unwrap());
MantleToLocation(MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y).Unwrap());
}
public void FinishPoweredDash()
@@ -912,7 +912,7 @@ public partial class PlayerController : CharacterBody3D
// Mantling
public bool CanMantle()
{
var mantleLocationResult = MantleSystem.FindMantleInFrontOfPlayer();
var mantleLocationResult = MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y);
return mantleLocationResult.IsSome(out _);
}
public void MantleToLocation(Vector3 location)

View File

@@ -16,7 +16,7 @@ warnings/check_invalid_track_paths=false
config/name="Movement tests"
run/main_scene="uid://pk8ypa04qy6x"
config/features=PackedStringArray("4.4", "C#", "Forward Plus")
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

View File

@@ -66,7 +66,7 @@ public partial class DashSystem: Node3D
_tweenQueueSystem = tweenQueueSystem;
_mantleSystem = GetNode<MantleSystem>("MantleSystem");
_mantleSystem.Init(this);
_mantleSystem.Init();
_dashTarget = GetNode<MeshInstance3D>("DashTarget");
_dashTarget.SetVisible(false);
@@ -116,7 +116,8 @@ public partial class DashSystem: Node3D
var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
targetMaterial.SetAlbedo(targetColor);
_dashTarget.SetVisible(true);
_dashTarget.SetGlobalPosition(PlannedLocation);
var targetLocation = ShouldMantle ? PlannedMantleLocation : PlannedLocation;
_dashTarget.SetGlobalPosition(targetLocation);
}
public void StopPreparingDash()

View File

@@ -35,7 +35,7 @@ mesh = SubResource("SphereMesh_qu4wy")
surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
[node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
MantleEndLocationDistanceFromWall = 0.3
MantleEndLocationDistanceFromWall = 0.25
MantleHeightCastStart = 2.0
[node name="DashIndicator" parent="." instance=ExtResource("2_tqt6i")]

View File

@@ -32,9 +32,6 @@
[sub_resource type="Resource" id="Resource_vkvga"]
script = ExtResource("4_1rw8g")
x = 0
y = 1
joy_index = -1
[sub_resource type="Resource" id="Resource_kb1id"]
script = ExtResource("6_li5ak")
@@ -43,17 +40,11 @@ order = 2
[sub_resource type="Resource" id="Resource_rwam6"]
script = ExtResource("7_si4d4")
lower_threshold = 0.1
upper_threshold = 1.0
[sub_resource type="Resource" id="Resource_1igva"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_vkvga")
modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_kb1id"), SubResource("Resource_rwam6")])
triggers = Array[ExtResource("8_2tfaw")]([])
[sub_resource type="Resource" id="Resource_88x08"]
script = ExtResource("1_qmhk6")
@@ -64,33 +55,21 @@ metadata/_guide_input_mappings_collapsed = true
[sub_resource type="Resource" id="Resource_05q5j"]
script = ExtResource("10_cvxqo")
axis = 2
joy_index = -1
[sub_resource type="Resource" id="Resource_tn8ci"]
script = ExtResource("7_si4d4")
lower_threshold = 0.2
upper_threshold = 1.0
[sub_resource type="Resource" id="Resource_1koh7"]
script = ExtResource("11_j3axn")
scale = Vector3(0.3, 0.3, 0.3)
apply_delta_time = false
[sub_resource type="Resource" id="Resource_eep0a"]
script = ExtResource("12_kxb2c")
x = true
y = true
z = true
[sub_resource type="Resource" id="Resource_dew8i"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_05q5j")
modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_tn8ci"), SubResource("Resource_1koh7"), SubResource("Resource_eep0a")])
triggers = Array[ExtResource("8_2tfaw")]([])
[sub_resource type="Resource" id="Resource_tgr2g"]
script = ExtResource("1_qmhk6")
@@ -101,33 +80,21 @@ metadata/_guide_input_mappings_collapsed = true
[sub_resource type="Resource" id="Resource_pf0ii"]
script = ExtResource("10_cvxqo")
axis = 3
joy_index = -1
[sub_resource type="Resource" id="Resource_nh7x4"]
script = ExtResource("7_si4d4")
lower_threshold = 0.2
upper_threshold = 1.0
[sub_resource type="Resource" id="Resource_04n84"]
script = ExtResource("11_j3axn")
scale = Vector3(0.1, 0.1, 0.1)
apply_delta_time = false
[sub_resource type="Resource" id="Resource_m3aj7"]
script = ExtResource("12_kxb2c")
x = true
y = true
z = true
[sub_resource type="Resource" id="Resource_qu2wi"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_pf0ii")
modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_nh7x4"), SubResource("Resource_04n84"), SubResource("Resource_m3aj7")])
triggers = Array[ExtResource("8_2tfaw")]([])
[sub_resource type="Resource" id="Resource_iarn8"]
script = ExtResource("1_qmhk6")
@@ -138,20 +105,13 @@ metadata/_guide_input_mappings_collapsed = true
[sub_resource type="Resource" id="Resource_si4d4"]
script = ExtResource("10_cvxqo")
axis = 4
joy_index = -1
[sub_resource type="Resource" id="Resource_2tfaw"]
script = ExtResource("15_g6bbx")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_q86qg"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_si4d4")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_2tfaw")])
[sub_resource type="Resource" id="Resource_cvxqo"]
@@ -163,20 +123,13 @@ metadata/_guide_input_mappings_collapsed = false
[sub_resource type="Resource" id="Resource_llfhp"]
script = ExtResource("10_cvxqo")
axis = 4
joy_index = -1
[sub_resource type="Resource" id="Resource_ib0yi"]
script = ExtResource("15_fykw6")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_r6kml"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_llfhp")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ib0yi")])
[sub_resource type="Resource" id="Resource_tb8ii"]
@@ -187,20 +140,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_r6kml")])
[sub_resource type="Resource" id="Resource_cqc4k"]
script = ExtResource("10_cvxqo")
axis = 4
joy_index = -1
[sub_resource type="Resource" id="Resource_vanwy"]
script = ExtResource("17_s8kjn")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_bkx7d"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_cqc4k")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_vanwy")])
[sub_resource type="Resource" id="Resource_iihs4"]
@@ -212,20 +158,13 @@ metadata/_guide_input_mappings_collapsed = false
[sub_resource type="Resource" id="Resource_fykw6"]
script = ExtResource("10_cvxqo")
axis = 5
joy_index = -1
[sub_resource type="Resource" id="Resource_rvpjj"]
script = ExtResource("15_fykw6")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_s8kjn"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_fykw6")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rvpjj")])
metadata/_guide_triggers_collapsed = false
@@ -237,20 +176,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn")])
[sub_resource type="Resource" id="Resource_qkgmj"]
script = ExtResource("10_cvxqo")
axis = 5
joy_index = -1
[sub_resource type="Resource" id="Resource_st2ej"]
script = ExtResource("17_s8kjn")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_818lq"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_qkgmj")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_st2ej")])
[sub_resource type="Resource" id="Resource_2hs2y"]
@@ -261,20 +193,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq")])
[sub_resource type="Resource" id="Resource_lfx76"]
script = ExtResource("19_qkgmj")
button = 2
joy_index = -1
[sub_resource type="Resource" id="Resource_oruo7"]
script = ExtResource("15_fykw6")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_4ee3d"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_lfx76")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oruo7")])
[sub_resource type="Resource" id="Resource_0s4kt"]
@@ -284,21 +209,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_4ee3d")])
[sub_resource type="Resource" id="Resource_1fkas"]
script = ExtResource("19_qkgmj")
button = 0
joy_index = -1
[sub_resource type="Resource" id="Resource_6pxii"]
script = ExtResource("15_fykw6")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_jy4f1"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_1fkas")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_6pxii")])
metadata/_guide_triggers_collapsed = false
@@ -309,18 +226,10 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_jy4f1")])
[sub_resource type="Resource" id="Resource_oapce"]
script = ExtResource("19_qkgmj")
button = 0
joy_index = -1
[sub_resource type="Resource" id="Resource_8w5gu"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_oapce")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([])
metadata/_guide_triggers_collapsed = false
[sub_resource type="Resource" id="Resource_xt1x5"]
@@ -331,20 +240,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_8w5gu")])
[sub_resource type="Resource" id="Resource_li5ak"]
script = ExtResource("19_qkgmj")
button = 10
joy_index = -1
[sub_resource type="Resource" id="Resource_paxxe"]
script = ExtResource("15_fykw6")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_500v3"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_li5ak")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_paxxe")])
[sub_resource type="Resource" id="Resource_ew1hw"]
@@ -355,20 +257,13 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_500v3")])
[sub_resource type="Resource" id="Resource_g6bbx"]
script = ExtResource("19_qkgmj")
button = 1
joy_index = -1
[sub_resource type="Resource" id="Resource_yp12v"]
script = ExtResource("15_fykw6")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_1rw8g"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_g6bbx")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_yp12v")])
[sub_resource type="Resource" id="Resource_0qat1"]
@@ -380,20 +275,13 @@ metadata/_guide_input_mappings_collapsed = false
[sub_resource type="Resource" id="Resource_j3axn"]
script = ExtResource("19_qkgmj")
button = 3
joy_index = -1
[sub_resource type="Resource" id="Resource_kxb2c"]
script = ExtResource("15_fykw6")
actuation_threshold = 0.5
[sub_resource type="Resource" id="Resource_v2ywt"]
script = ExtResource("3_yp12v")
override_action_settings = false
is_remappable = false
display_name = ""
display_category = ""
input = SubResource("Resource_j3axn")
modifiers = Array[ExtResource("5_0qat1")]([])
triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")])
[sub_resource type="Resource" id="Resource_vtk18"]
@@ -403,6 +291,5 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt")])
[resource]
script = ExtResource("23_llfhp")
display_name = ""
mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_0s4kt"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18")])
metadata/_custom_type_script = "uid://dsa1dnifd6w32"

View File

@@ -5,50 +5,40 @@ namespace Movementtests.systems;
public partial class MantleSystem: Node3D
{
[Export(PropertyHint.Range, "0,2,0.1,suffix:m,or_greater")]
[Export(PropertyHint.Range, "0,2,0.01,suffix:m,or_greater")]
public float MantleEndLocationDistanceFromWall { get; set; } = 1f;
[Export(PropertyHint.Range, "0,10,0.1,suffix:m,or_greater")]
public float MantleHeightCastStart { get; set; } = 2f;
[Export(PropertyHint.Range, "0,10,0.01,suffix:m,or_greater")]
public float MaxStepHeight = 0.5f;
private Node3D _head;
private ShapeCast3D _wallInFrontCast3D;
private ShapeCast3D _mantleCast3D;
private RayCast3D _mantleCheckCast3D;
private Option<Vector3> _mantleLocation;
public void Init(Node3D head)
public void Init()
{
_head = head;
_wallInFrontCast3D = GetNode<ShapeCast3D>("WallInFrontCast3D");
_mantleCast3D = GetNode<ShapeCast3D>("MantleCast3D");
}
public override void _PhysicsProcess(double delta)
public Option<Vector3> FindMantleForHeadRotation(float rotation)
{
base._PhysicsProcess(delta);
_wallInFrontCast3D.SetRotation(new Vector3(
_wallInFrontCast3D.Rotation.X,
_head.Rotation.Y,
rotation,
_wallInFrontCast3D.Rotation.Z));
if (!_wallInFrontCast3D.IsColliding())
{
_mantleLocation = Option<Vector3>.None;
return;
return Option<Vector3>.None;
}
var collisionPoint = _wallInFrontCast3D.GetCollisionPoint(0);
var collisionNormal = _wallInFrontCast3D.GetCollisionNormal(0);
_mantleLocation = FindMantleLocationAtPoint(collisionPoint, collisionNormal);
}
public Option<Vector3> FindMantleInFrontOfPlayer()
{
return _mantleLocation;
return FindMantleLocationAtPoint(collisionPoint, collisionNormal);
}
public Option<Vector3> FindMantleLocationAtPoint(Vector3 point, Vector3 wallNormal)
@@ -59,8 +49,8 @@ public partial class MantleSystem: Node3D
_mantleCast3D.SetGlobalPosition(shapeCastStartLocation);
var targetLocation = Vector3.Down * MantleHeightCastStart + Vector3.Up * MaxStepHeight;
_mantleCast3D.SetTargetPosition(targetLocation);
if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y > 0.9f)
if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y >= 0.1f)
return Option.Some(_mantleCast3D.GetCollisionPoint(0));
return Option<Vector3>.None;
}

View File

@@ -218,22 +218,4 @@ public partial class MoveSystem : Node3D
var jumpVelocity = jumpForce * effectiveJumpDirection * boost;
_parent.Velocity = currentHorizontalVelocity + jumpVelocity;
}
public bool CanMantle()
{
var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
return mantleLocationResult.IsSome(out _);
}
public Option<Tween> Mantle()
{
var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
if (mantleLocationResult.IsSome(out var mantleLocation))
{
var duration = 0.1f * mantleLocation.DistanceTo(_parent.Position);
var tween = _tweenQueueSystem.TweenToLocation(new TweenQueueSystem.TweenInputs(mantleLocation, duration));
return tween.Some();
}
return Option<Tween>.None;
}
}

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://ckm3d6k08a72u"]
[gd_scene load_steps=10 format=3 uid="uid://ckm3d6k08a72u"]
[ext_resource type="Script" uid="uid://iii3wfto4t5b" path="res://systems/weapon/WeaponSystem.cs" id="1_csqwk"]
[ext_resource type="PackedScene" uid="uid://dbe5f0p6lvqtr" path="res://systems/tween_queue/tween_queue_system.tscn" id="2_x1nha"]
@@ -11,7 +11,14 @@
height = 1.0
radius = 0.1
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5owyf"]
use_z_clip_scale = true
z_clip_scale = 0.9
use_fov_override = true
fov_override = 70.0
[sub_resource type="CylinderMesh" id="CylinderMesh_x1nha"]
material = SubResource("StandardMaterial3D_5owyf")
top_radius = 0.0
bottom_radius = 0.05
height = 1.0

View File

@@ -0,0 +1,40 @@
@tool
extends Node3D
@export_tool_button("Generate collisions", "Callable") var generate_col_action = generate_collisions
@export_group("Layers and masks")
@export_flags_3d_physics var collision_layer
@export_flags_3d_physics var collision_mask
func get_all_children_of_type(node, type) -> Array:
var nodes : Array = []
for child in node.get_children():
if is_instance_of(child, type):
nodes.append(child)
if child.get_child_count() > 0:
nodes.append_array(get_all_children_of_type(child, type))
return nodes
func clear_collisions_on_meshes(meshes: Array):
for mesh_instance: MeshInstance3D in meshes:
for child in mesh_instance.get_children():
child.queue_free()
func generate_collisions_on_meshes(meshes: Array):
for mesh_instance: MeshInstance3D in meshes:
mesh_instance.create_trimesh_collision()
func set_collision_mask_on_bodies(bodies: Array):
for staticbody: StaticBody3D in bodies:
staticbody.collision_layer = collision_layer
staticbody.collision_mask = collision_mask
func generate_collisions():
var mesh_instances = get_all_children_of_type(self, MeshInstance3D)
clear_collisions_on_meshes(mesh_instances)
generate_collisions_on_meshes(mesh_instances)
var staticbody_instances = get_all_children_of_type(self, StaticBody3D)
set_collision_mask_on_bodies(staticbody_instances)

View File

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