Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No use of HIGH_SAMPLING_RATE and use SENSOR_DELAY_NORMAL for acceleration #322

Merged
merged 1 commit into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/panoramagl/sample/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 1 addition & 15 deletions library/src/main/java/com/panoramagl/PLActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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!")
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/com/panoramagl/PLConstants.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions library/src/main/java/com/panoramagl/PLIView.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ public interface PLIView {

void setAccelerometerUpDownEnabled(boolean isAccelerometerUpDownEnabled);

float getAccelerometerInterval();

void setAccelerometerInterval(float accelerometerInterval);

float getAccelerometerSensitivity();

void setAccelerometerSensitivity(float accelerometerSensitivity);
Expand Down
20 changes: 4 additions & 16 deletions library/src/main/java/com/panoramagl/PLManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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!")
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down