From 1466998fec4edfe7db8b1a58341986271889014e Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Fri, 17 May 2024 08:51:40 +0200 Subject: [PATCH] Use SENSOR_DELAY_NORMAL for acceleration --- app/src/main/AndroidManifest.xml | 2 -- .../com/panoramagl/sample/MainActivity.kt | 1 - .../main/java/com/panoramagl/PLActivity.kt | 16 +-------------- .../main/java/com/panoramagl/PLConstants.kt | 1 - .../src/main/java/com/panoramagl/PLIView.java | 4 ---- .../src/main/java/com/panoramagl/PLManager.kt | 20 ++++--------------- .../com/panoramagl/loaders/PLJSONLoader.java | 2 -- 7 files changed, 5 insertions(+), 41 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ff45107..92f5410 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,6 @@ - - 0.0f && mAccelerometerInterval != accelerometerInterval) { - mAccelerometerInterval = accelerometerInterval - this.deactiveAccelerometer() - this.activateAccelerometer() - } - } - override fun getAccelerometerSensitivity(): Float { return mAccelerometerSensitivity } @@ -946,7 +932,7 @@ open class PLActivity : AppCompatActivity(), PLIView, SensorEventListener, Gestu if (sensorManager != null && sensorManager!!.registerListener( this, sensorManager!!.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), - (mAccelerometerInterval * 1000.0f).toInt() + SensorManager.SENSOR_DELAY_NORMAL ) ) return true Timber.d("Accelerometer sensor is not available on the device!") diff --git a/library/src/main/java/com/panoramagl/PLConstants.kt b/library/src/main/java/com/panoramagl/PLConstants.kt index 9cc55b7..2f65807 100755 --- a/library/src/main/java/com/panoramagl/PLConstants.kt +++ b/library/src/main/java/com/panoramagl/PLConstants.kt @@ -170,7 +170,6 @@ object PLConstants { /** * accelerometer constants */ - const val kDefaultAccelerometerInterval: Float = (1.0f / 30.0f) const val kAccelerometerSensitivityMinValue: Float = 1.0f const val kAccelerometerSensitivityMaxValue: Float = 10.0f const val kDefaultAccelerometerSensitivity: Float = kAccelerometerSensitivityMaxValue diff --git a/library/src/main/java/com/panoramagl/PLIView.java b/library/src/main/java/com/panoramagl/PLIView.java index fa64151..673b729 100755 --- a/library/src/main/java/com/panoramagl/PLIView.java +++ b/library/src/main/java/com/panoramagl/PLIView.java @@ -89,10 +89,6 @@ public interface PLIView { void setAccelerometerUpDownEnabled(boolean isAccelerometerUpDownEnabled); - float getAccelerometerInterval(); - - void setAccelerometerInterval(float accelerometerInterval); - float getAccelerometerSensitivity(); void setAccelerometerSensitivity(float accelerometerSensitivity); diff --git a/library/src/main/java/com/panoramagl/PLManager.kt b/library/src/main/java/com/panoramagl/PLManager.kt index 63f5633..87c8283 100755 --- a/library/src/main/java/com/panoramagl/PLManager.kt +++ b/library/src/main/java/com/panoramagl/PLManager.kt @@ -5,6 +5,7 @@ import android.hardware.Sensor import android.hardware.SensorEvent import android.hardware.SensorEventListener import android.hardware.SensorManager +import android.hardware.SensorManager.SENSOR_DELAY_NORMAL import android.opengl.GLSurfaceView import android.os.Handler import android.os.Looper @@ -75,7 +76,6 @@ open class PLManager(private val context: Context) : PLIView, SensorEventListene private var mIsAccelerometerEnabled = false private var mIsAccelerometerLeftRightEnabled = false private var mIsAccelerometerUpDownEnabled = false - private var mAccelerometerInterval = PLConstants.kDefaultAccelerometerInterval private var mAccelerometerSensitivity = 0f private var mIsValidForSensorialRotation = false protected var sensorialRotationType: PLSensorialRotationType? = null @@ -389,18 +389,6 @@ open class PLManager(private val context: Context) : PLIView, SensorEventListene mIsAccelerometerUpDownEnabled = isAccelerometerUpDownEnabled } - override fun getAccelerometerInterval(): Float { - return mAccelerometerInterval - } - - override fun setAccelerometerInterval(accelerometerInterval: Float) { - if (accelerometerInterval > 0.0f && mAccelerometerInterval != accelerometerInterval) { - mAccelerometerInterval = accelerometerInterval - deactiveAccelerometer() - activateAccelerometer() - } - } - override fun getAccelerometerSensitivity(): Float { return mAccelerometerSensitivity } @@ -902,7 +890,7 @@ open class PLManager(private val context: Context) : PLIView, SensorEventListene if (sensorManager.registerListener( this, sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), - (mAccelerometerInterval * 1000.0f).toInt() + SENSOR_DELAY_NORMAL ) ) return true Timber.d("Accelerometer sensor is not available on the device!") @@ -1447,9 +1435,9 @@ open class PLManager(private val context: Context) : PLIView, SensorEventListene protected fun onGLContextCreated() = Unit fun onResume() { - if (mIsRendererCreated && mPanorama != null) startAnimation() + if (mIsRendererCreated && mPanorama != null) + startAnimation() activateOrientation() - activateAccelerometer() if (mIsValidForSensorialRotation) { updateInitialSensorialRotation() if (sensorialRotationType == PLSensorialRotationType.PLSensorialRotationTypeGyroscope) activateGyroscope() else if (sensorialRotationType == PLSensorialRotationType.PLSensorialRotationTypeAccelerometerAndMagnetometer) { diff --git a/library/src/main/java/com/panoramagl/loaders/PLJSONLoader.java b/library/src/main/java/com/panoramagl/loaders/PLJSONLoader.java index 3789dac..c81a170 100755 --- a/library/src/main/java/com/panoramagl/loaders/PLJSONLoader.java +++ b/library/src/main/java/com/panoramagl/loaders/PLJSONLoader.java @@ -260,8 +260,6 @@ else if (imageColorFormat.equals("RGBA4444")) JSONObject accelerometer = mJSON.getJSONObject("accelerometer"); if (accelerometer.has("enabled")) mView.setAccelerometerEnabled(accelerometer.getBoolean("enabled")); - if (accelerometer.has("interval")) - mView.setAccelerometerInterval((float) accelerometer.getDouble("interval")); if (accelerometer.has("sensitivity")) mView.setAccelerometerSensitivity((float) accelerometer.getDouble("sensitivity")); if (accelerometer.has("leftRightEnabled"))