Closes #98 Wave With SW2, DWP2

This commit is contained in:
IDMhan 2023-12-21 10:59:58 +09:00
parent e188d6fa0c
commit 81f56d77ba
6 changed files with 282 additions and 24 deletions

View File

@ -285,7 +285,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 107368052}
serializedVersion: 2
m_LocalRotation: {x: 0.39326245, y: -0.000000015820001, z: 0.0000000067666246, w: 0.91942626}
m_LocalRotation: {x: 0.39326245, y: -0.00000001582, z: 0.0000000067666237, w: 0.91942626}
m_LocalPosition: {x: 6.377, y: 11.608, z: -4.104}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1756,7 +1756,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 501722143}
serializedVersion: 2
m_LocalRotation: {x: 0.39326245, y: -0.000000015820001, z: 0.0000000067666246, w: 0.91942626}
m_LocalRotation: {x: 0.39326245, y: -0.00000001582, z: 0.0000000067666237, w: 0.91942626}
m_LocalPosition: {x: 6.377, y: 11.608, z: -4.104}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -3053,8 +3053,8 @@ GameObject:
- component: {fileID: 977669109}
- component: {fileID: 977669107}
- component: {fileID: 977669108}
- component: {fileID: 977669112}
- component: {fileID: 977669113}
- component: {fileID: 977669114}
m_Layer: 4
m_Name: Water Object
m_TagString: Untagged
@ -3174,7 +3174,22 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &977669112
--- !u!114 &977669113
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 977669105}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52480f6baf9b7b0428c75481cb3d5a6d, type: 3}
m_Name:
m_EditorClassIdentifier:
material: {fileID: 2100000, guid: 5fafa8676906446259d1790e3543945a, type: 2}
meshFilter: {fileID: 977669110}
meshRenderer: {fileID: 977669109}
--- !u!114 &977669114
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -3191,21 +3206,6 @@ MonoBehaviour:
waterPlane: {fileID: 977669109}
waterLevel: 0
dynamicMaterial: 1
--- !u!114 &977669113
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 977669105}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52480f6baf9b7b0428c75481cb3d5a6d, type: 3}
m_Name:
m_EditorClassIdentifier:
material: {fileID: 2100000, guid: 5fafa8676906446259d1790e3543945a, type: 2}
meshFilter: {fileID: 977669110}
meshRenderer: {fileID: 977669109}
--- !u!1 &1020233587
GameObject:
m_ObjectHideFlags: 0
@ -4919,6 +4919,238 @@ MonoBehaviour:
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
m_CursorLockBehavior: 0
--- !u!1 &1894036853
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1894036861}
- component: {fileID: 1894036860}
- component: {fileID: 1894036859}
- component: {fileID: 1894036858}
- component: {fileID: 1894036857}
- component: {fileID: 1894036856}
- component: {fileID: 1894036855}
- component: {fileID: 1894036854}
m_Layer: 21
m_Name: Sphere
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1894036854
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5ca3428d119d4dc5a018840803e81994, type: 3}
m_Name:
m_EditorClassIdentifier:
material: {fileID: 11400000, guid: bcb559cbb0ee0fe49b3d7a3b54039bdb, type: 2}
density: 0
mass: 212.2115
volume: 0.424423
--- !u!114 &1894036855
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9118365f988afd4419c64e108a8bbc64, type: 3}
m_Name:
m_EditorClassIdentifier:
finalForceCoefficient: 1
finalTorqueCoefficient: 1
defaultWaterHeight: 0
defaultWaterNormal: {x: 0, y: 1, z: 0}
defaultWaterFlow: {x: 0, y: 0, z: 0}
calculateWaterHeights: 1
calculateWaterNormals: 1
calculateWaterFlows: 1
fluidDensity: 1030
buoyantForceCoefficient: 1
slamForceCoefficient: 1
suctionForceCoefficient: 1
hydrodynamicForceCoefficient: 1
velocityDotPower: 1
skinDragCoefficient: 0.01
convexifyMesh: 1
simplifyMesh: 1
weldColocatedVertices: 1
targetTriangleCount: 32
originalMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
serializedSimulationMesh:
vertices:
- {x: 0.000000030994414, y: 0.45910156, z: 0.19627564}
- {x: 0.45026365, y: -0.19199951, z: -0.09450744}
- {x: 0.24850342, y: -0.24850342, z: -0.3535864}
- {x: -0.090518795, y: 0.40607908, z: -0.2764746}
- {x: 0.09754516, y: -3.605237e-11, z: 0.49039063}
- {x: 0.41573486, y: 2.2700987e-11, z: 0.27778563}
- {x: -0.41236326, y: -0.2801587, z: 0.000000038146972}
- {x: 0, y: -0.5, z: 0}
- {x: -0.24923584, y: 0.24850342, z: 0.35475096}
- {x: 0.41374755, y: 0.28022215, z: -0.0000001335144}
- {x: -0.2811499, y: 0.41286132, z: 0}
- {x: 0.41374755, y: -0.0008836472, z: -0.2811499}
- {x: 0.17071289, y: 0.33156982, z: -0.33247313}
- {x: -0.4896582, y: 0.10029724, z: 0}
- {x: -0.0902124, y: -0.2754956, z: -0.40558106}
- {x: -0.35475096, y: 0.24850342, z: -0.24923584}
- {x: -0.40558106, y: -0.0902124, z: 0.2754956}
- {x: 0.000000047683713, y: -0.41236326, z: 0.2801587}
triangles: 00000000090000000c000000080000000400000000000000040000000800000010000000080000000d000000100000000c0000000300000000000000030000000c0000000e0000001100000007000000010000000400000010000000110000000000000004000000050000000000000005000000090000000900000005000000010000000100000005000000110000001100000005000000040000000b0000000900000001000000090000000b0000000c0000000a0000000800000000000000080000000a0000000d00000000000000030000000a000000030000000e0000000f0000000f0000000a000000030000000f0000000d0000000a00000007000000020000000100000002000000070000000e00000001000000020000000b0000000c0000000b000000020000000e0000000c000000020000000e0000000700000006000000060000000700000011000000110000001000000006000000100000000d00000006000000060000000d0000000f0000000f0000000e00000006000000
triangleCount: 0
vertexCount: 0
targetRigidbody: {fileID: 1894036857}
submergedVolume: 0
--- !u!114 &1894036856
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 818177d2061f4558b66bee63b4cc78f6, type: 3}
m_Name:
m_EditorClassIdentifier:
useDefaultMass: 1
useMassAffectors: 0
baseMass: 212.2115
combinedMass: 1
dimensions: {x: 18.17, y: 1.85, z: 16.88}
useDefaultCenterOfMass: 1
centerOfMass: {x: 0, y: 0, z: 0}
combinedCenterOfMass: {x: 0, y: 0, z: 0}
useDefaultInertia: 1
inertiaTensor: {x: 21.22115, y: 21.22115, z: 21.22115}
combinedInertiaTensor: {x: 0, y: 0, z: 0}
--- !u!54 &1894036857
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
serializedVersion: 4
m_Mass: 212.2115
m_Drag: 0.05
m_AngularDrag: 0.15
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!135 &1894036858
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1894036859
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1894036860
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1894036861
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1894036853}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 17.67, y: 0, z: 16.38}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1897066335
GameObject:
m_ObjectHideFlags: 0
@ -17982,8 +18214,8 @@ MonoBehaviour:
defaultWaterNormal: {x: 0, y: 1, z: 0}
defaultWaterFlow: {x: 0, y: 0, z: 0}
calculateWaterHeights: 1
calculateWaterNormals: 0
calculateWaterFlows: 0
calculateWaterNormals: 1
calculateWaterFlows: 1
fluidDensity: 1030
buoyantForceCoefficient: 1
slamForceCoefficient: 1
@ -18729,3 +18961,4 @@ SceneRoots:
- {fileID: 511078065}
- {fileID: 6141662311193982093}
- {fileID: 1948897358}
- {fileID: 1894036861}

