BlackMATov/unity-flash-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-flash-tools.git synced 2026-03-22 12:55:32 +07:00
Code Issues Packages Projects Releases Wiki Activity

parent color effects tests and fix

Browse Source
This commit is contained in:
Matvey Cherevko
2016-03-04 16:04:04 +06:00
parent db6ab254c9
commit 53ba0ca1f5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/FlashTools/Examples/Animations/Tests/1_colormode.fla
View File

Binary file not shown.

16
Assets/FlashTools/Scripts/FlashAnimAsset.cs
View File

@@ -61,14 +61,14 @@ namespace FlashTools {
FlashAnimColorTransform a, FlashAnimColorTransform b)
{
var res = new FlashAnimColorTransform();
res.Mul.x = a.Mul.x * b.Mul.x;
res.Mul.y = a.Mul.y * b.Mul.y;
res.Mul.z = a.Mul.z * b.Mul.z;
res.Mul.w = a.Mul.w * b.Mul.w;
res.Add.x = a.Add.x * b.Mul.x + b.Add.x;
res.Add.y = a.Add.y * b.Mul.y + b.Add.y;
res.Add.z = a.Add.z * b.Mul.z + b.Add.z;
res.Add.w = a.Add.w * b.Mul.w + b.Add.w;
res.Mul.x = b.Mul.x * a.Mul.x;
res.Mul.y = b.Mul.y * a.Mul.y;
res.Mul.z = b.Mul.z * a.Mul.z;
res.Mul.w = b.Mul.w * a.Mul.w;
res.Add.x = b.Add.x * a.Mul.x + a.Add.x;
res.Add.y = b.Add.y * a.Mul.y + a.Add.y;
res.Add.z = b.Add.z * a.Mul.z + a.Add.z;
res.Add.w = b.Add.w * a.Mul.w + a.Add.w;
return res;
}
}