Work on soil water

AIP21 · Apr 4, 2023 · 613118e · 613118e
1 parent 6102c34
commit 613118e
Show file tree

Hide file tree

Showing 12 changed files with 773 additions and 401 deletions.
diff --git a/Assets/FluidSim/Prefabs/Fluid Sim.prefab b/Assets/FluidSim/Prefabs/Fluid Sim.prefab
@@ -95,27 +95,32 @@ MonoBehaviour:
   m_GameObject: {fileID: 2566442593908158340}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b3d46b2467dfa9142b3d86b9272d618b, type: 3}
+  m_Script: {fileID: 11500000, guid: 48fceb84824d81c41a085bda774e1106, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  computeShader: {fileID: 7200000, guid: 1c3b445941b32804dbb9b992ea49c70f, type: 3}
-  heightmap: {fileID: 2800000, guid: 36341a9953beaf84eba6cf08cef3c594, type: 3}
-  waterMap: {fileID: 0}
-  newWaterMap: {fileID: 0}
-  flowMap: {fileID: 0}
-  newFlowMap: {fileID: 0}
-  velocityMap: {fileID: 0}
-  newVelocityMap: {fileID: 0}
-  TextureToDraw: 0
+  result: {fileID: 0}
+  surfaceWaterMap: {fileID: 0}
+  newSurfaceWaterMap: {fileID: 0}
+  surfaceFlowMap: {fileID: 0}
+  newSurfaceFlowMap: {fileID: 0}
+  surfaceVelocityMap: {fileID: 0}
+  newSurfaceVelocityMap: {fileID: 0}
+  soilWaterMap: {fileID: 0}
+  newSoilWaterMap: {fileID: 0}
+  soilFlowMap: {fileID: 0}
+  newSoilFlowMap: {fileID: 0}
+  textureToDraw: 0
+  heightmap: {fileID: 2800000, guid: 90c5f3e74c9152949879f49f22891720, type: 3}
   resolution: 1024
   timeStep: 0.1
+  epsilon: 0.00001
+  surfaceComputeShader: {fileID: 7200000, guid: 1c3b445941b32804dbb9b992ea49c70f, type: 3}
   waterDensity: 1
   gravitationAcceleration: 9.81
   cellHeight: 1
   cellArea: 1
-  epsilon: 0.00001
   diffuseAlpha: 1
-  evaporationConstant: 0.005
+  evaporationConstant: 0.01
   heightmapMultiplier: 1
   flowDamping: 0
   enableInput: 1
@@ -125,8 +130,18 @@ MonoBehaviour:
   enableVelocityDiffusion: 1
   sourceIsMouse: 1
   sourceRadius: 0.008
-  sourceAmount: 2
+  sourceAmount: 1
   sourcePosition: {x: 0, y: 0}
+  soilComputeShader: {fileID: 7200000, guid: 61355b5eb6fb59c48ace0f622d953532, type: 3}
+  soilMap: {fileID: 2800000, guid: c62ee469c9ae53949a32460dfefee106, type: 3}
+  soilGravitationAcceleration: 9.81
+  soilCellHeight: 1
+  soilCellArea: 1
+  soilHeightmapMultiplier: 1
+  soilEnableAbsorption: 1
+  soilEnableRelease: 1
+  soilEnableFlow: 1
+  soilEnableSaturation: 1
   showDebugTextures: 1
 --- !u!114 &1258558761060615783
 MonoBehaviour:
@@ -135,7 +150,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2566442593908158340}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 132d26542ffa23e4aad4f1de5260d8bc, type: 3}
   m_Name: 

diff --git a/Assets/FluidSim/Scenes/ShallowWaterSim.unity → Assets/FluidSim/Scenes/SurfaceWaterSim.unity b/Assets/FluidSim/Scenes/ShallowWaterSim.unity → Assets/FluidSim/Scenes/SurfaceWaterSim.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -228,6 +228,26 @@ PrefabInstance:
       propertyPath: sun
       value: 
       objectReference: {fileID: 2051415026}
+    - target: {fileID: 2566442593908158337, guid: 99e93d985e2bc8b4bbf7a7a4fdf85ebc, type: 3}
+      propertyPath: textureToDraw
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2566442593908158337, guid: 99e93d985e2bc8b4bbf7a7a4fdf85ebc, type: 3}
+      propertyPath: soilEnableFlow
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2566442593908158337, guid: 99e93d985e2bc8b4bbf7a7a4fdf85ebc, type: 3}
+      propertyPath: soilEnableRelease
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2566442593908158337, guid: 99e93d985e2bc8b4bbf7a7a4fdf85ebc, type: 3}
+      propertyPath: soilEnableAbsorption
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2566442593908158337, guid: 99e93d985e2bc8b4bbf7a7a4fdf85ebc, type: 3}
+      propertyPath: soilEnableSaturation
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2566442593908158339, guid: 99e93d985e2bc8b4bbf7a7a4fdf85ebc, type: 3}
       propertyPath: m_RootOrder
       value: 0

diff --git a/...luidSim/Scenes/ShallowWaterSim.unity.meta → ...luidSim/Scenes/SurfaceWaterSim.unity.meta b/...luidSim/Scenes/ShallowWaterSim.unity.meta → ...luidSim/Scenes/SurfaceWaterSim.unity.meta