massive number of fixes, removed compilation error, logs, negative scale issues, serialization issues ETC

This commit is contained in:
2024-11-25 15:15:55 +01:00
parent 48d565f77e
commit 8d766ed470
48 changed files with 1442 additions and 2434 deletions

View File

@@ -2,6 +2,11 @@
All notable changes to “FluXY - 2.5D fluid simulator” will be documented in this file.
## [1.4.1] - 2023-06-20
### Fixed
- "Blit material FluidSimulation uses dest texture as input" error in Unity 2022.
## [1.4] - 2022-11-28
### Added

View File

@@ -41,11 +41,11 @@ Material:
- _FrameCount: 32
m_Floats:
- _Additiveness: 0.4
- _DetailAdvection: 0.582
- _DetailAdvection: 0.5
- _Duration: 2
- _Falloff: 0.2
- _Interpolation: 1
- _InvFade: 7.76
- _InvFade: 1
- _PlaybackOffset: 0
- _PlaybackSpeed: 1
m_Colors: []

View File

@@ -2,21 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Checker
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@@ -65,28 +63,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
@@ -112,7 +94,6 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
--- !u!114 &4867376423469122306
MonoBehaviour:
m_ObjectHideFlags: 11
@@ -125,4 +106,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 1

View File

@@ -2,16 +2,14 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fog
m_Shader: {fileID: 4800000, guid: ac39d2e3d512e4c7e9e69c2a398d0410, type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
- _LIGHTSOURCE_DIRECTIONAL
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -26,7 +24,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Detail:
m_Texture: {fileID: 2800000, guid: dc9686736bbe940ecb6bad0b65c14d04, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
@@ -65,19 +63,18 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Additiveness: 0.231
- _Additiveness: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailAdvection: 0.723
- _DetailAdvection: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Falloff: 0.631
- _Falloff: 0.4
- _GlossMapScale: 1
- _Glossiness: 0.361
- _GlossyReflections: 1
- _InvFade: 1.07
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _MotionBlur: 1
@@ -91,4 +88,3 @@ Material:
m_Colors:
- _Color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 0.7647059}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@@ -2,21 +2,19 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Guy
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@@ -65,28 +63,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
@@ -112,7 +94,6 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
--- !u!114 &7453540739763953152
MonoBehaviour:
m_ObjectHideFlags: 11
@@ -125,4 +106,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
version: 1

View File

@@ -1,43 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-9175737683816143566
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Piece
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -74,35 +55,11 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
@@ -110,19 +67,11 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.49056596, g: 0.37749287, b: 0.27536485, a: 1}
- _Color: {r: 0.49056596, g: 0.37749285, b: 0.27536482, a: 1}
- _Color: {r: 0.49056602, g: 0.3774929, b: 0.27536488, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -23,9 +23,7 @@ Material:
m_Name: URP ToxicWaste
m_Shader: {fileID: -6465566751694194690, guid: 34b9cd94cbb1d44549f707fb76ba499d,
type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
- _LIGHTSOURCE_NONE
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -113,14 +111,14 @@ Material:
- Vector1_315F66DC: 1
- Vector1_32ADC857: 0.5
- Vector1_4AA7C398: 0
- Vector1_4E55263A: 0.853
- Vector1_4E55263A: 1
- Vector1_89BD7D39: 1
- Vector1_9E3307DE: 15
- Vector1_A6321E6B: 2.5
- Vector1_A668B339: 1
- Vector1_A6DF0022: 0.04
- Vector1_A8D33A48: -0.5
- Vector1_D30E0CD7: 0.306
- Vector1_D30E0CD7: 0.15
- Vector1_EA533925: 2
- _Additiveness: 0
- _BumpScale: 1
@@ -142,13 +140,13 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _TileIndex: 1.25
- _TileIndex: 0
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- Color_3D2DB61D: {r: 0.3018868, g: 0.008354024, b: 0, a: 1}
- Color_9E182C8D: {r: 1, g: 0, b: 0, a: 1}
- Color_C1C04D3: {r: 0.4056604, g: 0, b: 0.051067144, a: 1}
- Color_3D2DB61D: {r: 0.6294432, g: 0.7169812, b: 0.23335709, a: 1}
- Color_9E182C8D: {r: 1, g: 1, b: 1, a: 1}
- Color_C1C04D3: {r: 0.7113185, g: 0.9150943, b: 0.17697577, a: 1}
- Color_DFEE58AE: {r: 0.7216981, g: 1, b: 0.98114526, a: 0.3882353}
- Vector2_73BFA364: {r: 0, g: 0, b: 0, a: 0}
- Vector2_7D6FBF77: {r: 4, g: 4, b: 0, a: 0}

View File

@@ -12,8 +12,7 @@ Material:
type: 3}
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _LIGHTSOURCE_DIRECTIONAL
- _NOISE_ON
- _LIGHTSOURCE_POINT
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
@@ -99,17 +98,17 @@ Material:
m_Floats:
- Vector1_262E5DD6: 1
- Vector1_3FEA0E54: 0
- Vector1_837DA489: 22.3
- Vector1_837DA489: 16
- Vector1_9808C570: 1
- Vector1_9E6B6241: 18
- Vector1_C4967509: 34.8
- Vector1_E676DA21: 26.42
- Vector1_F3B7B00E: 19.21
- Vector1_9E6B6241: 8
- Vector1_C4967509: 0.2
- Vector1_E676DA21: 8
- Vector1_F3B7B00E: 4
- _AlphaClip: 0
- _Blend: 1
- _BumpScale: 1
- _CastShadows: 1
- _Cull: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
@@ -119,7 +118,7 @@ Material:
- _LIGHTSOURCE: 1
- _Metallic: 0
- _Mode: 0
- _NOISE: 1
- _NOISE: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
@@ -132,19 +131,19 @@ Material:
- _ZTest: 8
- _ZWrite: 0
- _ZWriteControl: 0
- _densityThreshold: 0.953
- _noiseAdvectSpeed: 5.21
- _densityThreshold: 0.001
- _noiseAdvectSpeed: 1
- _noiseAdvectTime: 0.5
- _noisePow: 4.74
- _noiseScale: 22.2
- _shadowThreshold: 0.129
- _volumeExtrusion: 0.39
- _volumeFalloff: 1.222
- _noisePow: 3
- _noiseScale: 20
- _shadowThreshold: 0.1
- _volumeExtrusion: 1
- _volumeFalloff: 0.15
- _volumeOffset: 1
m_Colors:
- Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1}
- Color_753F6498: {r: 0.12996809, g: 0.7169812, b: 0.064257726, a: 1}
- Color_BE47E8B5: {r: 0.0018689941, g: 0.05660379, b: 0.005924961, a: 0.972549}
- Color_753F6498: {r: 0.16700785, g: 0.22076505, b: 0.254717, a: 1}
- Color_BE47E8B5: {r: 0.754717, g: 0.29547882, b: 0.75103265, a: 0.972549}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@@ -11,9 +11,8 @@ Material:
m_Shader: {fileID: -6465566751694194690, guid: ef381005b8a834c9fa2733d96c543d31,
type: 3}
m_ValidKeywords:
- _ALPHATEST_ON
- _ALPHAPREMULTIPLY_ON
- _LIGHTSOURCE_DIRECTIONAL
- _NOISE_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
@@ -99,14 +98,14 @@ Material:
m_Floats:
- Vector1_262E5DD6: 1
- Vector1_3FEA0E54: 0
- Vector1_837DA489: 20.4
- Vector1_837DA489: 12
- Vector1_9808C570: 1
- Vector1_9E6B6241: 37
- Vector1_C4967509: -3.17
- Vector1_E676DA21: 21.04
- Vector1_F3B7B00E: 43.12
- _AlphaClip: 1
- _Blend: 0
- Vector1_9E6B6241: 12
- Vector1_C4967509: 0.5
- Vector1_E676DA21: 20
- Vector1_F3B7B00E: 2
- _AlphaClip: 0
- _Blend: 1
- _BumpScale: 1
- _CastShadows: 1
- _Cull: 2
@@ -119,32 +118,32 @@ Material:
- _LIGHTSOURCE: 1
- _Metallic: 0
- _Mode: 0
- _NOISE: 1
- _NOISE: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _SrcBlend: 1
- _Surface: 1
- _UVSec: 0
- _ZTest: 8
- _ZWrite: 0
- _ZWriteControl: 0
- _densityThreshold: 0.799
- _noiseAdvectSpeed: -0.16
- _densityThreshold: 0.01
- _noiseAdvectSpeed: 0.5
- _noiseAdvectTime: 1
- _noisePow: 1.3
- _noisePow: 3
- _noiseScale: 4
- _shadowThreshold: 0.309
- _volumeExtrusion: 0.768
- _volumeFalloff: 0.57
- _volumeOffset: 0.057
- _shadowThreshold: 0.1
- _volumeExtrusion: 0.5
- _volumeFalloff: 0.5
- _volumeOffset: 0.5
m_Colors:
- Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1}
- Color_753F6498: {r: 0.46226418, g: 0.18543416, b: 0.0021804967, a: 1}
- Color_BE47E8B5: {r: 0.4245283, g: 0.17613408, b: 0, a: 0.972549}
- Color_753F6498: {r: 0.33922213, g: 0.6011469, b: 0.7264151, a: 1}
- Color_BE47E8B5: {r: 0.5754717, g: 0.45293194, b: 0.36102706, a: 0.972549}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@@ -12,7 +12,7 @@ Material:
type: 3}
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _LIGHTSOURCE_NONE
- _LIGHTSOURCE_POINT
- _NOISE_ON
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
@@ -99,12 +99,12 @@ Material:
m_Floats:
- Vector1_262E5DD6: 1
- Vector1_3FEA0E54: 0
- Vector1_837DA489: 9.9
- Vector1_837DA489: 12
- Vector1_9808C570: 1
- Vector1_9E6B6241: 38.9
- Vector1_9E6B6241: 8
- Vector1_C4967509: 4
- Vector1_E676DA21: 30
- Vector1_F3B7B00E: 4.23
- Vector1_F3B7B00E: 4
- _AlphaClip: 0
- _Blend: 1
- _BumpScale: 1
@@ -143,8 +143,8 @@ Material:
- _volumeOffset: 0.5
m_Colors:
- Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1}
- Color_753F6498: {r: 0.46070668, g: 0.47495696, b: 0.4811321, a: 1}
- Color_BE47E8B5: {r: 0.5849056, g: 0.2683053, b: 0, a: 0.972549}
- Color_753F6498: {r: 0.13527946, g: 0.25190458, b: 0.3018868, a: 1}
- Color_BE47E8B5: {r: 0.7264151, g: 0.4958822, b: 0.29810432, a: 0.972549}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -23,11 +23,9 @@ Material:
m_Name: URP Water
m_Shader: {fileID: -6465566751694194690, guid: 1940d71d1af574d38b552638ff25c9ad,
type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
- _LIGHTSOURCE_NONE
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
@@ -101,20 +99,20 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Vector1_2934D119: 20.45
- Vector1_2934D119: 0.5
- Vector1_315F66DC: 1
- Vector1_32ADC857: 26.3
- Vector1_4AA7C398: 0.279
- Vector1_4F638F23: -0.5
- Vector1_32ADC857: 1
- Vector1_4AA7C398: 0
- Vector1_4F638F23: -0.25
- Vector1_5F6501F5: 0
- Vector1_74E26674: 0.5
- Vector1_89BD7D39: 0.86
- Vector1_8F171F43: 0.2
- Vector1_A6321E6B: 1.17
- Vector1_A668B339: 0.294
- Vector1_A6DF0022: 0.25
- Vector1_D183151F: 0.7
- Vector1_F22C9906: 0.57
- Vector1_89BD7D39: 1
- Vector1_8F171F43: 0.1
- Vector1_A6321E6B: 3
- Vector1_A668B339: 0.5
- Vector1_A6DF0022: 0.04
- Vector1_D183151F: 4
- Vector1_F22C9906: 2
- _Additiveness: 0
- _BumpScale: 1
- _Cutoff: 0.5
@@ -135,13 +133,13 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _TileIndex: 1.09
- _TileIndex: 0
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- Color_709ED842: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 0.6862745}
- Color_9E182C8D: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 0.8784314}
- Color_DFEE58AE: {r: 1, g: 1, b: 1, a: 1}
- Color_709ED842: {r: 1, g: 1, b: 1, a: 0.9058824}
- Color_9E182C8D: {r: 0.23905303, g: 0.5591888, b: 0.6415094, a: 0.8352941}
- Color_DFEE58AE: {r: 0.6045301, g: 0.8962264, b: 0.82638365, a: 0.3882353}
- Vector2_63614596: {r: 0.02, g: -0.1, b: 0, a: 0}
- Vector2_78FB6B63: {r: 5, g: 5, b: 0, a: 0}
- Vector2_7E649864: {r: 0, g: 0, b: 0, a: 0}

