Skip to content

Commit ade8a95

Browse files
MacoronMacoron
authored
Merge pull request #4 from CaptainKryga/master
Liquid containers transfer liquids color
2 parents fedca90 + 27ef911 commit ade8a95

8 files changed

Lines changed: 2887 additions & 4 deletions

File tree

‎Assets/Unity Simple Liquid/Example/Animation/MovementGlass.anim‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: MovementGlass
10+
serializedVersion: 6
11+
m_Legacy: 1
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves:
18+
- curve:
19+
serializedVersion: 2
20+
m_Curve:
21+
- serializedVersion: 3
22+
time: 0
23+
value: {x: 0.6946, y: 1.34, z: -0.101}
24+
inSlope: {x: 0, y: 0, z: 0}
25+
outSlope: {x: 0, y: 0, z: 0}
26+
tangentMode: 0
27+
weightedMode: 0
28+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
29+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
30+
- serializedVersion: 3
31+
time: 10.033334
32+
value: {x: -0.38, y: 1.34, z: -0.101}
33+
inSlope: {x: 0, y: 0, z: 0}
34+
outSlope: {x: 0, y: 0, z: 0}
35+
tangentMode: 0
36+
weightedMode: 0
37+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
38+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
39+
- serializedVersion: 3
40+
time: 19.933332
41+
value: {x: 0.6946, y: 1.34, z: -0.101}
42+
inSlope: {x: 0, y: 0, z: 0}
43+
outSlope: {x: 0, y: 0, z: 0}
44+
tangentMode: 0
45+
weightedMode: 0
46+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
47+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
48+
m_PreInfinity: 2
49+
m_PostInfinity: 2
50+
m_RotationOrder: 4
51+
path:
52+
m_ScaleCurves: []
53+
m_FloatCurves: []
54+
m_PPtrCurves: []
55+
m_SampleRate: 60
56+
m_WrapMode: 2
57+
m_Bounds:
58+
m_Center: {x: 0, y: 0, z: 0}
59+
m_Extent: {x: 0, y: 0, z: 0}
60+
m_ClipBindingConstant:
61+
genericBindings: []
62+
pptrCurveMapping: []
63+
m_AnimationClipSettings:
64+
serializedVersion: 2
65+
m_AdditiveReferencePoseClip: {fileID: 0}
66+
m_AdditiveReferencePoseTime: 0
67+
m_StartTime: 0
68+
m_StopTime: 19.933332
69+
m_OrientationOffsetY: 0
70+
m_Level: 0
71+
m_CycleOffset: 0
72+
m_HasAdditiveReferencePose: 0
73+
m_LoopTime: 1
74+
m_LoopBlend: 0
75+
m_LoopBlendOrientation: 0
76+
m_LoopBlendPositionY: 0
77+
m_LoopBlendPositionXZ: 0
78+
m_KeepOriginalOrientation: 0
79+
m_KeepOriginalPositionY: 1
80+
m_KeepOriginalPositionXZ: 0
81+
m_HeightFromFeet: 0
82+
m_Mirror: 0
83+
m_EditorCurves:
84+
- curve:
85+
serializedVersion: 2
86+
m_Curve:
87+
- serializedVersion: 3
88+
time: 0
89+
value: 0.6946
90+
inSlope: 0
91+
outSlope: 0
92+
tangentMode: 136
93+
weightedMode: 0
94+
inWeight: 0.33333334
95+
outWeight: 0.33333334
96+
- serializedVersion: 3
97+
time: 10.033334
98+
value: -0.38
99+
inSlope: 0
100+
outSlope: 0
101+
tangentMode: 136
102+
weightedMode: 0
103+
inWeight: 0.33333334
104+
outWeight: 0.33333334
105+
- serializedVersion: 3
106+
time: 19.933332
107+
value: 0.6946
108+
inSlope: 0
109+
outSlope: 0
110+
tangentMode: 136
111+
weightedMode: 0
112+
inWeight: 0.33333334
113+
outWeight: 0.33333334
114+
m_PreInfinity: 2
115+
m_PostInfinity: 2
116+
m_RotationOrder: 4
117+
attribute: m_LocalPosition.x
118+
path:
119+
classID: 4
120+
script: {fileID: 0}
121+
- curve:
122+
serializedVersion: 2
123+
m_Curve:
124+
- serializedVersion: 3
125+
time: 0
126+
value: 1.34
127+
inSlope: 0
128+
outSlope: 0
129+
tangentMode: 136
130+
weightedMode: 0
131+
inWeight: 0.33333334
132+
outWeight: 0.33333334
133+
- serializedVersion: 3
134+
time: 10.033334
135+
value: 1.34
136+
inSlope: 0
137+
outSlope: 0
138+
tangentMode: 136
139+
weightedMode: 0
140+
inWeight: 0.33333334
141+
outWeight: 0.33333334
142+
- serializedVersion: 3
143+
time: 19.933332
144+
value: 1.34
145+
inSlope: 0
146+
outSlope: 0
147+
tangentMode: 136
148+
weightedMode: 0
149+
inWeight: 0.33333334
150+
outWeight: 0.33333334
151+
m_PreInfinity: 2
152+
m_PostInfinity: 2
153+
m_RotationOrder: 4
154+
attribute: m_LocalPosition.y
155+
path:
156+
classID: 4
157+
script: {fileID: 0}
158+
- curve:
159+
serializedVersion: 2
160+
m_Curve:
161+
- serializedVersion: 3
162+
time: 0
163+
value: -0.101
164+
inSlope: 0
165+
outSlope: 0
166+
tangentMode: 136
167+
weightedMode: 0
168+
inWeight: 0.33333334
169+
outWeight: 0.33333334
170+
- serializedVersion: 3
171+
time: 10.033334
172+
value: -0.101
173+
inSlope: 0
174+
outSlope: 0
175+
tangentMode: 136
176+
weightedMode: 0
177+
inWeight: 0.33333334
178+
outWeight: 0.33333334
179+
- serializedVersion: 3
180+
time: 19.933332
181+
value: -0.101
182+
inSlope: 0
183+
outSlope: 0
184+
tangentMode: 136
185+
weightedMode: 0
186+
inWeight: 0.33333334
187+
outWeight: 0.33333334
188+
m_PreInfinity: 2
189+
m_PostInfinity: 2
190+
m_RotationOrder: 4
191+
attribute: m_LocalPosition.z
192+
path:
193+
classID: 4
194+
script: {fileID: 0}
195+
m_EulerEditorCurves: []
196+
m_HasGenericRootTransform: 0
197+
m_HasMotionFloatCurves: 0
198+
m_Events: []

‎Assets/Unity Simple Liquid/Example/Animation/MovementGlass.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Unity Simple Liquid/Example/Prefabs/Bottle.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ MonoBehaviour:
8888
maxEdgeDrops: 4
8989
particlesPrefab: {fileID: 5157395080114985353, guid: 6cbd7c4436dcf4a709ab46f353a9d3c3,
9090
type: 3}
91+
mixingSpeed: 1
9192
--- !u!1 &4368494120379776360
9293
GameObject:
9394
m_ObjectHideFlags: 0

‎Assets/Unity Simple Liquid/Example/Prefabs/Glass.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ MonoBehaviour:
164164
maxEdgeDrops: 4
165165
particlesPrefab: {fileID: 5157395080114985353, guid: 6cbd7c4436dcf4a709ab46f353a9d3c3,
166166
type: 3}
167+
mixingSpeed: 1
167168
--- !u!1 &5222405182016459952
168169
GameObject:
169170
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)