Skip to content

Commit

Permalink
1. 改善了抖动 2. 修复了特效变形
Browse files Browse the repository at this point in the history
  • Loading branch information
汪洋 committed Aug 3, 2017
1 parent 5144244 commit 4ec4d39
Show file tree
Hide file tree
Showing 87 changed files with 713 additions and 402 deletions.
Binary file not shown.
Binary file not shown.
Binary file modified AiyaEffectsDemo/AiyaEffectsSDK/AiyaCameraSDK.framework.zip
Binary file not shown.
1 change: 1 addition & 0 deletions AiyaEffectsDemo/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ - (void)viewDidLoad {
[self initResourceData];

//在正式环境中填入相应的License
// 704705f35759
[AiyaLicenseManager initLicense:@"704705f35759"];

_camera = [[AiyaCamera alloc]initWithPreview:self.view cameraPosition:AVCaptureDevicePositionFront];
Expand Down
14 changes: 14 additions & 0 deletions EffectResources/2017/2017.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
newmtl lambert6SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd head.png
Ni 1.00
newmtl lambert8SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd face.png
Ni 1.00
37 changes: 37 additions & 0 deletions EffectResources/2017/2017.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This file uses centimeters as units for non-parametric coordinates.

mtllib 2017.mtl
g default
v -0.063943 0.084194 -0.030491
v 0.063943 0.084194 -0.030491
v -0.063943 0.173866 -0.030491
v 0.063943 0.173866 -0.030491
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 1.000000 1.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 0.000000 -1.000000
s off
g pPlane1
usemtl lambert6SG
f 1/1/1 3/3/2 4/4/3 2/2/4
g default
v -0.065602 -0.040198 -0.001431
v 0.065602 -0.040198 -0.001431
v -0.065602 -0.012867 -0.001431
v 0.065602 -0.012867 -0.001431
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 1.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
s off
g pPlane2
usemtl lambert8SG
f 5/5/5 6/6/6 8/8/7 7/7/8
Binary file removed EffectResources/2017/2017.zip
Binary file not shown.
Binary file added EffectResources/2017/face.arf
Binary file not shown.
Binary file added EffectResources/2017/head.arf
Binary file not shown.
35 changes: 2 additions & 33 deletions EffectResources/2017/meta.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,10 @@
{
"format" : "1",
"name":"2017",
"resid" : "400101",
"nodes" : [
{
"type":"2dAnim",
"dirname" : "face",
"number" : 12,
"width" : 202,
"height" : 44,
"duration" : 66,
"isloop" : 1,
"Triggertype" : 0,
"untilFinish" : 1,
"position" : "nose",
"anchorX" : 101,
"anchorY" : 15,
"ratio" : 0.7,
"fullscreen" : 0,
"PositionSwitch" : 2
"type":"3dModel",
"obj" : "2017.obj",
},
{
"type":"2dAnim",
"dirname" : "head",
"number" : 12,
"width" : 160,
"height" : 116,
"duration" : 66,
"isloop" : 1,
"Triggertype" : 0,
"untilFinish" : 1,
"position" : "foreheadCenter",
"anchorX" : 80,
"anchorY" : 20,
"ratio" : 0.9,
"fullscreen" : 0,
"PositionSwitch" : 2
}
]
}
7 changes: 7 additions & 0 deletions EffectResources/baowener/baowener.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
newmtl lambert8SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd erduo.png
Ni 1.00
20 changes: 20 additions & 0 deletions EffectResources/baowener/baowener.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file uses centimeters as units for non-parametric coordinates.

mtllib baowener.mtl
g default
v -0.089103 0.069132 -0.032062
v 0.089103 0.069132 -0.032062
v -0.089103 0.134825 -0.032062
v 0.089103 0.134825 -0.032062
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 1.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
s off
g pPlane2
usemtl lambert8SG
f 1/1/1 2/2/2 4/4/3 3/3/4
Binary file removed EffectResources/baowener/baowener.zip
Binary file not shown.
Binary file added EffectResources/baowener/erduo.arf
Binary file not shown.
26 changes: 6 additions & 20 deletions EffectResources/baowener/meta.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
{
"format" : "1",
"name":"豹纹耳",
"resid" : "400201",
"name":"豹耳纹",
"nodes" : [
{
"type":"2dAnim",
"dirname" : "erduo",
"number" : 25,
"width" : 276,
"height" : 108,
"duration" : 66,
"isloop" : 1,
"Triggertype" : 0,
"untilFinish" : 1,
"position" : "foreheadCenter",
"anchorX" : 137,
"anchorY" : 60,
"ratio" : 1.3,
"fullscreen" : 0,
"PositionSwitch" : 2
}
{
"type":"3dModel",
"obj" : "baowener.obj",
},
]
}
}
13 changes: 13 additions & 0 deletions EffectResources/bunny/bunny.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
newmtl initialShadingGroup
illum 4
Kd 0.50 0.50 0.50
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
Ni 1.00
newmtl lambert14SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd erduo_007.png
Ni 1.00
20 changes: 20 additions & 0 deletions EffectResources/bunny/bunny.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file uses centimeters as units for non-parametric coordinates.

