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

Merge branch 'master' into editortoolbox

Browse Source
This commit is contained in:
Sam El-Husseini 2017-01-09 16:01:35 -08:00
commit e175e70d01
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/core/core.cpp
View File

@ -76,7 +76,7 @@ namespace Boolean_ {
} }
//% //%
bool bang(bool v) { return !v; } bool bang(int v) { return v == 0; }
} }
namespace Number_ { namespace Number_ {

15
sim/state/ledmatrix.ts
View File

@ -53,9 +53,9 @@ namespace pxsim {
} }
public shiftRight(cols: number) { public shiftRight(cols: number) {
for (let x = this.width - 1; x <= 0; --x) for (let x = this.width - 1; x >= 0; --x)
for (let y = 0; y < 5; ++y) for (let y = 0; y < 5; ++y)
this.set(x, y, x > cols ? this.get(x - cols, y) : 0); this.set(x, y, x >= cols ? this.get(x - cols, y) : 0);
} }
public clear(): void { public clear(): void {
@ -195,11 +195,16 @@ namespace pxsim.ImageMethods {
board().ledMatrixState.animationQ.enqueue({ board().ledMatrixState.animationQ.enqueue({
interval: interval, interval: interval,
frame: () => { frame: () => {
//TODO: support right to left.
if (off >= leds.width || off < 0) return false; if (off >= leds.width || off < 0) return false;
stride > 0 ? display.shiftLeft(stride) : display.shiftRight(-stride); if (stride > 0) {
let c = Math.min(stride, leds.width - off); display.shiftLeft(stride);
const c = Math.min(stride, leds.width - off);
leds.copyTo(off, c, display, 5 - stride) leds.copyTo(off, c, display, 5 - stride)
} else {
display.shiftRight(-stride);
const c = Math.min(-stride, leds.width - off);
leds.copyTo(off, c, display, 0)
}
off += stride; off += stride;
return true; return true;
}, },