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

added A+B rendering

Browse Source
This commit is contained in:
Peli de Halleux 2016-03-18 13:55:07 -07:00
parent c5e4beab96
commit 51e025507a
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sim/simsvg.ts
View File

@ -11,6 +11,9 @@ namespace ks.rt.micro_bit {
buttonOuter?: string; buttonOuter?: string;
buttonUp?: string; buttonUp?: string;
buttonDown?: string; buttonDown?: string;
virtualButtonOuter?: string;
virtualButtonUp?: string;
virtualButtonDown?: string;
lightLevelOn?:string; lightLevelOn?:string;
lightLevelOff?: string; lightLevelOff?: string;
} }
@ -27,6 +30,8 @@ namespace ks.rt.micro_bit {
buttonOuter: "#979797", buttonOuter: "#979797",
buttonUp: "#000", buttonUp: "#000",
buttonDown: "#FFA500", buttonDown: "#FFA500",
virtualButtonOuter: "#333",
virtualButtonUp: "#fff",
lightLevelOn: "yellow", lightLevelOn: "yellow",
lightLevelOff: "#555" lightLevelOff: "#555"
}}); }});
@ -163,6 +168,7 @@ namespace ks.rt.micro_bit {
private display: SVGElement; private display: SVGElement;
private buttons: SVGElement[]; private buttons: SVGElement[];
private buttonsOuter: SVGElement[]; private buttonsOuter: SVGElement[];
private buttonABText:SVGTextElement;
private pins: SVGElement[]; private pins: SVGElement[];
private pinGradients: SVGLinearGradientElement[]; private pinGradients: SVGLinearGradientElement[];
private pinTexts: SVGTextElement[]; private pinTexts: SVGTextElement[];
@ -193,8 +199,10 @@ namespace ks.rt.micro_bit {
Svg.fill(this.display, theme.display); Svg.fill(this.display, theme.display);
Svg.fills(this.leds, theme.ledOn); Svg.fills(this.leds, theme.ledOn);
Svg.fills(this.ledsOuter, theme.ledOff); Svg.fills(this.ledsOuter, theme.ledOff);
Svg.fills(this.buttonsOuter, theme.buttonOuter); Svg.fills(this.buttonsOuter.slice(0, 2), theme.buttonOuter);
Svg.fills(this.buttons, theme.buttonUp); Svg.fills(this.buttons.slice(0, 2), theme.buttonUp);
Svg.fill(this.buttonsOuter[2], theme.virtualButtonOuter);
Svg.fill(this.buttons[2], theme.virtualButtonUp);
Svg.fills(this.logos, theme.accent); Svg.fills(this.logos, theme.accent);
this.pinGradients.forEach(lg => Svg.setGradientColors(lg, theme.pin, theme.pinActive)); this.pinGradients.forEach(lg => Svg.setGradientColors(lg, theme.pin, theme.pinActive));
@ -222,10 +230,19 @@ namespace ks.rt.micro_bit {
this.updateTilt(); this.updateTilt();
this.updateHeading(); this.updateHeading();
this.updateLightLevel(); this.updateLightLevel();
this.updateTemperature(); this.updateTemperature();
this.updateButtonAB();
(<any>this.buttonsOuter[2]).style.visibility = state.usesButtonAB ? 'visible' : 'hidden'; }
(<any>this.buttons[2]).style.visibility = state.usesButtonAB ? 'visible' : 'hidden';
private updateButtonAB() {
let state = this.board;
if (state.usesButtonAB && !this.buttonABText) {
(<any>this.buttonsOuter[2]).style.visibility = 'visible';
(<any>this.buttons[2]).style.visibility = 'visible';
this.buttonABText = Svg.child(this.g, "text", {class: 'sim-text', x:370, y:272 }) as SVGTextElement;
this.buttonABText.textContent = "A+B";
this.updateTheme();
}
} }
private updatePin(pin : Pin, index: number) { private updatePin(pin : Pin, index: number) {
@ -584,6 +601,11 @@ namespace ks.rt.micro_bit {
state.buttons[index].pressed = true; state.buttons[index].pressed = true;
Svg.fill(this.buttons[index], this.props.theme.buttonDown); Svg.fill(this.buttons[index], this.props.theme.buttonDown);
}) })
btn.addEventListener("mouseleave", ev => {
let state = this.board;
state.buttons[index].pressed = false;
Svg.fill(this.buttons[index], this.props.theme.buttonUp);
})
btn.addEventListener("mouseup", ev => { btn.addEventListener("mouseup", ev => {
let state = this.board; let state = this.board;
state.buttons[index].pressed = false; state.buttons[index].pressed = false;
@ -602,6 +624,15 @@ namespace ks.rt.micro_bit {
Svg.fill(this.buttons[1], this.props.theme.buttonDown); Svg.fill(this.buttons[1], this.props.theme.buttonDown);
Svg.fill(this.buttons[2], this.props.theme.buttonDown); Svg.fill(this.buttons[2], this.props.theme.buttonDown);
}) })
this.buttonsOuter[2].addEventListener("mouseleave", ev => {
let state = this.board;
state.buttons[0].pressed = false;
state.buttons[1].pressed = false;
state.buttons[2].pressed = false;
Svg.fill(this.buttons[0], this.props.theme.buttonUp);
Svg.fill(this.buttons[1], this.props.theme.buttonUp);
Svg.fill(this.buttons[2], this.props.theme.virtualButtonUp);
})
this.buttonsOuter[2].addEventListener("mouseup", ev => { this.buttonsOuter[2].addEventListener("mouseup", ev => {
let state = this.board; let state = this.board;
state.buttons[0].pressed = false; state.buttons[0].pressed = false;
@ -609,7 +640,7 @@ namespace ks.rt.micro_bit {
state.buttons[2].pressed = false; state.buttons[2].pressed = false;
Svg.fill(this.buttons[0], this.props.theme.buttonUp); Svg.fill(this.buttons[0], this.props.theme.buttonUp);
Svg.fill(this.buttons[1], this.props.theme.buttonUp); Svg.fill(this.buttons[1], this.props.theme.buttonUp);
Svg.fill(this.buttons[2], this.props.theme.buttonUp); Svg.fill(this.buttons[2], this.props.theme.virtualButtonUp);
let ens = enums(); let ens = enums();
this.board.bus.queue(state.buttons[2].id, ens.MICROBIT_BUTTON_EVT_CLICK); this.board.bus.queue(state.buttons[2].id, ens.MICROBIT_BUTTON_EVT_CLICK);