mtllib bunny.mtl
g default
v -0.117282 0.054700 -0.063444
v 0.117282 0.054700 -0.063444
v -0.117282 0.245995 -0.063444
v 0.117282 0.245995 -0.063444
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 1.000000 1.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -0.000000 1.000000
s off
g pPlane3
usemtl lambert14SG
f 1/1/1 2/2/2 4/4/3 3/3/4
Binary file added EffectResources/bunny/erduo.arf
Binary file not shown.
10 changes: 10 additions & 0 deletions EffectResources/bunny/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"format" : "1",
"name":"兔耳",
"nodes" : [
{
"type":"3dModel",
"obj" : "bunny.obj",
},
]
}
Binary file removed EffectResources/dog/dog.zip
Binary file not shown.
41 changes: 0 additions & 41 deletions EffectResources/dog/meta.json

This file was deleted.

Binary file added EffectResources/fadai/fadai.arf
Binary file not shown.
Binary file removed EffectResources/fadai/fadai.zip
Binary file not shown.
13 changes: 13 additions & 0 deletions EffectResources/fadai/fadai_blue.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
newmtl fadai_blue:lambert8SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd fadai_000.png
Ni 1.00
newmtl initialShadingGroup
illum 4
Kd 0.50 0.50 0.50
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
Ni 1.00
20 changes: 20 additions & 0 deletions EffectResources/fadai/fadai_blue.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file uses centimeters as units for non-parametric coordinates.

mtllib fadai_blue.mtl
g default
v -0.076437 0.061274 -0.040172
v 0.107236 0.061274 -0.040172
v -0.076437 0.170142 -0.040172
v 0.107236 0.170142 -0.040172
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 1.000000 1.000000
vt 0.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 1.000000
s off
g fadai_blue:pPlane3
usemtl fadai_blue:lambert8SG
f 1/1/1 2/2/2 4/3/3 3/4/4
24 changes: 5 additions & 19 deletions EffectResources/fadai/meta.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
{
"format" : "1",
"name":"发带",
"resid" : "400102",
"nodes" : [
{
"type":"2dAnim",
"dirname" : "fadai",
"number" : 20,
"width" : 276,
"height" : 164,
"duration" : 66,
"isloop" : 1,
"Triggertype" : 0,
"untilFinish" : 1,
"position" : "foreheadCenter",
"anchorX" : 130,
"anchorY" : 80,
"ratio" : 1.1,
"fullscreen" : 0,
"PositionSwitch" : 2
}
{
"type":"3dModel",
"obj" : "fadai_blue.obj",
},
]
}
}
Binary file added EffectResources/gaokongshiai/gaokongshiai.zip
Binary file not shown.
26 changes: 26 additions & 0 deletions EffectResources/gaokongshiai/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"format" : "1",
"name":"高空示爱",
"needtrack" : 0,
"resid":"400515",
"nodes" : [
{
"type":"2dAnim",
"dirname" : "gaokongshiai",
"number" : 180,
"width" : 720,
"height" : 1280,
"duration" : 66,
"isloop" : 1,
"Triggertype" : 0,
"untilFinish" : 1,
"position" : "default",
"anchorX" : 101,
"anchorY" : 20,
"ratio" : 1.0,
"fullscreen" : 1,
"keepaspect" : 0,
"PositionSwitch" : 0
}
]
}
Binary file added EffectResources/giraffe/bizi.arf
Binary file not shown.
Binary file added EffectResources/giraffe/face.arf
Binary file not shown.
28 changes: 28 additions & 0 deletions EffectResources/giraffe/giraffe.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
newmtl giraffe:lambert3SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd face_013.png
Ni 1.00
newmtl giraffe:lambert4SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd sh_034.png
Ni 1.00
newmtl giraffe:lambert5SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd tou_034.png
Ni 1.00
newmtl giraffe:phong1SG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd bizi_034.png
Ni 1.00
Loading

0 comments on commit 4ec4d39

Please sign in to comment.