Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC

# Conflicts:
#	Assets/_Content/Models/Environments/BodiesInWater.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Materials.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta
#	Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat
#	Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs

Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl

@@ -0,0 +1,42 @@
+#ifndef WATER_INCLUDED
+#define WATER_INCLUDED
+
+#include "Assets/_Content/Shaders/Include/Noises.hlsl"
+
+void Water_float
+(
+    float3 PositionWS,
+    float3 NormalWS,
+    out float3 Position,
+    out float Height
+)
+{
+    float t = _Time.y;
+
+    float depth = length(PositionWS - _WorldSpaceCameraPos.xyz);
+    
+    float height = PerlinNoise3D(PositionWS + float3(0, 0, t), .8) * .8;
+    height = dot(height, PerlinNoise3D(PositionWS + float3(t * .2, 0, t * .5), 1.7));
+    height = pow(height, .5);
+    
+    // Test
+
+    //float test = ValueNoise3D(PositionWS, 40);
+    //float test = PerlinNoise3D(PositionWS, 40);
+    //float test = PerlinNoise3DLOD(PositionWS, 100, 3.5);
+    //float test = SimplexNoise3D(PositionWS, 40);
+    //float test = WorleyNoise3D(PositionWS, 40, 1);
+    //float id;
+    //float test = VoronoiNoise3D(PositionWS, 10, 1, .05, id);
+    //float test = FBMNoise3D(PositionWS, 10, 2, 2, .5);
+    //float test = RidgedNoise3D(PositionWS, 10, 2, 2, .5);
+    
+    // Output
+
+    Position = PositionWS;
+    Position.y += height * .4f - .2;
+    
+    Height = height;
+}
+
+#endif

Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c545a27cb782b7541ab8e7438fc4d112
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph.meta

@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: eb5e6d6a05109e841a6269b6939b53e1
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
+  useAsTemplate: 0
+  exposeTemplateAsShader: 0
+  template:
+    name: 
+    category: 
+    description: 
+    icon: {instanceID: 0}
+    thumbnail: {instanceID: 0}