View File

@ -18,6 +18,7 @@ MonoBehaviour:
fadePercentage: 10
texelsPerUnit: 8
maxResolution: 4096
highPrecision: 1
enableDisplacement: 1
enableNormals: 1
halfResolutionNormals: 0
@ -40,6 +41,26 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Active: 1
shader: {fileID: 0}
--- !u!114 &-4244631053236925429
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2086e3e143e14a2abcd3b0dbc77a10ac, type: 3}
m_Name: Stylized Water 2
m_EditorClassIdentifier:
m_Active: 1
screenSpaceReflectionSettings:
enable: 0
directionalCaustics: 0
displacementPrePassSettings:
enable: 0
range: 500
cellSize: 0.25
--- !u!114 &-4104698691654496493
MonoBehaviour:
m_ObjectHideFlags: 0
@ -155,6 +176,7 @@ MonoBehaviour:
- {fileID: -4104698691654496493}
- {fileID: -6775967833334884883}
- {fileID: -1928039177417452880}
- {fileID: -4244631053236925429}
m_RendererFeatureMap: adc0de57c6d2eee5134fec9d492e09c7edd599fc27edf6a1
m_UseNativeRenderPass: 0
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}

View File

@ -10,6 +10,8 @@ Material:
m_Name: StylizedWater2_Desktop
m_Shader: {fileID: -6465566751694194690, guid: d7b0192b9bf19c949900035fa781fdc4,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ADVANCED_SHADING
- _CAUSTICS
@ -34,6 +36,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:

View File

@ -277,7 +277,7 @@ Material:
- _VertexColorWaveFlattening: 0
- _WaveCount: 5
- _WaveDistance: 0.97
- _WaveHeight: 1.7
- _WaveHeight: 2
- _WaveNormalStr: 2
- _WaveSpeed: 1.5
- _WaveSteepness: 1.76

View File

@ -17,7 +17,7 @@ PhysicsManager:
m_EnableAdaptiveForce: 0
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_LayerCollisionMatrix: 0400000000000000010000004026020000000000000000000800000000000000000000000826220208262000000000000000000008262000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000020000000000000000000000000000000000000000000000000000
m_LayerCollisionMatrix: 0400000000000000010000004026020000022000000000000800000000000000000000001826220208262000000000000000000008262000000000000000000000000000080200000000000000000000000000001026000000000000000000000000000000020000000000000000000000000000000000000000000000000000
m_SimulationMode: 0
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 0

View File

@ -810,7 +810,7 @@ PlayerSettings:
PS5: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS
QNX: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS
Stadia: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE
Standalone: CROSS_PLATFORM_INPUT;UNITY_POST_PROCESSING_STACK_V2;DWP_CREST;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;INPUT_SYSTEM_PACKAGE;MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED;ODIN_INSPECTOR_EDITOR_ONLY;DISTANT_LANDS;COZY_WEATHER;COZY_URP;TMP_PRESENT;USE_NAVMESH;USE_CINEMACHINE;USE_NEW_INPUT;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS;NWH_DWP2
Standalone: CROSS_PLATFORM_INPUT;UNITY_POST_PROCESSING_STACK_V2;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;INPUT_SYSTEM_PACKAGE;MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED;ODIN_INSPECTOR_EDITOR_ONLY;DISTANT_LANDS;COZY_WEATHER;COZY_URP;TMP_PRESENT;USE_NAVMESH;USE_CINEMACHINE;USE_NEW_INPUT;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS;NWH_DWP2
VisionOS: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE
WebGL: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS
Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS