|
231 | 231 | */ |
232 | 232 | GyroNorm.prototype.isAvailable = function(_eventType) { |
233 | 233 |
|
| 234 | + var doSnapShot = _do.getScreenAdjustedEuler(); |
| 235 | + var accSnapShot = _dm.getScreenAdjustedAcceleration(); |
| 236 | + var accGraSnapShot = _dm.getScreenAdjustedAccelerationIncludingGravity(); |
| 237 | + var rotRateSnapShot = _dm.getScreenAdjustedRotationRate(); |
| 238 | + |
234 | 239 | switch (_eventType) { |
235 | 240 | case DEVICE_ORIENTATION: |
236 | | - return (_do.isAvailable(_do.ALPHA) && _do.isAvailable(_do.BETA) && _do.isAvailable(_do.GAMMA)); |
| 241 | + return ((doSnapShot.alpha && doSnapShot.alpha !== null) && (doSnapShot.beta && doSnapShot.beta !== null) && (doSnapShot.gamma && doSnapShot.gamma !== null)); |
237 | 242 | break; |
238 | 243 |
|
239 | 244 | case ACCELERATION: |
240 | | - return (_dm.isAvailable(_dm.ACCELERATION_X) && _dm.isAvailable(_dm.ACCELERATION_Y) && _dm.isAvailable(_dm.ACCELERATION_Z)); |
| 245 | + return (accSnapShot && accSnapShot.x && accSnapShot.y && accSnapShot.z); |
241 | 246 | break; |
242 | 247 |
|
243 | 248 | case ACCELERATION_INCLUDING_GRAVITY: |
244 | | - return (_dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_X) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Y) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Z)); |
| 249 | + return (accGraSnapShot && accGraSnapShot.x && accGraSnapShot.y && accGraSnapShot.z); |
245 | 250 | break; |
246 | 251 |
|
247 | 252 | case ROTATION_RATE: |
248 | | - return (_dm.isAvailable(_dm.ROTATION_RATE_ALPHA) && _dm.isAvailable(_dm.ROTATION_RATE_BETA) && _dm.isAvailable(_dm.ROTATION_RATE_GAMMA)); |
| 253 | + return (rotRateSnapShot && rotRateSnapShot.alpha && rotRateSnapShot.beta && rotRateSnapShot.gamma); |
249 | 254 | break; |
250 | 255 |
|
251 | 256 | default: |
252 | 257 | return { |
253 | | - deviceOrientationAvailable: (_do.isAvailable(_do.ALPHA) && _do.isAvailable(_do.BETA) && _do.isAvailable(_do.GAMMA)), |
254 | | - accelerationAvailable: (_dm.isAvailable(_dm.ACCELERATION_X) && _dm.isAvailable(_dm.ACCELERATION_Y) && _dm.isAvailable(_dm.ACCELERATION_Z)), |
255 | | - accelerationIncludingGravityAvailable: (_dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_X) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Y) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Z)), |
256 | | - rotationRateAvailable: (_dm.isAvailable(_dm.ROTATION_RATE_ALPHA) && _dm.isAvailable(_dm.ROTATION_RATE_BETA) && _dm.isAvailable(_dm.ROTATION_RATE_GAMMA)) |
| 258 | + deviceOrientationAvailable: ((doSnapShot.alpha && doSnapShot.alpha !== null) && (doSnapShot.beta && doSnapShot.beta !== null) && (doSnapShot.gamma && doSnapShot.gamma !== null)), |
| 259 | + accelerationAvailable: (accSnapShot && accSnapShot.x && accSnapShot.y && accSnapShot.z), |
| 260 | + accelerationIncludingGravityAvailable: (accGraSnapShot && accGraSnapShot.x && accGraSnapShot.y && accGraSnapShot.z), |
| 261 | + rotationRateAvailable: (rotRateSnapShot && rotRateSnapShot.alpha && rotRateSnapShot.beta && rotRateSnapShot.gamma) |
257 | 262 | } |
258 | 263 | break; |
259 | 264 | } |
|
0 commit comments