|
@@ -175,26 +175,27 @@ public class PQCompositionExporter {
|
|
|
}
|
|
|
var currentSticker:PQEditVisionTrackMaterialsModel?
|
|
|
|
|
|
-// for sticker in mStickers! {
|
|
|
-// BFLog(message: "sticker in \(sticker.timelineIn) out \(sticker.timelineOut) currTime is \(currTime)")
|
|
|
-// if(sticker.timelineIn <= currTime && sticker.timelineOut >= currTime){
|
|
|
-// currentSticker = sticker
|
|
|
-// break
|
|
|
-// }
|
|
|
-// }
|
|
|
- while true {
|
|
|
- if let sticker = mStickers!.first {
|
|
|
- if sticker.timelineIn <= currTime && sticker.timelineOut >= currTime {
|
|
|
- BFLog(message: " 导出时换了的时间:\(currTime)")
|
|
|
- currentSticker = sticker
|
|
|
- break
|
|
|
- }else{
|
|
|
- mStickers!.removeFirst()
|
|
|
- }
|
|
|
- }else{
|
|
|
+ for sticker in mStickers! {
|
|
|
+ BFLog(message: "sticker in \(sticker.timelineIn) out \(sticker.timelineOut) currTime is \(currTime)")
|
|
|
+ if(sticker.timelineIn <= currTime && sticker.timelineOut >= currTime){
|
|
|
+ currentSticker = sticker
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
+// while true {
|
|
|
+//
|
|
|
+// if let sticker = mStickers!.first {
|
|
|
+// if Float(sticker.timelineIn).decimalNumber(5) <= Float(currTime).decimalNumber(5) && Float(sticker.timelineOut).decimalNumber(5) >= Float(currTime).decimalNumber(5) {
|
|
|
+// BFLog(message: " 导出时换了的时间:\(currTime)")
|
|
|
+// currentSticker = sticker
|
|
|
+// break
|
|
|
+// }else{
|
|
|
+// mStickers!.removeFirst()
|
|
|
+// }
|
|
|
+// }else{
|
|
|
+// break
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
//创建不同的filter
|
|
|
if(currentSticker == nil){
|