Reafctoring

BLaZeKiLL · Nov 17, 2023 · 2280554 · 2280554
1 parent 1ab9742
commit 2280554
Show file tree

Hide file tree

Showing 39 changed files with 32 additions and 64 deletions.
diff --git a/Assets/Stylized Water Shader.meta b/Assets/Stylized Water Shader.meta
diff --git a/Assets/Stylized Water Shader/Materials.meta b/Assets/Stylized Water Shader/Materials.meta
diff --git a/Assets/Stylized Water Shader/Shaders.meta b/Assets/Stylized Water Shader/Shaders.meta
diff --git a/Assets/Stylized Water Shader/Textures.meta b/Assets/Stylized Water Shader/Textures.meta
diff --git a/Packages/io.codeblaze.vloxyengine/Runtime/Shaders/Urp/TextureArray_AO.shadergraph b/Packages/io.codeblaze.vloxyengine/Runtime/Shaders/Urp/TextureArray_AO.shadergraph
@@ -2305,8 +2305,8 @@
     "hlslDeclarationOverride": 0,
     "m_Hidden": false,
     "m_Value": {
-        "m_filter": 0,
-        "m_wrap": 2,
+        "m_filter": 2,
+        "m_wrap": 0,
         "m_anisotropic": 0
     }
 }

