Skip to content

Commit 5242579

Browse files
aborziak-msaborziak-ms
committed
Draft
1 parent 767465b commit 5242579

File tree

229 files changed

+2625
-18
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+2625
-18
lines changed

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,8 @@ msbuild.binlog
234234
LottieGenOutput-*/
235235

236236
# Visual Studio debugging configuration file.
237-
launchSettings.json
237+
launchSettings.json
238+
239+
# Tests
240+
**/FramesAll
241+
**/!Results

‎Lottie-Windows.sln

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lottie-Windows-WinUI3", "Lo
171171
EndProject
172172
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LottieSamples", "LottieSamples\LottieSamples.csproj", "{6AB50ED0-6273-4919-9ADE-50195664EF15}"
173173
EndProject
174+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LottieTest", "LottieTest\LottieTest.csproj", "{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}"
175+
EndProject
176+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LottieGen.dll", "dlls\LottieGen\LottieGen.dll.csproj", "{43C57BC9-B5D0-48CE-9048-314E66D26462}"
177+
EndProject
174178
Global
175179
GlobalSection(SolutionConfigurationPlatforms) = preSolution
176180
BETA|Any CPU = BETA|Any CPU
@@ -613,6 +617,66 @@ Global
613617
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.ActiveCfg = Release|x86
614618
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Build.0 = Release|x86
615619
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Deploy.0 = Release|x86
620+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|Any CPU.ActiveCfg = Debug|x64
621+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|Any CPU.Build.0 = Debug|x64
622+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM.ActiveCfg = Debug|x64
623+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM.Build.0 = Debug|x64
624+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM64.ActiveCfg = Debug|x64
625+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM64.Build.0 = Debug|x64
626+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x64.ActiveCfg = Debug|x64
627+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x64.Build.0 = Debug|x64
628+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x86.ActiveCfg = Debug|x64
629+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x86.Build.0 = Debug|x64
630+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|Any CPU.ActiveCfg = Debug|x64
631+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|Any CPU.Build.0 = Debug|x64
632+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM.ActiveCfg = Debug|x64
633+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM.Build.0 = Debug|x64
634+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM64.ActiveCfg = Debug|x64
635+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM64.Build.0 = Debug|x64
636+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x64.ActiveCfg = Debug|x64
637+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x64.Build.0 = Debug|x64
638+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x86.ActiveCfg = Debug|x64
639+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x86.Build.0 = Debug|x64
640+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|Any CPU.ActiveCfg = Release|x64
641+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|Any CPU.Build.0 = Release|x64
642+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM.ActiveCfg = Release|x64
643+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM.Build.0 = Release|x64
644+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM64.ActiveCfg = Release|x64
645+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM64.Build.0 = Release|x64
646+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x64.ActiveCfg = Release|x64
647+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x64.Build.0 = Release|x64
648+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x86.ActiveCfg = Release|x64
649+
{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x86.Build.0 = Release|x64
650+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|Any CPU.ActiveCfg = Debug|Any CPU
651+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|Any CPU.Build.0 = Debug|Any CPU
652+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM.ActiveCfg = Debug|Any CPU
653+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM.Build.0 = Debug|Any CPU
654+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM64.ActiveCfg = Debug|Any CPU
655+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM64.Build.0 = Debug|Any CPU
656+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x64.ActiveCfg = Debug|Any CPU
657+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x64.Build.0 = Debug|Any CPU
658+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x86.ActiveCfg = Debug|Any CPU
659+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x86.Build.0 = Debug|Any CPU
660+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
661+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|Any CPU.Build.0 = Debug|Any CPU
662+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM.ActiveCfg = Debug|Any CPU
663+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM.Build.0 = Debug|Any CPU
664+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM64.ActiveCfg = Debug|Any CPU
665+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM64.Build.0 = Debug|Any CPU
666+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x64.ActiveCfg = Debug|Any CPU
667+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x64.Build.0 = Debug|Any CPU
668+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x86.ActiveCfg = Debug|Any CPU
669+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x86.Build.0 = Debug|Any CPU
670+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|Any CPU.ActiveCfg = Release|Any CPU
671+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|Any CPU.Build.0 = Release|Any CPU
672+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM.ActiveCfg = Release|Any CPU
673+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM.Build.0 = Release|Any CPU
674+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM64.ActiveCfg = Release|Any CPU
675+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM64.Build.0 = Release|Any CPU
676+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x64.ActiveCfg = Release|Any CPU
677+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x64.Build.0 = Release|Any CPU
678+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x86.ActiveCfg = Release|Any CPU
679+
{43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x86.Build.0 = Release|Any CPU
616680
EndGlobalSection
617681
GlobalSection(SolutionProperties) = preSolution
618682
HideSolutionNode = FALSE
@@ -651,6 +715,7 @@ Global
651715
{FC89273A-B2DA-4625-8A73-EF02A658D65E} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}
652716
{7654A857-9A99-4185-9F8E-DD0CE662AF23} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}
653717
{DC7F7A39-B7A7-40B4-937A-601460CAE38C} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}
718+
{43C57BC9-B5D0-48CE-9048-314E66D26462} = {C75BD686-21A6-4EB3-8D4B-D5A01C019C52}
654719
EndGlobalSection
655720
GlobalSection(ExtensibilityGlobals) = postSolution
656721
SolutionGuid = {51B9BB4C-5196-41CF-950C-12B04AD8A61C}
@@ -664,6 +729,7 @@ Global
664729
source\LottieMetadata\LottieMetadata.projitems*{25ceb8b8-90e0-4d23-9978-0cd83889d4ac}*SharedItemsImports = 5
665730
source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{30059ca7-0745-4eec-8d11-b14850a70c98}*SharedItemsImports = 13
666731
source\YamlData\YamlData.projitems*{39c6b7f3-5e75-4019-82ab-00fd8a0a06e2}*SharedItemsImports = 13
732+
source\LottieGen\LottieGen.projitems*{43c57bc9-b5d0-48ce-9048-314e66d26462}*SharedItemsImports = 5
667733
source\LottieReader\LottieReader.projitems*{4e7d8957-3f5f-46e1-99a8-2012b806c9b0}*SharedItemsImports = 13
668734
source\Animatables\Animatables.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
669735
source\CompMetadata\CompMetadata.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4

