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

merging master

Browse Source
This commit is contained in:
Peli de Halleux
2016-11-09 13:20:18 -08:00
parent 94e72784b9 b6b18b7ceb
commit 0b144539f3
22 changed files with 498 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sim/state/soundmotor.ts
View File

@ -1,5 +1,10 @@
namespace pxsim.motors {
export function motorOn(power: number) {
export function motorPower(power: number) {
// TODO
}
export function motorCommand(command: MotorCommand) {
}
export function dualMotorPower(motor: Motor, percent: number) {
}
}

5
sim/visuals/microbit.ts
View File

@ -1723,8 +1723,9 @@ namespace pxsim.visuals {
tiltDecayer = 0;
}
let ax = (ev.clientX - this.element.clientWidth / 2) / (this.element.clientWidth / 3);
let ay = (ev.clientY - this.element.clientHeight / 2) / (this.element.clientHeight / 3);
let bbox = this.element.getBoundingClientRect();
let ax = (ev.clientX - bbox.width / 2) / (bbox.width / 3);
let ay = (ev.clientY - bbox.height / 2) / (bbox.height / 3);
let x = - Math.max(- 1023, Math.min(1023, Math.floor(ax * 1023)));
let y = Math.max(- 1023, Math.min(1023, Math.floor(ay * 1023)));