Skip to content

Commit

Permalink
FaceUnity Nama SDK v5.4.0 (2018.7.27)
Browse files Browse the repository at this point in the history
FaceUnity Nama SDK v5.4.0 (2018.7.27)
-------------------------
更新内容
- 绘制性能进一步优化提升
- 新增美妆贴纸功能
  • Loading branch information
jdbbjd committed Aug 6, 2018
1 parent 71e5347 commit 0c3662b
Show file tree
Hide file tree
Showing 25 changed files with 416 additions and 181 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
26 changes: 3 additions & 23 deletions FULiveDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1059,13 +1059,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 0B5A0CE12021913900AAD47D /* Build configuration list for PBXNativeTarget "FULiveDemo" */;
buildPhases = (
CD0B4B85211613BB0019F9FA /* unzip */,
FA957C64E2549EB6F75CB07D /* [CP] Check Pods Manifest.lock */,
CD0B4B85211613BB0019F9FA /* unzip */,
0B5A0CB12021913900AAD47D /* Sources */,
0B5A0CB22021913900AAD47D /* Frameworks */,
0B5A0CB32021913900AAD47D /* Resources */,
0B5A0D7F202191AF00AAD47D /* Embed Frameworks */,
4F91CA75F85AF44CEEC4E935 /* [CP] Embed Pods Frameworks */,
4508CC438BF9C69090871A75 /* [CP] Copy Pods Resources */,
0B30FE7B207F8879008E0543 /* CopyFiles */,
CD11A34D20CE7C580005C58C /* ShellScript */,
Expand Down Expand Up @@ -1383,45 +1382,26 @@
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SVProgressHUD.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FULiveDemo/Pods-FULiveDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
4F91CA75F85AF44CEEC4E935 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FULiveDemo/Pods-FULiveDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
CD0B4B85211613BB0019F9FA /* unzip */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = unzip;
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#!/bin/sh\ncd FULiveDemo/Faceunity/FaceUnity-SDK-iOS\nfilename=libnama.a\nzipname=libnama.zip \n\n#如果libnama.a不存在,且libnama.zip存在,则直接解压\nif ! [ -f \"$filename\" ] && [ -f \"$zipname\" ]\nthen\nunzip $zipname\nmdcode=$(md5 $filename)\n\nif [ ${mdcode##*=}x = \"4d0b3937ad060c15af8adb5acffe526f\"x ]; then\necho \"ssss\"\nrm -f $zipname\nelse\necho \"fffff\"\nrm -f $filename\nfi\nfi\n";
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#!/bin/sh\ncd FULiveDemo/Faceunity/FaceUnity-SDK-iOS\nfilename=libnama.a\nzipname=libnama.zip \n\n#如果libnama.zip存在,则直接解压\nif [ -f \"$zipname\" ]\nthen\nrm -f $filename\nunzip $zipname\nmdcode=$(md5 $filename)\n\nif [ ${mdcode##*=}x = \"ef0a04dd568f485f6abb0c58ba74e08e\"x ]; then\necho \"ssss\"\nrm -f $zipname\nelse\necho \"fffff\"\nrm -f $filename\nfi\nfi\n";
};
CD11A34D20CE7C580005C58C /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,4 +483,6 @@ typedef enum {
+ (int)loadAnimModelWithModelPath:(NSString *)modelPath;

+ (void)setDefaultRotationMode:(float)mode;

+ (void)setAsyncTrackFaceEnable:(int)enable;
@end
Binary file not shown.
Binary file not shown.
Binary file modified FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite/libnama.a
Binary file not shown.
2 changes: 2 additions & 0 deletions FULiveDemo/Faceunity/FaceUnity-SDK-iOS/Headers/FURenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -483,4 +483,6 @@ typedef enum {
+ (int)loadAnimModelWithModelPath:(NSString *)modelPath;

+ (void)setDefaultRotationMode:(float)mode;

+ (void)setAsyncTrackFaceEnable:(int)enable;
@end
Binary file not shown.
Binary file modified FULiveDemo/Faceunity/FaceUnity-SDK-iOS/Resources/fxaa.bundle
Binary file not shown.
3 changes: 3 additions & 0 deletions FULiveDemo/Faceunity/FaceUnity-SDK-iOS/libnama.a
Git LFS file not shown
Binary file modified FULiveDemo/Faceunity/FaceUnity-SDK-iOS/libnama.zip
Binary file not shown.
16 changes: 16 additions & 0 deletions Nama-lite.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Pod::Spec.new do |s|
s.name = 'Nama-lite'
s.version = '5.4.0'
s.license = 'MIT'
s.summary = 'faceunity nama v5.4.0-dev-lite'
s.homepage = 'https://www.faceunity.com'
s.author = { 'faceunity' => 'dev@faceunity.com' }
s.platform = :ios, "8.0"
s.source = { :git => 'https://github.com/Faceunity/FULiveDemo.git', :tag => 'v5.4.0-dev' }
s.source_files = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite/**/*.{h,m}'
s.resources = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite/**/*.{bundle}'
s.ios.vendored_library = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite/libnama.a'
s.requires_arc = true
s.ios.frameworks = ['OpenGLES', 'Accelerate', 'CoreMedia', 'AVFoundation']
s.libraries = ["stdc++"]
end
16 changes: 16 additions & 0 deletions Nama.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Pod::Spec.new do |s|
s.name = 'Nama'
s.version = '5.4.0'
s.license = 'MIT'
s.summary = 'faceunity nama v5.4.0-dev'
s.homepage = 'https://github.com/Faceunity/FULiveDemo/tree/dev'
s.author = { 'faceunity' => 'dev@faceunity.com' }
s.platform = :ios, "8.0"
s.source = { :git => 'https://github.com/Faceunity/FULiveDemo.git', :tag => 'v5.4.0-dev' }
s.source_files = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS/**/*.{h,m}'
s.resources = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS/**/*.{bundle}'
s.ios.vendored_library = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS/libnama.a'
s.requires_arc = true
s.ios.frameworks = ['OpenGLES', 'Accelerate', 'CoreMedia', 'AVFoundation']
s.libraries = ["stdc++"]
end
6 changes: 5 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ PODS:
DEPENDENCIES:
- SVProgressHUD

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- SVProgressHUD

SPEC CHECKSUMS:
SVProgressHUD: 59b2d3dabacbd051576d21d32293ca7228dc18b0

PODFILE CHECKSUM: 0a18f1b47af1333520361de7e26b6bc58630b883

COCOAPODS: 1.3.1
COCOAPODS: 1.5.3
6 changes: 5 additions & 1 deletion Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0c3662b

Please sign in to comment.