Skip to content

Commit

Permalink
Lib update Nama 5.0
Browse files Browse the repository at this point in the history
- 新增高级美颜功能
- 新增精细脸型调整功能
- 新增3D绘制抗锯齿功能
- 新增照片驱动功能
- 新增人脸夸张变形功能
- 新增音乐节奏滤镜
- 新增被动表情校准模式
- 优化手势识别
- 人脸跟踪底层性能进一步优化
- 性能优化
- 其他累积问题修复、接口调整
  • Loading branch information
jdbbjd committed Apr 10, 2018
1 parent 4765d86 commit 60aeb5f
Show file tree
Hide file tree
Showing 365 changed files with 5,738 additions and 2,554 deletions.
1,324 changes: 1,041 additions & 283 deletions FULiveDemo.xcodeproj/project.pbxproj
100755 → 100644

Large diffs are not rendered by default.

Binary file not shown.

This file was deleted.

Empty file modified FULiveDemo.xcworkspace/contents.xcworkspacedata
100755 → 100644
Empty file.
8 changes: 8 additions & 0 deletions FULiveDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
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>
6 changes: 3 additions & 3 deletions FULiveDemo/AppDelegate.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// AppDelegate.h
// FUAPIDemo
// FULive
//
// Created by 刘洋 on 2017/1/9.
// Copyright © 2017年 刘洋. All rights reserved.
// Created by L on 2018/1/15.
// Copyright © 2018年 L. All rights reserved.
//

#import <UIKit/UIKit.h>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20.png
100755 → 100644
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29.png
100755 → 100644
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40.png
100755 → 100644
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.
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.
Empty file modified FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon76x76.png
100755 → 100644
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.
9 changes: 5 additions & 4 deletions FULiveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "AppIcon20x20@2x.png",
"filename" : "AppIcon20x20@2x-1.png",
"scale" : "2x"
},
{
Expand All @@ -69,7 +69,7 @@
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "AppIcon29x29@2x.png",
"filename" : "AppIcon29x29@2x-1.png",
"scale" : "2x"
},
{
Expand All @@ -81,7 +81,7 @@
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "AppIcon40x40@2x.png",
"filename" : "AppIcon40x40@2x-1.png",
"scale" : "2x"
},
{
Expand All @@ -103,8 +103,9 @@
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "AppIcon1024x1024.png",
"scale" : "1x"
}
],
Expand Down
Empty file modified FULiveDemo/Assets.xcassets/Contents.json
100755 → 100644
Empty file.
23 changes: 0 additions & 23 deletions FULiveDemo/Assets.xcassets/EatRabbi.imageset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed FULiveDemo/Assets.xcassets/Mood.imageset/Mood.png
Binary file not shown.
Binary file not shown.
Binary file removed FULiveDemo/Assets.xcassets/Mood.imageset/Mood@3x.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "关闭48.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "hongrun@2x.png",
"filename" : "关闭96.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "hongrun@3x.png",
"filename" : "关闭144.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.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

This file was deleted.

Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
22 changes: 0 additions & 22 deletions FULiveDemo/Assets.xcassets/bg_seg.imageset/Contents.json

This file was deleted.

Diff not rendered.
Diff not rendered.
23 changes: 23 additions & 0 deletions FULiveDemo/Assets.xcassets/bugly.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "虫虫48.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "虫虫96.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "虫虫144.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

This file was deleted.

Diff not rendered.
Diff not rendered.
Diff not rendered.
Empty file.
Binary file modified .../Assets.xcassets/camera_btn_camera_normal.imageset/camera_btn_camera_normal.png
100755 → 100644
Binary file modified ...sets.xcassets/camera_btn_camera_normal.imageset/camera_btn_camera_normal@2x.png
100755 → 100644
Binary file modified ...sets.xcassets/camera_btn_camera_normal.imageset/camera_btn_camera_normal@3x.png
100755 → 100644
6 changes: 3 additions & 3 deletions FULiveDemo/Assets.xcassets/camera_btn_shotcut_normal.imageset/Contents.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "camera_btn_shotcut_normal.png",
"filename" : "镜头48.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "camera_btn_shotcut_normal@2x.png",
"filename" : "镜头96.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "camera_btn_shotcut_normal@3x.png",
"filename" : "镜头144.png",
"scale" : "3x"
}
],
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
23 changes: 0 additions & 23 deletions FULiveDemo/Assets.xcassets/fu_zh_duzui.imageset/Contents.json

This file was deleted.

Diff not rendered.
Diff not rendered.
Diff not rendered.
22 changes: 0 additions & 22 deletions FULiveDemo/Assets.xcassets/gradient.imageset/Contents.json

This file was deleted.

Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
},
{
"idiom" : "universal",
"filename" : "danya@2x.png",
"filename" : "AR面具@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "danya@3x.png",
"scale" : "3x"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
},
{
"idiom" : "universal",
"filename" : "ziran@2x.png",
"filename" : "AR面具_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ziran@3x.png",
"scale" : "3x"
}
],
Expand Down
Loading

0 comments on commit 60aeb5f

Please sign in to comment.