diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 2c1de3f..376b8d2 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift index f4ef607..d93de53 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift @@ -394,10 +394,10 @@ class ZZHCustomPlayer: UIView { if sender.state == .began { temScale = 1.0 } - - currentScale = currentScale - (temScale - sender.scale) - currentScale = min(currentScale, 1.8) - currentScale = max(currentScale, 0.3) + var ts = currentScale - (temScale - sender.scale) + ts = min(ts, 1.8) + ts = max(ts, 0.3) + currentScale = ts temScale = sender.scale print("\(sender.scale) currentScale....\(currentScale)") } diff --git a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift index 1b36e1c..ebfd458 100644 --- a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift +++ b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift @@ -59,10 +59,8 @@ class PlayByTransferConvertor { newpb = joinImages_sbs(left: left, right: right, imgWidth: cwidth, imgHeight:cheight,scale: scale) break 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: rciImage, rightImage: lciImage,scale: scale,ed: ed) break case .parallelEyes://平行眼