View File

@@ -261,6 +261,15 @@
},
{
"m_Id": "c9b079fd494f4c8a99822b4a52a259b8"
},
{
"m_Id": "ab1a481cdf564504b837ed7877f6663f"
},
{
"m_Id": "30d04585da65453cbe3485a7156cd296"
},
{
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
}
],
"m_GroupDatas": [
@@ -332,20 +341,6 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "2a5ca6696c530e8c874719b853083a48"
},
"m_SlotId": 1
},
"m_InputSlot": {
"m_Node": {
"m_Id": "8eb325963471496fa92ad14e027cf020"
},
"m_SlotId": 2
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -360,6 +355,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "30d04585da65453cbe3485a7156cd296"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -402,6 +411,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 2
},
"m_InputSlot": {
"m_Node": {
"m_Id": "8eb325963471496fa92ad14e027cf020"
},
"m_SlotId": 2
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -696,6 +719,20 @@
"m_SlotId": 4
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "ab1a481cdf564504b837ed7877f6663f"
},
"m_SlotId": 0
},
"m_InputSlot": {
"m_Node": {
"m_Id": "4fad8de703eb41b583e500027c9bdfb6"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -1929,6 +1966,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "1c8a8ac7ae0941b3991c2fe6a11379a2",
"m_Id": 0,
"m_DisplayName": "A",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "A",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
}
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.ShaderKeyword",
@@ -2224,6 +2285,44 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ViewVectorNode",
"m_ObjectId": "30d04585da65453cbe3485a7156cd296",
"m_Group": {
"m_Id": ""
},
"m_Name": "View Vector",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2002.999755859375,
"y": 33.00000762939453,
"width": 206.0,
"height": 131.0
}
},
"m_Slots": [
{
"m_Id": "5df6c952da824e288e634fe81979c48a"
},
{
"m_Id": "81dcfd920a3d46c8b29dceb767fd69d0"
}
],
"synonyms": [
"eye vector"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Space": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
@@ -2818,6 +2917,48 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.AddNode",
"m_ObjectId": "4fad8de703eb41b583e500027c9bdfb6",
"m_Group": {
"m_Id": ""
},
"m_Name": "Add",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -1630.0,
"y": -82.00000762939453,
"width": 130.0,
"height": 118.00001525878906
}
},
"m_Slots": [
{
"m_Id": "1c8a8ac7ae0941b3991c2fe6a11379a2"
},
{
"m_Id": "5e65d8acebf044e08eda4eaaab4c9668"
},
{
"m_Id": "de9e74eaad8f4bfbbfc9d0352a617b94"
}
],
"synonyms": [
"addition",
"sum",
"plus"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -3176,6 +3317,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
"m_ObjectId": "5df6c952da824e288e634fe81979c48a",
"m_Id": 3,
"m_DisplayName": "World Space Position",
"m_SlotType": 0,
"m_Hidden": true,
"m_ShaderOutputName": "WorldSpacePosition",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 2
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -3218,6 +3383,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "5e65d8acebf044e08eda4eaaab4c9668",
"m_Id": 1,
"m_DisplayName": "B",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3469,6 +3658,29 @@
]
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
"m_ObjectId": "72e0664908974c2cb8f362df4ed9648b",
"m_Id": 0,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -3977,6 +4189,29 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
"m_ObjectId": "81dcfd920a3d46c8b29dceb767fd69d0",
"m_Id": 0,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -5161,6 +5396,42 @@
}
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.PositionNode",
"m_ObjectId": "ab1a481cdf564504b837ed7877f6663f",
"m_Group": {
"m_Id": ""
},
"m_Name": "Position",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2003.0,
"y": -117.0,
"width": 206.0,
"height": 131.00001525878907
}
},
"m_Slots": [
{
"m_Id": "72e0664908974c2cb8f362df4ed9648b"
}
],
"synonyms": [
"location"
],
"m_Precision": 1,
"m_PreviewExpanded": false,
"m_PreviewMode": 2,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_Space": 0,
"m_PositionSource": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -6767,6 +7038,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
"m_ObjectId": "de9e74eaad8f4bfbbfc9d0352a617b94",
"m_Id": 2,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0,
"w": 0.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",

File diff suppressed because it is too large Load Diff

View File

@@ -400,6 +400,8 @@ namespace Fluxy
}
}
simulationMaterial.SetTexture("_MainTex", null);
RenderTexture.active = old;
}

View File

@@ -16,7 +16,7 @@ namespace Invector.vCharacterController
public const float walkSpeed = 0.5f;
public const float runningSpeed = 1f;
public const float sprintSpeed = 1.5f;
private bool triggerDieBehaviour;
public bool triggerDieBehaviour;
public Vector3 lastCharacterPosition { get; protected set; }
#endregion

View File

@@ -1118,14 +1118,7 @@ ModelImporter:
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events:
- time: 0.4514425
functionName: NewEvent
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}