From ea669518714ddf73c89d18833d68f239d252863f Mon Sep 17 00:00:00 2001 From: Cerrato Renaud Date: Mon, 12 Sep 2016 12:52:51 -0400 Subject: [PATCH] renamed Vector::ToArray() to Vector::array() --- .../orientationProvider/CalibratedGyroscopeProvider.java | 2 +- .../orientationProvider/ImprovedOrientationSensor1Provider.java | 2 +- .../orientationProvider/ImprovedOrientationSensor2Provider.java | 2 +- .../hitlabnz/sensor_fusion_demo/representation/MatrixF4x4.java | 2 +- .../hitlabnz/sensor_fusion_demo/representation/Vector4f.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java index 30495d9..c1ebf27 100644 --- a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java +++ b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java @@ -118,7 +118,7 @@ public class CalibratedGyroscopeProvider extends OrientationProvider { synchronized (syncToken) { // Set the rotation matrix as well to have both representations SensorManager.getRotationMatrixFromVector(currentOrientationRotationMatrix.matrix, - correctedQuat.ToArray()); + correctedQuat.array()); } } timestamp = event.timestamp; diff --git a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java index 81e5c66..a6266db 100644 --- a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java +++ b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java @@ -267,7 +267,7 @@ public class ImprovedOrientationSensor1Provider extends OrientationProvider { currentOrientationQuaternion.copyVec4(quaternion); // Set the rotation matrix as well to have both representations - SensorManager.getRotationMatrixFromVector(currentOrientationRotationMatrix.matrix, correctedQuat.ToArray()); + SensorManager.getRotationMatrixFromVector(currentOrientationRotationMatrix.matrix, correctedQuat.array()); } } } diff --git a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java index 1118918..ababe15 100644 --- a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java +++ b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java @@ -268,7 +268,7 @@ public class ImprovedOrientationSensor2Provider extends OrientationProvider { currentOrientationQuaternion.copyVec4(quaternion); // Set the rotation matrix as well to have both representations - SensorManager.getRotationMatrixFromVector(currentOrientationRotationMatrix.matrix, correctedQuat.ToArray()); + SensorManager.getRotationMatrixFromVector(currentOrientationRotationMatrix.matrix, correctedQuat.array()); } } } diff --git a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/MatrixF4x4.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/MatrixF4x4.java index 86b016d..693167b 100644 --- a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/MatrixF4x4.java +++ b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/MatrixF4x4.java @@ -106,7 +106,7 @@ public class MatrixF4x4 { float z = 0; float w = 0; - float[] vectorArray = vector.ToArray(); + float[] vectorArray = vector.array(); if (colMaj) { for (int i = 0; i < 4; i++) { diff --git a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java index 8b0216d..b1c30dc 100644 --- a/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java +++ b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java @@ -45,7 +45,7 @@ public class Vector4f { * * @return the float[] */ - public float[] ToArray() { + public float[] array() { return points; }