diff --git a/...er/Shaders/Blended Normals.shadersubgraph → .../Urp/Water/Blended Normals.shadersubgraph b/...er/Shaders/Blended Normals.shadersubgraph → .../Urp/Water/Blended Normals.shadersubgraph
diff --git a/...aders/Blended Normals.shadersubgraph.meta → ...Water/Blended Normals.shadersubgraph.meta b/...aders/Blended Normals.shadersubgraph.meta → ...Water/Blended Normals.shadersubgraph.meta
diff --git a/... Shader/Shaders/Depth Fade.shadersubgraph → ...aders/Urp/Water/Depth Fade.shadersubgraph b/... Shader/Shaders/Depth Fade.shadersubgraph → ...aders/Urp/Water/Depth Fade.shadersubgraph
diff --git a/...er/Shaders/Depth Fade.shadersubgraph.meta → .../Urp/Water/Depth Fade.shadersubgraph.meta b/...er/Shaders/Depth Fade.shadersubgraph.meta → .../Urp/Water/Depth Fade.shadersubgraph.meta
diff --git a/...lized Water Shader/Shaders/DistortUV.hlsl → .../Runtime/Shaders/Urp/Water/DistortUV.hlsl b/...lized Water Shader/Shaders/DistortUV.hlsl → .../Runtime/Shaders/Urp/Water/DistortUV.hlsl
diff --git a/... Water Shader/Shaders/DistortUV.hlsl.meta → ...ime/Shaders/Urp/Water/DistortUV.hlsl.meta b/... Water Shader/Shaders/DistortUV.hlsl.meta → ...ime/Shaders/Urp/Water/DistortUV.hlsl.meta
diff --git a/...d Water Shader/Shaders/GerstnerWaves.hlsl → ...time/Shaders/Urp/Water/GerstnerWaves.hlsl b/...d Water Shader/Shaders/GerstnerWaves.hlsl → ...time/Shaders/Urp/Water/GerstnerWaves.hlsl
diff --git a/...er Shader/Shaders/GerstnerWaves.hlsl.meta → ...Shaders/Urp/Water/GerstnerWaves.hlsl.meta b/...er Shader/Shaders/GerstnerWaves.hlsl.meta → ...Shaders/Urp/Water/GerstnerWaves.hlsl.meta
diff --git a/...tylized Water Shader/Shaders/HSVLerp.hlsl → ...ne/Runtime/Shaders/Urp/Water/HSVLerp.hlsl b/...tylized Water Shader/Shaders/HSVLerp.hlsl → ...ne/Runtime/Shaders/Urp/Water/HSVLerp.hlsl
diff --git a/...ed Water Shader/Shaders/HSVLerp.hlsl.meta → ...ntime/Shaders/Urp/Water/HSVLerp.hlsl.meta b/...ed Water Shader/Shaders/HSVLerp.hlsl.meta → ...ntime/Shaders/Urp/Water/HSVLerp.hlsl.meta
diff --git a/...ylized Water Shader/Shaders/Lighting.hlsl → ...e/Runtime/Shaders/Urp/Water/Lighting.hlsl b/...ylized Water Shader/Shaders/Lighting.hlsl → ...e/Runtime/Shaders/Urp/Water/Lighting.hlsl
diff --git a/...d Water Shader/Shaders/Lighting.hlsl.meta → ...time/Shaders/Urp/Water/Lighting.hlsl.meta b/...d Water Shader/Shaders/Lighting.hlsl.meta → ...time/Shaders/Urp/Water/Lighting.hlsl.meta
diff --git a/...ter Shader/Shaders/Overlay.shadersubgraph → .../Shaders/Urp/Water/Overlay.shadersubgraph b/...ter Shader/Shaders/Overlay.shadersubgraph → .../Shaders/Urp/Water/Overlay.shadersubgraph
diff --git a/...hader/Shaders/Overlay.shadersubgraph.meta → ...ers/Urp/Water/Overlay.shadersubgraph.meta b/...hader/Shaders/Overlay.shadersubgraph.meta → ...ers/Urp/Water/Overlay.shadersubgraph.meta
diff --git a/... Shader/Shaders/Panning UV.shadersubgraph → ...aders/Urp/Water/Panning UV.shadersubgraph b/... Shader/Shaders/Panning UV.shadersubgraph → ...aders/Urp/Water/Panning UV.shadersubgraph
diff --git a/...er/Shaders/Panning UV.shadersubgraph.meta → .../Urp/Water/Panning UV.shadersubgraph.meta b/...er/Shaders/Panning UV.shadersubgraph.meta → .../Urp/Water/Panning UV.shadersubgraph.meta
diff --git a/...hader/Shaders/Refracted UV.shadersubgraph → ...ers/Urp/Water/Refracted UV.shadersubgraph b/...hader/Shaders/Refracted UV.shadersubgraph → ...ers/Urp/Water/Refracted UV.shadersubgraph
diff --git a/.../Shaders/Refracted UV.shadersubgraph.meta → ...rp/Water/Refracted UV.shadersubgraph.meta b/.../Shaders/Refracted UV.shadersubgraph.meta → ...rp/Water/Refracted UV.shadersubgraph.meta
diff --git a/...der/Shaders/Scene Position.shadersubgraph → ...s/Urp/Water/Scene Position.shadersubgraph b/...der/Shaders/Scene Position.shadersubgraph → ...s/Urp/Water/Scene Position.shadersubgraph
diff --git a/...haders/Scene Position.shadersubgraph.meta → .../Water/Scene Position.shadersubgraph.meta b/...haders/Scene Position.shadersubgraph.meta → .../Water/Scene Position.shadersubgraph.meta
diff --git a/...Shader/Shaders/Shore Color.shadersubgraph → ...ders/Urp/Water/Shore Color.shadersubgraph b/...Shader/Shaders/Shore Color.shadersubgraph → ...ders/Urp/Water/Shore Color.shadersubgraph
diff --git a/...r/Shaders/Shore Color.shadersubgraph.meta → ...Urp/Water/Shore Color.shadersubgraph.meta b/...r/Shaders/Shore Color.shadersubgraph.meta → ...Urp/Water/Shore Color.shadersubgraph.meta
diff --git a/...Shader/Shaders/Stylized Water.shadergraph → ...ders/Urp/Water/Stylized Water.shadergraph b/...Shader/Shaders/Stylized Water.shadergraph → ...ders/Urp/Water/Stylized Water.shadergraph
diff --git a/...r/Shaders/Stylized Water.shadergraph.meta → ...Urp/Water/Stylized Water.shadergraph.meta b/...r/Shaders/Stylized Water.shadergraph.meta → ...Urp/Water/Stylized Water.shadergraph.meta
diff --git a/...Stylized Water Shader/Textures/Foam 4.png → ...ine/Samples/Materials/Textures/Foam 4.png b/...Stylized Water Shader/Textures/Foam 4.png → ...ine/Samples/Materials/Textures/Foam 4.png
diff --git a/...zed Water Shader/Textures/Foam 4.png.meta → ...amples/Materials/Textures/Foam 4.png.meta b/...zed Water Shader/Textures/Foam 4.png.meta → ...amples/Materials/Textures/Foam 4.png.meta
diff --git a/...Stylized Water Shader/Textures/Foam 5.png → ...ine/Samples/Materials/Textures/Foam 5.png b/...Stylized Water Shader/Textures/Foam 5.png → ...ine/Samples/Materials/Textures/Foam 5.png
diff --git a/...zed Water Shader/Textures/Foam 5.png.meta → ...amples/Materials/Textures/Foam 5.png.meta b/...zed Water Shader/Textures/Foam 5.png.meta → ...amples/Materials/Textures/Foam 5.png.meta
diff --git a/...lized Water Shader/Textures/Normals 1.png → .../Samples/Materials/Textures/Normals 1.png b/...lized Water Shader/Textures/Normals 1.png → .../Samples/Materials/Textures/Normals 1.png
diff --git a/... Water Shader/Textures/Normals 1.png.meta → ...les/Materials/Textures/Normals 1.png.meta b/... Water Shader/Textures/Normals 1.png.meta → ...les/Materials/Textures/Normals 1.png.meta
diff --git a/...aterials/Shader Graphs_Stylized Water.mat → ...oxyengine/Samples/Materials/Urp/Water.mat b/...aterials/Shader Graphs_Stylized Water.mat → ...oxyengine/Samples/Materials/Urp/Water.mat
@@ -7,12 +7,12 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Shader Graphs_Stylized Water
-  m_Shader: {fileID: -6465566751694194690, guid: d9be20e5d4ac04a7f8c7bfd1c4330a4f,
-    type: 3}
+  m_Name: Water
+  m_Shader: {fileID: -6465566751694194690, guid: d9be20e5d4ac04a7f8c7bfd1c4330a4f, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - WORLD_SPACE_UV_ON
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -50,50 +50,50 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - WORLD_SPACE_UV: 0
-    - _Depth_Fade_Distance: 0.4
+    - WORLD_SPACE_UV: 1
+    - _Depth_Fade_Distance: 5
     - _Foam_Blend: 1
-    - _Horizon_Distance: 5.1
+    - _Horizon_Distance: 10
     - _Intersection_Foam_Blend: 0
     - _Intersection_Foam_Color_Blend: 1
-    - _Intersection_Foam_Cutoff: 0.875
-    - _Intersection_Foam_Depth: 0.75
-    - _Intersection_Foam_Direction: 0.154
+    - _Intersection_Foam_Cutoff: 1
+    - _Intersection_Foam_Depth: 1
+    - _Intersection_Foam_Direction: 0.1
     - _Intersection_Foam_Fade: 1
-    - _Intersection_Foam_Speed: 0.131
-    - _Intersection_Foam_Tiling: 100
-    - _Lighting_Hardness: 1
-    - _Lighting_Smoothness: 0.587
-    - _Normals_Scale: 0.012
-    - _Normals_Speed: 0.073
-    - _Normals_Strength: 0.277
+    - _Intersection_Foam_Speed: 0.1
+    - _Intersection_Foam_Tiling: 1
+    - _Lighting_Hardness: 0.2
+    - _Lighting_Smoothness: 0.4
+    - _Normals_Scale: 5
+    - _Normals_Speed: 0.1
+    - _Normals_Strength: 0.5
     - _QueueControl: 1
     - _QueueOffset: 0
-    - _Refraction_Scale: 0.01
-    - _Refraction_Speed: 0.053
-    - _Refraction_Strength: 0.0065
+    - _Refraction_Scale: 0.5
+    - _Refraction_Speed: 0.1
+    - _Refraction_Strength: 0.005
     - _Shore_Depth: 0
     - _Smoothness: 0.47
     - _Surface_Foam_Blend: 1
     - _Surface_Foam_Color_Blend: 1
     - _Surface_Foam_Cutoff: 0.131
-    - _Surface_Foam_Direction: 0.413
-    - _Surface_Foam_Distortion: 0.94
-    - _Surface_Foam_Speed: 0
-    - _Surface_Foam_Tiling: 84.8
+    - _Surface_Foam_Direction: 0.1
+    - _Surface_Foam_Distortion: 1
+    - _Surface_Foam_Speed: 0.1
+    - _Surface_Foam_Tiling: 1
     - _Wave_Length: 2.8
     - _Wave_Speed: 0.57
     - _Wave_Steepness: 0.088
     m_Colors:
     - _Deep_Color: {r: 0, g: 0.3102526, b: 0.5943396, a: 0.36862746}
     - _Diffuse_Color: {r: 1, g: 0, b: 0, a: 1}
     - _Foam_Color: {r: 0, g: 1, b: 0.46160954, a: 0.4392157}
-    - _Horizon_Color: {r: 1, g: 0.46949857, b: 0, a: 1}
-    - _Intersection_Foam_Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Horizon_Color: {r: 0, g: 0.30980393, b: 0.59607846, a: 1}
+    - _Intersection_Foam_Color: {r: 0.5176471, g: 0.9019608, b: 0.9019608, a: 0.5019608}
     - _Refraction_Movement: {r: 0, g: 0, b: 0, a: 0}
     - _Shallow_Color: {r: 0.45768058, g: 0.8018868, b: 0.7984465, a: 0.43137255}
     - _Shore_Color: {r: 0, g: 0, b: 0, a: 0}
-    - _Specular_Color: {r: 1, g: 1, b: 1, a: 0.1764706}
+    - _Specular_Color: {r: 0.5739131, g: 1, b: 1, a: 0.6}
     - _Surface_Foam_Color: {r: 1, g: 1, b: 1, a: 0}
     - _Wave_Directions: {r: 0, g: 0.5, b: 1, a: 0.2}
   m_BuildTextureStacks: []

diff --git a/...als/Shader Graphs_Stylized Water.mat.meta → ...gine/Samples/Materials/Urp/Water.mat.meta b/...als/Shader Graphs_Stylized Water.mat.meta → ...gine/Samples/Materials/Urp/Water.mat.meta
diff --git a/Packages/io.codeblaze.vloxyengine/Samples/Prefabs/VloxyWorld.prefab b/Packages/io.codeblaze.vloxyengine/Samples/Prefabs/VloxyWorld.prefab
@@ -24,13 +24,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 400909527937332092}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &-1883047526949537501
 MonoBehaviour:
@@ -45,4 +45,4 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _Focus: {fileID: 0}
-  Settings: {fileID: 11400000, guid: 52a6b2026aad8ff419d583b5a88c620f, type: 2}
+  _Settings: {fileID: 11400000, guid: 52a6b2026aad8ff419d583b5a88c620f, type: 2}
diff --git a/Packages/io.codeblaze.vloxyengine/Samples/Settings/VloxySettings.asset b/Packages/io.codeblaze.vloxyengine/Samples/Settings/VloxySettings.asset
@@ -24,7 +24,7 @@ MonoBehaviour:
   Renderer:
     Materials:
     - {fileID: 2100000, guid: 1add20ccd0265e742a7bd8cb069f72ad, type: 2}
-    - {fileID: 2100000, guid: 25fdd7c3100144ffbb60d3d5224231fd, type: 2}
+    - {fileID: 2100000, guid: b54e69d0b9330474e93faa67bc77f114, type: 2}
     CastShadows: 0
   Scheduler:
     MeshingBatchSize: 16