‎LottieTest/LottieTest.csproj

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
6+
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
7+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
<Nullable>enable</Nullable>
10+
<CsWinRTIncludes>Microsoft</CsWinRTIncludes>
11+
<Platforms>x64</Platforms>
12+
<SignAssembly>False</SignAssembly>
13+
<!-- This doesn't work for some reason: <WindowsPackageType>None</WindowsPackageType> -->
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<Compile Remove="Tests\**" />
18+
<Content Remove="Tests\**" />
19+
<EmbeddedResource Remove="Tests\**" />
20+
<None Remove="Tests\**" />
21+
<Page Remove="Tests\**" />
22+
<PRIResource Remove="Tests\**" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
27+
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.3.1" />
28+
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.7" />
29+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.647-beta">
30+
<PrivateAssets>all</PrivateAssets>
31+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
32+
</PackageReference>
33+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.6.3" />
34+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.197" />
35+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<ProjectReference Include="..\dlls\LottieGen\LottieGen.dll.csproj" />
40+
<ProjectReference Include="..\dlls\LottieReader\LottieReader.dll.csproj" />
41+
<ProjectReference Include="..\dlls\UIDataCodeGen\UIDataCodeGen.dll.csproj" />
42+
<ProjectReference Include="..\Lottie-Windows\Lottie-Windows-WinUI3\Lottie-Windows-WinUI3.csproj" />
43+
</ItemGroup>
44+
45+
</Project>

‎LottieTest/NativeMethods.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
GetMessage
2+
TranslateMessage
3+
DispatchMessage
4+
MSG
5+
RECT
6+
SIZE
7+
POINT
8+
ID3D11Texture2D
9+
IDirect3DDxgiInterfaceAccess

‎LottieTest/Tests/Banana/Animation.gif

664 KB

‎LottieTest/Tests/Banana/Lottie.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎LottieTest/Tests/BlurOverlap/AfterEffects.aep

199 KB
Binary file not shown.

‎LottieTest/Tests/BlurOverlap/Frames/frame001.png

35.5 KB

‎LottieTest/Tests/BlurOverlap/Frames/frame006.png

35.4 KB

‎LottieTest/Tests/BlurOverlap/Frames/frame011.png

35.3 KB

0 commit comments

Comments
 (0)