Skip to content
Permalink
Browse files

Implemented basic pouring

  • Loading branch information...
Legorobotdude committed May 8, 2018
1 parent 452e743 commit 4382db9d3c733d69a3d54c10af61fb9b5de6809d
@@ -40,7 +40,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 31a0dba64c25fa442a02171bc2131ccc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -157,12 +157,12 @@ Prefab:
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 1668371613}
objectReference: {fileID: 1568324868}
- target: {fileID: 33348742771123612, guid: 12bf5b636183b58438213ac820441dd8,
type: 2}
propertyPath: m_Mesh
value:
objectReference: {fileID: 1668371613}
objectReference: {fileID: 1568324868}
- target: {fileID: 4504764956028928, guid: 12bf5b636183b58438213ac820441dd8, type: 2}
propertyPath: m_LocalPosition.x
value: 2.4126
@@ -1381,12 +1381,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ece1e25f903dc674d930dd9afc4dfc18, type: 3}
m_Name:
m_EditorClassIdentifier:
liquidType: Water
liquidParticleSystem: {fileID: 1657521802}
liquidObject: {fileID: 803262450}
isPourable: 1
filledLevel: 0
emptyLevel: 1
currentLevel: 1
currentLevel: 0.5
--- !u!1001 &759604125
Prefab:
m_ObjectHideFlags: 0
@@ -2642,6 +2643,146 @@ GameObject:
m_PrefabParentObject: {fileID: 1021972085424444, guid: 7090eda0c9afe674abb6ea676a67127f,
type: 2}
m_PrefabInternal: {fileID: 1829742346}
--- !u!43 &1568324868
Mesh:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: pb_Mesh-1130
serializedVersion: 8
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 30
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 20
localAABB:
m_Center: {x: 2.5, y: 2, z: 2}
m_Extent: {x: 5.5, y: 2, z: 4}
- serializedVersion: 2
firstByte: 60
indexCount: 6
topology: 0
baseVertex: 0
firstVertex: 20
vertexCount: 4
localAABB:
m_Center: {x: 2.5, y: 0, z: 2}
m_Extent: {x: 5.5, y: 0, z: 4}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000001000200000002000300040005000600040006000700080009000a0008000a000b000c000d000e000c000e000f00100011001200100012001300140015001600140016001700
m_Skin: []
m_VertexData:
m_CurrentChannels: 159
m_VertexCount: 24
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 24
format: 0
dimension: 4
- stream: 0
offset: 40
format: 0
dimension: 2
- stream: 0
offset: 48
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 56
format: 0
dimension: 4
m_DataSize: 1728
_typelessdata: 000040c0000080400000c0400000000000000000000080bf0000803f0000803f0000803f0000803f000040c000008040bbf0fd3e4f4a3b3e0000803f0000000000000000000080bf00000041000080400000c0400000000000000000000080bf0000803f0000803f0000803f0000803f0000004100008040e012833b4f4a3b3e0000803f0000000000000000000080bf00000041000000000000c0400000000000000000000080bf0000803f0000803f0000803f0000803f00000041000000006f12833b6f12833b0000803f0000000000000000000080bf000040c0000000000000c0400000000000000000000080bf0000803f0000803f0000803f0000803f000040c000000000b9f0fd3e6f12833b0000803f0000000000000000000080bf00000041000080400000c040000080bf00000000000000000000803f0000803f0000803f0000803f0000c0c00000804062975b3fbb770c3f0000000000000000000080bf000080bf0000004100008040000000c0000080bf00000000000000000000803f0000803f0000803f0000803f0000004000008040fffcff3ebb770c3f0000000000000000000080bf000080bf0000004100000000000000c0000080bf00000000000000000000803f0000803f0000803f0000803f0000004000000000fdfcff3e9956bd3e0000000000000000000080bf000080bf00000041000000000000c040000080bf00000000000000000000803f0000803f0000803f0000803f0000c0c00000000061975b3f9956bd3e0000000000000000000080bf000080bf0000004100008040000000c000000000000000000000803f0000803f0000803f0000803f0000803f000000c100008040bbf07d3f4f4a3b3e000080bf0000000000000000000080bf000040c000008040000000c000000000000000000000803f0000803f0000803f0000803f0000803f000040400000804007fdff3e4f4a3b3e000080bf0000000000000000000080bf000040c000000000000000c000000000000000000000803f0000803f0000803f0000803f0000803f000040400000000005fdff3e6f12833b000080bf0000000000000000000080bf0000004100000000000000c000000000000000000000803f0000803f0000803f0000803f0000803f000000c100000000baf07d3f6f12833b000080bf0000000000000000000080bf000040c000008040000000c00000803f00000000000000000000803f0000803f0000803f0000803f000000c00000804062975b3f4f4abb3e00000000000000000000803f000080bf000040c0000080400000c0400000803f00000000000000000000803f0000803f0000803f0000803f0000c04000008040fffcff3e4f4abb3e00000000000000000000803f000080bf000040c0000000000000c0400000803f00000000000000000000803f0000803f0000803f0000803f0000c04000000000fdfcff3ee3623f3e00000000000000000000803f000080bf000040c000000000000000c00000803f00000000000000000000803f0000803f0000803f0000803f000000c00000000061975b3fe3623f3e00000000000000000000803f000080bf000040c000008040000000c000000000000080bf000000000000803f0000803f0000803f0000803f00004040000000c06f12833be3623f3e000080bf0000000000000000000080bf0000004100008040000000c000000000000080bf000000000000803f0000803f0000803f0000803f000000c1000000c0b1f0fd3ee3623f3e000080bf0000000000000000000080bf00000041000080400000c04000000000000080bf000000000000803f0000803f0000803f0000803f000000c10000c040b3f0fd3e99710b3f000080bf0000000000000000000080bf000040c0000080400000c04000000000000080bf000000000000803f0000803f0000803f0000803f000040400000c040e812833b99710b3f000080bf0000000000000000000080bf000040c0000000000000c040000000000000803f000000000000803f0000803f0000803f0000803f000040c00000c040b3f0fd3e9f10683f0000803f0000000000000000000080bf00000041000000000000c040000000000000803f000000000000803f0000803f0000803f0000803f000000410000c040e812833b9f10683f0000803f0000000000000000000080bf0000004100000000000000c0000000000000803f000000000000803f0000803f0000803f0000803f00000041000000c06f12833bbe770c3f0000803f0000000000000000000080bf000040c000000000000000c0000000000000803f000000000000803f0000803f0000803f0000803f000040c0000000c0b1f0fd3ebe770c3f0000803f0000000000000000000080bf
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 2.5, y: 2, z: 2}
m_Extent: {x: 5.5, y: 2, z: 4}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshOptimized: 0
--- !u!1 &1613511681 stripped
GameObject:
m_PrefabParentObject: {fileID: 1719534049755708, guid: 40809e161f44a184a869411a24651918,
@@ -2827,7 +2968,7 @@ ParticleSystem:
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: -1279062864
randomSeed: 895716180
InitialModule:
serializedVersion: 3
enabled: 1
@@ -6128,146 +6269,6 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!43 &1668371613
Mesh:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: pb_Mesh-1138
serializedVersion: 8
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 30
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 20
localAABB:
m_Center: {x: 2.5, y: 2, z: 2}
m_Extent: {x: 5.5, y: 2, z: 4}
- serializedVersion: 2
firstByte: 60
indexCount: 6
topology: 0
baseVertex: 0
firstVertex: 20
vertexCount: 4
localAABB:
m_Center: {x: 2.5, y: 0, z: 2}
m_Extent: {x: 5.5, y: 0, z: 4}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000001000200000002000300040005000600040006000700080009000a0008000a000b000c000d000e000c000e000f00100011001200100012001300140015001600140016001700
m_Skin: []
m_VertexData:
m_CurrentChannels: 159
m_VertexCount: 24
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 24
format: 0
dimension: 4
- stream: 0
offset: 40
format: 0
dimension: 2
- stream: 0
offset: 48
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 56
format: 0
dimension: 4
m_DataSize: 1728
_typelessdata: 000040c0000080400000c0400000000000000000000080bf0000803f0000803f0000803f0000803f000040c000008040bbf0fd3e4f4a3b3e0000803f0000000000000000000080bf00000041000080400000c0400000000000000000000080bf0000803f0000803f0000803f0000803f0000004100008040e012833b4f4a3b3e0000803f0000000000000000000080bf00000041000000000000c0400000000000000000000080bf0000803f0000803f0000803f0000803f00000041000000006f12833b6f12833b0000803f0000000000000000000080bf000040c0000000000000c0400000000000000000000080bf0000803f0000803f0000803f0000803f000040c000000000b9f0fd3e6f12833b0000803f0000000000000000000080bf00000041000080400000c040000080bf00000000000000000000803f0000803f0000803f0000803f0000c0c00000804062975b3f4f4abb3e0000000000000000000080bf000080bf0000004100008040000000c0000080bf00000000000000000000803f0000803f0000803f0000803f0000004000008040fffcff3e4f4abb3e0000000000000000000080bf000080bf0000004100000000000000c0000080bf00000000000000000000803f0000803f0000803f0000803f0000004000000000fdfcff3ee3623f3e0000000000000000000080bf000080bf00000041000000000000c040000080bf00000000000000000000803f0000803f0000803f0000803f0000c0c00000000061975b3fe3623f3e0000000000000000000080bf000080bf0000004100008040000000c000000000000000000000803f0000803f0000803f0000803f0000803f000000c100008040bbf07d3f4f4a3b3e000080bf0000000000000000000080bf000040c000008040000000c000000000000000000000803f0000803f0000803f0000803f0000803f000040400000804007fdff3e4f4a3b3e000080bf0000000000000000000080bf000040c000000000000000c000000000000000000000803f0000803f0000803f0000803f0000803f000040400000000005fdff3e6f12833b000080bf0000000000000000000080bf0000004100000000000000c000000000000000000000803f0000803f0000803f0000803f0000803f000000c100000000baf07d3f6f12833b000080bf0000000000000000000080bf000040c000008040000000c00000803f00000000000000000000803f0000803f0000803f0000803f000000c00000804062975b3fbb770c3f00000000000000000000803f000080bf000040c0000080400000c0400000803f00000000000000000000803f0000803f0000803f0000803f0000c04000008040fffcff3ebb770c3f00000000000000000000803f000080bf000040c0000000000000c0400000803f00000000000000000000803f0000803f0000803f0000803f0000c04000000000fdfcff3e9956bd3e00000000000000000000803f000080bf000040c000000000000000c00000803f00000000000000000000803f0000803f0000803f0000803f000000c00000000061975b3f9956bd3e00000000000000000000803f000080bf000040c000008040000000c000000000000080bf000000000000803f0000803f0000803f0000803f00004040000000c06f12833be3623f3e000080bf0000000000000000000080bf0000004100008040000000c000000000000080bf000000000000803f0000803f0000803f0000803f000000c1000000c0b1f0fd3ee3623f3e000080bf0000000000000000000080bf00000041000080400000c04000000000000080bf000000000000803f0000803f0000803f0000803f000000c10000c040b3f0fd3e99710b3f000080bf0000000000000000000080bf000040c0000080400000c04000000000000080bf000000000000803f0000803f0000803f0000803f000040400000c040e812833b99710b3f000080bf0000000000000000000080bf000040c0000000000000c040000000000000803f000000000000803f0000803f0000803f0000803f000040c00000c040b3f0fd3e9f10683f0000803f0000000000000000000080bf00000041000000000000c040000000000000803f000000000000803f0000803f0000803f0000803f000000410000c040e812833b9f10683f0000803f0000000000000000000080bf0000004100000000000000c0000000000000803f000000000000803f0000803f0000803f0000803f00000041000000c06f12833bbe770c3f0000803f0000000000000000000080bf000040c000000000000000c0000000000000803f000000000000803f0000803f0000803f0000803f000040c0000000c0b1f0fd3ebe770c3f0000803f0000000000000000000080bf
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 2.5, y: 2, z: 2}
m_Extent: {x: 5.5, y: 2, z: 4}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshOptimized: 0
--- !u!1001 &1755195845
Prefab:
m_ObjectHideFlags: 0
Oops, something went wrong.

0 comments on commit 4382db9

Please sign in to comment.
You can’t perform that action at this time.