Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

[Toolkit] Added SkeletalAnimation sample #4

Open
jwollen wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[Toolkit] Added SkeletalAnimation sample #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6e5e1f
[Toolkit] Added SkeletalAnimation sample (desktop only)
jwollen Jun 3, 2014
308b0e1
[Toolkit] Simplify SkeletalAnimationGame and reference Dude.fbx for now
jwollen Jun 3, 2014
c9241ca
[Toolkit] SkeletalAnimationGame updated to CompositeTransform and now…
jwollen Jun 4, 2014
c5cdac9
[Toolkit] Added new model to SkeletalAnimation sample
jwollen Jun 6, 2014
e5bf4aa
[Toolkit] Switch to AnimationSystem
jwollen Jun 6, 2014
7623d38
[Build] Update SkeletalAnimation sample to 2.6.2
jwollen Jun 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 45 additions & 26 deletions Toolkit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OcclusionQuery", "Occlusion
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OcclusionQuery.Desktop", "Toolkit\WindowsDesktop\OcclusionQuery\OcclusionQuery.Desktop.csproj", "{BE9FD728-26A6-489E-B98D-4FD98657E300}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkeletalAnimation", "SkeletalAnimation", "{1AD1AE14-6D35-4D97-9838-AFA2FB877A8F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkeletalAnimation.Desktop", "Toolkit\WindowsDesktop\SkeletalAnimation\SkeletalAnimation.Desktop.csproj", "{7587DA04-9833-4FE1-9473-BB3D086496EE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1196,60 +1200,75 @@ Global
{BE9FD728-26A6-489E-B98D-4FD98657E300}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{BE9FD728-26A6-489E-B98D-4FD98657E300}.Release|x64.ActiveCfg = Release|Any CPU
{BE9FD728-26A6-489E-B98D-4FD98657E300}.Release|x86.ActiveCfg = Release|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Debug|x64.ActiveCfg = Debug|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Debug|x86.ActiveCfg = Debug|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Release|Any CPU.Build.0 = Release|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Release|ARM.ActiveCfg = Release|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Release|x64.ActiveCfg = Release|Any CPU
{7587DA04-9833-4FE1-9473-BB3D086496EE}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{909E7305-BEFC-4E0B-8F4A-FCB96EDBAC59} = {3B67F61F-DEE8-43BF-BBB2-EB1AF481EA22}
{CED8D394-44C5-4934-BC76-4CA851D7CAA9} = {3B67F61F-DEE8-43BF-BBB2-EB1AF481EA22}
{C60A2F33-F803-456A-BBD9-210AA6361356} = {3B67F61F-DEE8-43BF-BBB2-EB1AF481EA22}
{05D111D6-C8FD-4DA4-B6C0-8C47E7081C3F} = {3B67F61F-DEE8-43BF-BBB2-EB1AF481EA22}
{0C9A4884-6357-4392-9341-27B43E195456} = {E914F804-62BC-4C38-B210-4A635B335095}
{0B991266-369E-460C-86D5-7F91407E5407} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{618171D7-F09F-4C05-AE09-CFA4C4E9C53B} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{253B1281-7088-474A-80EA-D7CC5D2015F9} = {E914F804-62BC-4C38-B210-4A635B335095}
{229164CC-9EBD-4C7A-AC53-EB3699866010} = {E914F804-62BC-4C38-B210-4A635B335095}
{909E7305-BEFC-4E0B-8F4A-FCB96EDBAC59} = {3B67F61F-DEE8-43BF-BBB2-EB1AF481EA22}
{CED8D394-44C5-4934-BC76-4CA851D7CAA9} = {3B67F61F-DEE8-43BF-BBB2-EB1AF481EA22}
{0C9A4884-6357-4392-9341-27B43E195456} = {E914F804-62BC-4C38-B210-4A635B335095}
{60C924B6-B570-42CA-B42A-B7F81D4B9CD3} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{5114D1A3-5423-4B73-8729-57CD90DC4BEC} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{C5BC01B8-2836-4569-A5C4-C80A3B6E7508} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{03B394C1-213C-49DB-8541-9744884A4D8C} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{E67EFC2D-F7EE-4A27-8F21-2C09CABBDF60} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{EE46093C-D45B-41B6-BB78-1B8B247DA6A8} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{AB039CB0-972F-4525-A772-498BF4C3CDE9} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{408E78AC-268C-4804-B9D2-78AD842E0976} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{F0A9A088-D048-4DFA-8F42-8C27B871F6AD} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{DDE23A6B-D856-477E-B4A4-4B97D0014B85} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{3214BC9A-30DF-4180-8FB7-57AE86BBB8E8} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{BF1484D5-1527-4E85-8BE6-E05A2E9C3EB8} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{C2F4BF63-D33F-4052-804C-A5D4AC208D29} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{0B324ECE-A930-4CEB-9201-734DFF50677D} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{0B991266-369E-460C-86D5-7F91407E5407} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{A17BD4F4-8B5B-4214-B55B-FCDB31F655C2} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{6143AB62-23ED-48B0-91A1-B0F09B8B9105} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{C60A2F33-F803-456A-BBD9-210AA6361356} = {3B67F61F-DEE8-43BF-BBB2-EB1AF481EA22}
{C5BC01B8-2836-4569-A5C4-C80A3B6E7508} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{5EEFB448-3717-4201-9549-6E93EE76CE82} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{7D0686C8-E617-4B68-B235-EB34B4E53508} = {34F3CC06-42A0-4BF7-A064-EB0514BEA591}
{247252A9-B082-49C2-92A5-98DF322A2A5E} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{B3B57794-8FE7-47A8-B0DA-E97D3F6643C5} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{618171D7-F09F-4C05-AE09-CFA4C4E9C53B} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{76D9FEBB-0609-4836-9FBF-608536A585C2} = {34F3CC06-42A0-4BF7-A064-EB0514BEA591}
{A9660D02-5107-41D6-A1D7-32458E8A6C94} = {583F6F0E-1694-4BF6-AC1A-36BB9EBCEE4C}
{7D0686C8-E617-4B68-B235-EB34B4E53508} = {34F3CC06-42A0-4BF7-A064-EB0514BEA591}
{E63A00EA-ECF2-48CA-9155-8E849AE7F02D} = {583F6F0E-1694-4BF6-AC1A-36BB9EBCEE4C}
{CE1E7555-ECD4-4ADA-88DA-E2F60F081EAE} = {0E13D3A6-AD8E-4DB3-9C06-AD66014C1B9D}
{A9660D02-5107-41D6-A1D7-32458E8A6C94} = {583F6F0E-1694-4BF6-AC1A-36BB9EBCEE4C}
{D855DD56-477B-4519-B94C-98A364035615} = {0E13D3A6-AD8E-4DB3-9C06-AD66014C1B9D}
{ACF757CE-5FE6-425C-8648-2DB57CD49BD8} = {DE0DC951-C9F9-4EDA-AC74-E216F5663F60}
{B91F31E8-2891-4B97-8039-11333BBE0BA1} = {0E13D3A6-AD8E-4DB3-9C06-AD66014C1B9D}
{03B394C1-213C-49DB-8541-9744884A4D8C} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{A01E9FF2-AB38-4C1A-9AED-4DA69A5F36F0} = {AF850E22-B947-4B1D-A8F0-25D8037A563B}
{CE1E7555-ECD4-4ADA-88DA-E2F60F081EAE} = {0E13D3A6-AD8E-4DB3-9C06-AD66014C1B9D}
{ACF757CE-5FE6-425C-8648-2DB57CD49BD8} = {DE0DC951-C9F9-4EDA-AC74-E216F5663F60}
{80D96612-4912-4D8B-9A95-E13348FD6B15} = {AF850E22-B947-4B1D-A8F0-25D8037A563B}
{12FDB5E2-052D-429B-9394-F5FB42E2D527} = {AF850E22-B947-4B1D-A8F0-25D8037A563B}
{A01E9FF2-AB38-4C1A-9AED-4DA69A5F36F0} = {AF850E22-B947-4B1D-A8F0-25D8037A563B}
{E6BB7879-4CAF-48F0-9A15-DF49534B6ADE} = {8A7DEAF4-C8E7-4122-8D98-F8274D959F80}
{84D42973-E9B4-4799-B396-5DC74CFE4E6C} = {A6C76575-27ED-4B1D-B30E-7C751482898B}
{E67EFC2D-F7EE-4A27-8F21-2C09CABBDF60} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{988AC9BC-4932-4013-8679-846F934320E8} = {B4095A52-D7A9-4613-8A42-2D6897522EE7}
{247252A9-B082-49C2-92A5-98DF322A2A5E} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{C956F938-87B0-4F94-A5B2-0FE4DD5ADEE7} = {E7087786-0820-4A5D-B58C-D77A1D2F5B92}
{DA209939-ADD7-4640-A847-0D867FF21997} = {59742398-0ED6-4027-A0FD-33CD39D8EDE7}
{1855D2D9-0009-4825-A333-11230556445E} = {255E370A-C8E5-4355-B9A4-224C74E19503}
{72E1AFCD-4E5B-428A-A4C8-0B179F660BA6} = {94DA7BAC-A317-4496-ABC8-022E6C568E2F}
{EE46093C-D45B-41B6-BB78-1B8B247DA6A8} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{AB039CB0-972F-4525-A772-498BF4C3CDE9} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{408E78AC-268C-4804-B9D2-78AD842E0976} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{F0A9A088-D048-4DFA-8F42-8C27B871F6AD} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{DDE23A6B-D856-477E-B4A4-4B97D0014B85} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{3214BC9A-30DF-4180-8FB7-57AE86BBB8E8} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{BF1484D5-1527-4E85-8BE6-E05A2E9C3EB8} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{9621AEC5-8ECA-4D34-B7E4-A6EC3480876B} = {65FAC258-41CA-47FC-B174-AF26BA31AD88}
{B3B57794-8FE7-47A8-B0DA-E97D3F6643C5} = {F828E427-AA23-4337-AA3B-9D5A3BD26A57}
{E63A00EA-ECF2-48CA-9155-8E849AE7F02E} = {65FAC258-41CA-47FC-B174-AF26BA31AD88}
{D6077DA0-B588-450C-B722-8342826F3C43} = {65FAC258-41CA-47FC-B174-AF26BA31AD88}
{C2F4BF63-D33F-4052-804C-A5D4AC208D29} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{0B324ECE-A930-4CEB-9201-734DFF50677D} = {E39ED03E-636B-412F-B744-693BB9144CA5}
{9621AEC5-8ECA-4D34-B7E4-A6EC3480876B} = {65FAC258-41CA-47FC-B174-AF26BA31AD88}
{7587DA04-9833-4FE1-9473-BB3D086496EE} = {1AD1AE14-6D35-4D97-9838-AFA2FB877A8F}
{BE9FD728-26A6-489E-B98D-4FD98657E300} = {CBBED24D-87C1-412C-9E17-E7F0B41D9555}
EndGlobalSection
EndGlobal
Binary file added Toolkit/Common/SkeletalAnimation/Content/Body_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Boots_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Eye_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Hair_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Head_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Leather_d.dds
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions Toolkit/Common/SkeletalAnimation/Content/License.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Assets are based on the Durian Open Movie project
� copyright Blender Foundation | http://www.sintel.org

Licensed under the Creative Commons Attribution 3.0 (CC BY 3.0)
http://creativecommons.org/licenses/by/3.0/
Binary file added Toolkit/Common/SkeletalAnimation/Content/Metal_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Mouth_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Pants_d.dds
View file
Open in desktop
Binary file not shown.
Binary file added Toolkit/Common/SkeletalAnimation/Content/Shirt_d.dds
View file
Open in desktop
Binary file not shown.
Loading