c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing y values in accelerometer simulator

Browse Source 
fix for https://github.com/Microsoft/pxt/issues/893
This commit is contained in:
Peli de Halleux
2016-12-08 11:57:17 -08:00
parent 355c341d36
commit d791738d84
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sim/visuals/microbit.ts
View File

@@ -556,12 +556,12 @@ namespace pxsim.visuals {
private updateTilt() { private updateTilt() {
if (this.props.disableTilt) return; if (this.props.disableTilt) return;
let state = this.board; const state = this.board;
if (!state || !state.accelerometerState.accelerometer.isActive) return; if (!state || !state.accelerometerState.accelerometer.isActive) return;
let x = state.accelerometerState.accelerometer.getX(); const x = state.accelerometerState.accelerometer.getX();
let y = state.accelerometerState.accelerometer.getY(); const y = -state.accelerometerState.accelerometer.getY();
let af = 8 / 1023; const af = 8 / 1023;
this.element.style.transform = "perspective(30em) rotateX(" + y * af + "deg) rotateY(" + x * af + "deg)" this.element.style.transform = "perspective(30em) rotateX(" + y * af + "deg) rotateY(" + x * af + "deg)"
this.element.style.perspectiveOrigin = "50% 50% 50%"; this.element.style.perspectiveOrigin = "50% 50% 50%";
@@ -704,7 +704,7 @@ namespace pxsim.visuals {
} }
let tiltDecayer = 0; let tiltDecayer = 0;
this.element.addEventListener(pointerEvents.move, (ev: MouseEvent) => { this.element.addEventListener(pointerEvents.move, (ev: MouseEvent) => {
let state = this.board; const state = this.board;
if (!state.accelerometerState.accelerometer.isActive) return; if (!state.accelerometerState.accelerometer.isActive) return;
if (tiltDecayer) { if (tiltDecayer) {
@@ -712,14 +712,14 @@ namespace pxsim.visuals {
tiltDecayer = 0; tiltDecayer = 0;
} }
let bbox = this.element.getBoundingClientRect(); const bbox = this.element.getBoundingClientRect();
let ax = (ev.clientX - bbox.width / 2) / (bbox.width / 3); const ax = (ev.clientX - bbox.width / 2) / (bbox.width / 3);
let ay = (ev.clientY - bbox.height / 2) / (bbox.height / 3); const ay = (ev.clientY - bbox.height / 2) / (bbox.height / 3);
let x = - Math.max(- 1023, Math.min(1023, Math.floor(ax * 1023))); const x = - Math.max(- 1023, Math.min(1023, Math.floor(ax * 1023)));
let y = Math.max(- 1023, Math.min(1023, Math.floor(ay * 1023))); const y = - Math.max(- 1023, Math.min(1023, Math.floor(ay * 1023)));
let z2 = 1023 * 1023 - x * x - y * y; const z2 = 1023 * 1023 - x * x - y * y;
let z = Math.floor((z2 > 0 ? -1 : 1) * Math.sqrt(Math.abs(z2))); const z = Math.floor((z2 > 0 ? -1 : 1) * Math.sqrt(Math.abs(z2)));
state.accelerometerState.accelerometer.update(x, y, z); state.accelerometerState.accelerometer.update(x, y, z);
this.updateTilt(); this.updateTilt();