Merge pull request #322 from hannesa2/AccelerationSampleInterval

Use SENSOR_DELAY_NORMAL for acceleration

Author: hannesa2

app/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"/>
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

app/src/main/java/com/panoramagl/sample/MainActivity.kt

@@ -1,7 +1,6 @@
 package com.panoramagl.sample
 
 import android.graphics.BitmapFactory
-import android.opengl.GLES20
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper

library/src/main/java/com/panoramagl/PLActivity.kt

@@ -94,7 +94,6 @@ open class PLActivity : AppCompatActivity(), PLIView, SensorEventListener, Gestu
     private var accelerometerEnabled = false
     private var accelerometerLeftRightEnabled = false
     private var accelerometerUpDownEnabled = false
-    private var mAccelerometerInterval = 0f
     private var mAccelerometerSensitivity = 0f
 
     private var mIsValidForSensorialRotation = false
@@ -172,7 +171,6 @@ open class PLActivity : AppCompatActivity(), PLIView, SensorEventListener, Gestu
         accelerometerEnabled = false
         accelerometerUpDownEnabled = true
         accelerometerLeftRightEnabled = accelerometerUpDownEnabled
-        mAccelerometerInterval = PLConstants.kDefaultAccelerometerInterval
         mAccelerometerSensitivity = PLConstants.kDefaultAccelerometerSensitivity
 
         sensorialRotationType = PLSensorialRotationType.PLSensorialRotationTypeUnknow
@@ -418,18 +416,6 @@ open class PLActivity : AppCompatActivity(), PLIView, SensorEventListener, Gestu
         accelerometerUpDownEnabled = isAccelerometerUpDownEnabled
     }
 
-    override fun getAccelerometerInterval(): Float {
-        return mAccelerometerInterval
-    }
-
-    override fun setAccelerometerInterval(accelerometerInterval: Float) {
-        if (accelerometerInterval > 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!")

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

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);

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) {

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"))