....
This commit is contained in:
parent
a6589009c9
commit
b3f77d8843
Binary file not shown.
@ -394,10 +394,10 @@ class ZZHCustomPlayer: UIView {
|
|||||||
if sender.state == .began {
|
if sender.state == .began {
|
||||||
temScale = 1.0
|
temScale = 1.0
|
||||||
}
|
}
|
||||||
|
var ts = currentScale - (temScale - sender.scale)
|
||||||
currentScale = currentScale - (temScale - sender.scale)
|
ts = min(ts, 1.8)
|
||||||
currentScale = min(currentScale, 1.8)
|
ts = max(ts, 0.3)
|
||||||
currentScale = max(currentScale, 0.3)
|
currentScale = ts
|
||||||
temScale = sender.scale
|
temScale = sender.scale
|
||||||
print("\(sender.scale) currentScale....\(currentScale)")
|
print("\(sender.scale) currentScale....\(currentScale)")
|
||||||
}
|
}
|
||||||
|
|||||||
@ -59,10 +59,8 @@ class PlayByTransferConvertor {
|
|||||||
newpb = joinImages_sbs(left: left, right: right, imgWidth: cwidth, imgHeight:cheight,scale: scale)
|
newpb = joinImages_sbs(left: left, right: right, imgWidth: cwidth, imgHeight:cheight,scale: scale)
|
||||||
break
|
break
|
||||||
case .fsbs:
|
case .fsbs:
|
||||||
// cwidth = left.size.width
|
|
||||||
// cheight = left.size.height
|
|
||||||
// newpb = joinImages_fsbs(left: left, right: right, imgWidth: cwidth, imgHeight: cheight)
|
|
||||||
newpb = joinImages(leftImage: lciImage, rightImage: rciImage,scale: scale,ed: ed)
|
newpb = joinImages(leftImage: lciImage, rightImage: rciImage,scale: scale,ed: ed)
|
||||||
|
// newpb = joinImages(leftImage: rciImage, rightImage: lciImage,scale: scale,ed: ed)
|
||||||
break
|
break
|
||||||
case .parallelEyes://平行眼
|
case .parallelEyes://平行眼
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user