Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
This commit is contained in:
@@ -3236,11 +3236,11 @@ PrefabInstance:
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: reverbAuxBus.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 2250685977792764f9923476afdf22ec, type: 2}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneEvent.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 85171d08b855c9345b6c6c28acb8a83a, type: 2}
|
||||
objectReference: {fileID: 11400000, guid: d85f0908830fb2f4093fdee812de9327, type: 2}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 3976092107026356747, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
@@ -34594,6 +34594,67 @@ MeshCollider:
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 6802767204323751312, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
--- !u!1001 &1463114954
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.697
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 16.194
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5856443040925330738, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WwiseAkEmitter_CRTHead
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8660823651490621642, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
propertyPath: data.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: d1dcd5b446da15b47a7733c5eb4f1fb2, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
|
||||
--- !u!1 &1466363513
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -64016,3 +64077,4 @@ SceneRoots:
|
||||
- {fileID: 622343290}
|
||||
- {fileID: 1321486799}
|
||||
- {fileID: 1669380717}
|
||||
- {fileID: 1463114954}
|
||||
|
||||
@@ -267,9 +267,12 @@ void EnkiBillalFullscreen_float
|
||||
// DISTORTION
|
||||
|
||||
float distortAtten = pow(smoothstep(5, 20, depthMeters), 2);
|
||||
float nDistort = FBMNoise3D(positionWS * float3(1, 2, 1) - time * .1 - np0 * .5, 1.5, 1, 2, .5) * 2 - 1;
|
||||
float2 uvDistort = uv0 + nDistort * .03;
|
||||
float3 sceneColor2 = SampleSceneColor(uvDistort);
|
||||
float nDistort0 = FBMNoise3D(positionWS * float3(1, 2.0, 1) - time * .1 - np0 * .5 + np3 * 3, 1.5, 1, 2, .5) * 2 - 1;
|
||||
float nDistort1 = FBMNoise3D(positionWS * float3(1, 1.5, 1) - time * .1 - np0 * .5 + np4 * 3, 1.5, 1, 2, .5) * 2 - 1;
|
||||
float2 uvDistort0 = uv0 + nDistort0 * .005;
|
||||
float2 uvDistort1 = uv0 + nDistort1 * .015;
|
||||
float3 sceneColor2 = SampleSceneColor(uvDistort0);
|
||||
sceneColor2 = lerp(sceneColor2, SampleSceneColor(uvDistort1), .3);
|
||||
float3 cDistort = saturate(sceneColor2 - sceneColor) * distortAtten;
|
||||
|
||||
// OUTLINE
|
||||
@@ -314,7 +317,7 @@ void EnkiBillalFullscreen_float
|
||||
//c = lerp(c, sceneColor2, (greyscale + smoothstep(5, 35, depthMeters) * .8) * .5);
|
||||
//c += sceneColor2 * greyscale * .5;
|
||||
c = lerp(c, outlineColor, outline);
|
||||
c += cDistort * .5;
|
||||
c += cDistort * 1;
|
||||
//c = ((c + 1) * (sceneColor2 + 0));
|
||||
//c = smoothstep(-.1, 0, np2);
|
||||
//c = greyscale;
|
||||
|
||||
Reference in New Issue
Block a user