Skip to content

Commit

Permalink
FaceUnity Nama SDK v5.3.0 (2018.7.2)
Browse files Browse the repository at this point in the history
FaceUnity Nama SDK v5.3.0 (2018.7.2)
-------------------------
更新内容
- 新增物理模拟动效功能
- 新增阴影效果渲染功能
- 修复ARmesh以及换脸自适应美型后脸型
- 优化手势识别,支持同时多个手势,减少卡顿问题
  • Loading branch information
jdbbjd committed Jul 6, 2018
1 parent d19fa39 commit ea0c631
Show file tree
Hide file tree
Showing 186 changed files with 2,208 additions and 338 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FULiveDemo/Faceunity/FaceUnity-SDK-iOS/libnama.a filter=lfs diff=lfs merge=lfs -text
66 changes: 34 additions & 32 deletions FULiveDemo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5A0CB42021913900AAD47D"
BuildableName = "FULiveDemo.app"
BlueprintName = "FULiveDemo"
ReferencedContainer = "container:FULiveDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5A0CCC2021913900AAD47D"
BuildableName = "FULiveDemoTests.xctest"
BlueprintName = "FULiveDemoTests"
ReferencedContainer = "container:FULiveDemo.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5A0CD72021913900AAD47D"
BuildableName = "FULiveDemoUITests.xctest"
BlueprintName = "FULiveDemoUITests"
ReferencedContainer = "container:FULiveDemo.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5A0CB42021913900AAD47D"
BuildableName = "FULiveDemo.app"
BlueprintName = "FULiveDemo"
ReferencedContainer = "container:FULiveDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5A0CB42021913900AAD47D"
BuildableName = "FULiveDemo.app"
BlueprintName = "FULiveDemo"
ReferencedContainer = "container:FULiveDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0B5A0CB42021913900AAD47D"
BuildableName = "FULiveDemo.app"
BlueprintName = "FULiveDemo"
ReferencedContainer = "container:FULiveDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>FULiveDemo.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>0B5A0CB42021913900AAD47D</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>0B5A0CCC2021913900AAD47D</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>0B5A0CD72021913900AAD47D</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,5 @@
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>CD2E16D81E52AE0100A2C2A4</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "0"
version = "2.0">
</Bucket>
6 changes: 3 additions & 3 deletions FULiveDemo/Assets.xcassets/Performance.imageset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "Performance.png",
"filename" : "未选中框.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Performance@2x.png",
"filename" : "未选中框@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Performance@3x.png",
"filename" : "未选中框@3x.png",
"scale" : "3x"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "Performance_selected.png",
"filename" : "选中框.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Performance_selected@2x.png",
"filename" : "选中框@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Performance_selected@3x.png",
"filename" : "选中框@3x.png",
"scale" : "3x"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions FULiveDemo/Assets.xcassets/Replay_icon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Replay_icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Replay_icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Replay_icon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "关闭48.png",
"filename" : "返回icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "关闭96.png",
"filename" : "返回icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "关闭144.png",
"filename" : "返回icon@3x.png",
"scale" : "3x"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions FULiveDemo/Assets.xcassets/bugly.imageset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "虫虫48.png",
"filename" : "测试icon .png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "虫虫96.png",
"filename" : "测试icon @2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "虫虫144.png",
"filename" : "测试icon @3x.png",
"scale" : "3x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "camera_btn_camera_normal.png",
"filename" : "相机按钮.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "camera_btn_camera_normal@2x.png",
"filename" : "相机按钮@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "camera_btn_camera_normal@3x.png",
"filename" : "相机按钮@3x.png",
"scale" : "3x"
}
],
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "镜头48.png",
"filename" : "相机icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "镜头96.png",
"filename" : "相机icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "镜头144.png",
"filename" : "相机icon@3x.png",
"scale" : "3x"
}
],
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
23 changes: 23 additions & 0 deletions FULiveDemo/Assets.xcassets/download.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "download.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "download@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "download@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
23 changes: 23 additions & 0 deletions FULiveDemo/Assets.xcassets/home icon .imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "home icon .png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "home icon @2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "home icon @3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
6 changes: 3 additions & 3 deletions FULiveDemo/Assets.xcassets/noitem.imageset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "noitem.png",
"filename" : "删除icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "noitem@2x.png",
"filename" : "删除icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "noitem@3x.png",
"filename" : "删除icon@3x.png",
"scale" : "3x"
}
],
Expand Down
Binary file removed FULiveDemo/Assets.xcassets/noitem.imageset/noitem.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit ea0c631

Please sign in to comment.