fenix
/
Simple-Camera
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #242, rewriting gesture zooming

This commit is contained in:
tibbi 2020-04-21 22:58:09 +02:00
parent ca273da40e
commit 8de7262aa4
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt
View File

@ -66,8 +66,8 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
private var mSensorOrientation = 0 private var mSensorOrientation = 0
private var mRotationAtCapture = 0 private var mRotationAtCapture = 0
private var mZoomLevel = 1 private var mZoomLevel = 1f
private var mZoomFingerSpacing = 0f private var mZoomFingerSpacing = 0
private var mLastFocusX = 0f private var mLastFocusX = 0f
private var mLastFocusY = 0f private var mLastFocusY = 0f
private var mIsFlashSupported = true private var mIsFlashSupported = true
@ -226,30 +226,33 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
} }
private fun handleZoom(event: MotionEvent) { private fun handleZoom(event: MotionEvent) {
val maxZoom = getCameraCharacteristics().get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM)!! * 10 val maxZoom = getCameraCharacteristics().get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM)!!
val sensorRect = getCameraCharacteristics(mCameraId).get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE)!! val sensorRect = getCameraCharacteristics().get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE) ?: return
val currentFingerSpacing = getFingerSpacing(event) val currentFingerSpacing = getFingerSpacing(event)
if (mZoomFingerSpacing != 0f) {
if (currentFingerSpacing > mZoomFingerSpacing && maxZoom > mZoomLevel) { var delta = 0.05f
mZoomLevel++ if (mZoomFingerSpacing != 0) {
} else if (currentFingerSpacing < mZoomFingerSpacing && mZoomLevel > 1) { if (currentFingerSpacing > mZoomFingerSpacing) {
mZoomLevel-- if (maxZoom - mZoomLevel <= delta) {
delta = maxZoom - mZoomLevel
}
mZoomLevel += delta
} else if (currentFingerSpacing < mZoomFingerSpacing) {
if (mZoomLevel - delta < 1f) {
delta = mZoomLevel - 1f
}
mZoomLevel -= delta
} }
val minWidth = sensorRect.width() / maxZoom val ratio = 1 / mZoomLevel
val minHeight = sensorRect.height() / maxZoom val croppedWidth = sensorRect.width() - Math.round(sensorRect.width() * ratio)
val diffWidth = sensorRect.width() - minWidth val croppedHeight = sensorRect.height() - Math.round(sensorRect.height() * ratio)
val diffHeight = sensorRect.height() - minHeight mZoomRect = Rect(croppedWidth / 2, croppedHeight / 2, sensorRect.width() - croppedWidth / 2, sensorRect.height() - croppedHeight / 2)
var cropWidth = (diffWidth / 100 * mZoomLevel).toInt()
var cropHeight = (diffHeight / 100 * mZoomLevel).toInt()
cropWidth -= cropWidth and 3
cropHeight -= cropHeight and 3
mZoomRect = Rect(cropWidth, cropHeight, sensorRect.width() - cropWidth, sensorRect.height() - cropHeight)
mPreviewRequestBuilder!!.set(CaptureRequest.SCALER_CROP_REGION, mZoomRect) mPreviewRequestBuilder!!.set(CaptureRequest.SCALER_CROP_REGION, mZoomRect)
mPreviewRequest = mPreviewRequestBuilder!!.build() mPreviewRequest = mPreviewRequestBuilder!!.build()
mCaptureSession!!.setRepeatingRequest(mPreviewRequest!!, mCaptureCallback, mBackgroundHandler) mCaptureSession!!.setRepeatingRequest(mPreviewRequest!!, mCaptureCallback, mBackgroundHandler)
} }
mZoomFingerSpacing = currentFingerSpacing mZoomFingerSpacing = currentFingerSpacing.toInt()
} }
private fun getFingerSpacing(event: MotionEvent): Float { private fun getFingerSpacing(event: MotionEvent): Float {