introduce debounce on output updates + linked box

This commit is contained in:
David Meincke
2022-03-23 21:31:04 +01:00
parent f25f3daf7f
commit ad53ae9695
15 changed files with 211 additions and 45 deletions
@@ -3,6 +3,8 @@ import './code-editor.less';
import * as monaco from 'monaco-editor'; import * as monaco from 'monaco-editor';
import { OutputFrame } from "../output-frame/output-frame"; import { OutputFrame } from "../output-frame/output-frame";
import initScript from './injects/editor-init.txt'; import initScript from './injects/editor-init.txt';
import spiralBoxesSolutionScript from './injects/spiral-boxes-solution.txt';
import { debounceManager } from "../../../shared/ensure-debounce";
export class CodeEditor extends BaseElement { export class CodeEditor extends BaseElement {
@@ -90,7 +92,15 @@ export class CodeEditor extends BaseElement {
label: 'rand', label: 'rand',
detail: "gets a random number between two numbers", detail: "gets a random number between two numbers",
kind: monaco.languages.CompletionItemKind.Function, kind: monaco.languages.CompletionItemKind.Function,
insertText: 'rand(${1:from}, ${1:to})', insertText: 'rand(${1:from}, ${2:to})',
range: <any>null,
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
},
{
label: 'spiralBoxesSolutionSnippet',
detail: "inserts solution of spiral boxes",
kind: monaco.languages.CompletionItemKind.Function,
insertText: spiralBoxesSolutionScript,
range: <any>null, range: <any>null,
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
} }
@@ -100,12 +110,16 @@ export class CodeEditor extends BaseElement {
}); });
var debounce = debounceManager(1000);
editor.onDidChangeModelContent((e) => { editor.onDidChangeModelContent((e) => {
this.input = editor.getValue(); this.input = editor.getValue();
this.outputFrame.setScript(this.input); debounce.ensureDebounce(() => {
this.outputFrame.setScript(this.input);
});
}); });
this.waitFor(this.outputFrame, () => { this.waitFor(this.outputFrame, () => {
console.log("setting script");
this.outputFrame.setScript(this.input); this.outputFrame.setScript(this.input);
}); });
@@ -1,20 +1,4 @@
const myDiv = document.createElement("div"); box(10, 10, 20, 20);
myDiv.innerText = "hello moto"; box(50, rand(100, 200), 20, 20);
box(160, 50, 20, 20);
document.body.appendChild(myDiv); box(center(), center(), 20, 20);
let i = 0;
while (i < 10) {
console.log("hello " + i);
i++;
}
const obj = { hello: true, moto: "enabled" };
console.log(obj);
rect(10, 10, 100, 100);
rect(rand(20, 70), rand(20, 70), 100, 100);
rect(80, 80, 100, 100);
@@ -0,0 +1,47 @@
const boxSize = 40;
const stepSize = boxSize + boxSize / 4;
let x = center() - boxSize / 2;
let y = center() - boxSize / 2;
let turns = 0;
let currentDirection = 0;
let currentStep = 1;
let stepsInCurrentDirection = 1;
while (!isOutsizeCanvas()) {
box(x, y, boxSize, boxSize);
moveAccordingToDirection();
setNextStepAndDirection();
}
function isOutsizeCanvas() {
return (x + stepSize) > width() ||
(y + stepSize) > height();
}
function moveAccordingToDirection() {
switch (currentDirection) {
case 0:
x += stepSize;
break;
case 1:
y -= stepSize;
break;
case 2:
x -= stepSize;
break;
case 3:
y += stepSize;
break;
}
}
function setNextStepAndDirection() {
if (currentStep % stepsInCurrentDirection == 0) {
currentDirection = (currentDirection + 1) % 4;
turns++;
if (turns % 2 == 0) {
stepsInCurrentDirection++;
}
}
currentStep++;
}
@@ -2,6 +2,7 @@ output-frame {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block; display: block;
background-color: #f0f0f0;
} }
output-frame > iframe { output-frame > iframe {
@@ -9,4 +10,12 @@ output-frame > iframe {
width: 100%; width: 100%;
height: 100%; height: 100%;
border: none; border: none;
}
@media (prefers-color-scheme: dark) {
output-frame {
background-color: #272727;
}
} }
@@ -1,6 +1,5 @@
import { BaseElement } from "../../../shared/_base"; import { BaseElement } from "../../../shared/_base";
import './output-frame.less'; import './output-frame.less';
import { NotificationBubbles } from "../notification-bubbles/notification-bubbles";
import { GetOutputFrameUrl } from "../../../shared/url-helpers"; import { GetOutputFrameUrl } from "../../../shared/url-helpers";
import { GetNotificationBubbles } from "../../../shared/getdom"; import { GetNotificationBubbles } from "../../../shared/getdom";
import { postMessage } from "../../../shared/post-message"; import { postMessage } from "../../../shared/post-message";
-1
View File
@@ -15,7 +15,6 @@ body {
background-color: #f0f0f0; background-color: #f0f0f0;
} }
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
body { body {
background-color: #272727; background-color: #272727;
+2 -2
View File
@@ -6,7 +6,7 @@ import { createScript } from '../shared/create-script';
import { messageListener } from '../shared/message-listener'; import { messageListener } from '../shared/message-listener';
import { postMessage, postResponseMessage } from '../shared/post-message'; import { postMessage, postResponseMessage } from '../shared/post-message';
import { RenderCanvas } from './elements/render-canvas/render-canvas'; import { RenderCanvas } from './elements/render-canvas/render-canvas';
import { getCenter, getHeight, getRandom, getWidth, rect } from './injects/dom-helpers'; import { getCenter, getHeight, getRandom, getWidth, rect, box } from './injects/dom-helpers';
window.customElements.define('render-canvas', RenderCanvas); window.customElements.define('render-canvas', RenderCanvas);
@@ -29,7 +29,7 @@ setOnErrorListener((type, value) => {
//@ts-ignore //@ts-ignore
window.rect = rect; window.rect = rect;
//@ts-ignore //@ts-ignore
window.box = rect; window.box = box;
//@ts-ignore //@ts-ignore
window.width = getWidth; window.width = getWidth;
//@ts-ignore //@ts-ignore
@@ -8,9 +8,11 @@ export class RenderCanvas extends BaseElement {
public height: number = 0; public height: number = 0;
public units = { public units = {
width: 400, width: 400,
heigt: 400 height: 400
} }
public drawCount: number = 0;
public drawQueue: { x: number, y: number }[][] = [];
public prefersDarkScheme = window.matchMedia("(prefers-color-scheme: dark)"); public prefersDarkScheme = window.matchMedia("(prefers-color-scheme: dark)");
onInit(): void { onInit(): void {
@@ -28,8 +30,8 @@ export class RenderCanvas extends BaseElement {
private handleCanvasResize() { private handleCanvasResize() {
if (this.parentElement && this.canvas) { if (this.parentElement && this.canvas) {
this.width = this.parentElement.clientWidth - 20; this.width = Math.floor(this.parentElement.clientWidth - 20);
this.height = this.parentElement.clientHeight - 20; this.height = Math.floor(this.parentElement.clientHeight - 20);
var smallest = Math.min(this.width, this.height); var smallest = Math.min(this.width, this.height);
@@ -43,7 +45,7 @@ export class RenderCanvas extends BaseElement {
drawPoly(points: { x: number, y: number }[]) { drawPoly(points: { x: number, y: number }[]) {
if (this.ctx && this.canvas) { if (this.ctx && this.canvas) {
this.canvas.style.display = "block"; this.canvas.style.display = "block";
this.ctx.fillStyle = "rgba(0,0,0,0)"; this.ctx.fillStyle = this.getColor(true);
this.ctx.strokeStyle = this.getColor(); this.ctx.strokeStyle = this.getColor();
this.ctx.beginPath(); this.ctx.beginPath();
@@ -64,20 +66,96 @@ export class RenderCanvas extends BaseElement {
} }
} }
getColor() { centerOf(points: { x: number, y: number }[]) {
return this.prefersDarkScheme.matches ? 'rgba(255,255,255,1)' : 'rgba(0,0,0,1)'; var x = 0,
y = 0,
i,
j,
f,
point1,
point2;
for (i = 0, j = points.length - 1; i < points.length; j = i, i++) {
point1 = points[i];
point2 = points[j];
f = point1.x * point2.y - point2.x * point1.y;
x += (point1.x + point2.x) * f;
y += (point1.y + point2.y) * f;
}
f = this.areaOf(points) * 6;
return { x: x / f, y: y / f };
};
areaOf(points: { x: number, y: number }[]) {
var area = 0,
i,
j,
point1,
point2;
for (i = 0, j = points.length - 1; i < points.length; j = i, i++) {
point1 = points[i];
point2 = points[j];
area += point1.x * point2.y;
area -= point1.y * point2.x;
}
area /= 2;
return area;
};
executeDrawQueue() {
let prevCenter: { x: number, y: number } | null = null;
for (let i = 0; i < this.drawQueue.length; i++) {
const points = this.drawQueue[i];
if (prevCenter != null) {
var thisCenter = this.centerOf(points);
this.drawPoly([prevCenter, thisCenter]);
}
prevCenter = this.centerOf(points);
}
for (let i = 0; i < this.drawQueue.length; i++) {
const points = this.drawQueue[i];
this.drawPoly(points);
var thisCenter = this.centerOf(points);
this.drawText(thisCenter.x, thisCenter.y, (i + 1).toString(), points[1].x - points[0].x);
}
}
drawText(x: number, y: number, text: string, size: number = 20) {
if (this.ctx && this.canvas) {
this.ctx.moveTo(x, y);
this.ctx.fillStyle = this.getColor();
this.ctx.textAlign = 'center';
this.ctx.textBaseline = 'middle';
this.ctx.font = "200 " + size + "px Segoe UI";
this.ctx.fillText(text, this.unitsToPx(x), this.unitsToPx(y));
}
}
getColor(invert: boolean = false) {
return (invert ? !this.prefersDarkScheme.matches : this.prefersDarkScheme.matches) ? 'rgba(255,255,255,1)' : 'rgba(44,44,44,1)';
} }
drawRect(x: number, y: number, width: number, height: number) { drawRect(x: number, y: number, width: number, height: number) {
this.drawPoly([{ x: x, y: y }, { x: x + width, y: y }, { x: x + width, y: y + height }, { x: x, y: y + height }]); this.drawPoly([{ x: x, y: y }, { x: x + width, y: y }, { x: x + width, y: y + height }, { x: x, y: y + height }]);
} }
queuePoly(points: { x: number, y: number }[]) {
this.drawQueue.push(points);
}
queueRect(x: number, y: number, width: number, height: number) {
this.drawQueue.push([{ x: x, y: y }, { x: x + width, y: y }, { x: x + width, y: y + height }, { x: x, y: y + height }]);
}
unitsToPx(unitNumber: number) { unitsToPx(unitNumber: number) {
var newPPU = Math.min(this.width, this.height) / this.units.width; var newPPU = Math.min(this.width, this.height) / this.units.width;
return unitNumber * newPPU; return unitNumber * newPPU;
} }
onUpdate(): void {
console.log("APP ROOT UPDATE");
}
} }
+12 -2
View File
@@ -9,6 +9,11 @@ export function rect(x: number, y: number, width: number, height: number): void
renderCanvas.drawRect(x, y, width, height); renderCanvas.drawRect(x, y, width, height);
} }
export function box(x: number, y: number, width: number, height: number): void {
var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0];
renderCanvas.queueRect(x, y, width, height);
}
export function getWidth(): number { export function getWidth(): number {
var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0]; var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0];
return renderCanvas.units.width; return renderCanvas.units.width;
@@ -16,14 +21,19 @@ export function getWidth(): number {
export function getHeight(): number { export function getHeight(): number {
var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0]; var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0];
return renderCanvas.units.heigt; return renderCanvas.units.height;
} }
export function getCenter(): number { export function getCenter(): number {
var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0]; var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0];
return renderCanvas.units.heigt / 2; return renderCanvas.units.height / 2;
} }
export function getRandom(min: number, max: number): number { export function getRandom(min: number, max: number): number {
return Math.floor(Math.random() * (max - min + 1) + min); return Math.floor(Math.random() * (max - min + 1) + min);
}
export function executeDrawQueue() {
var renderCanvas = <RenderCanvas>document.getElementsByTagName("render-canvas")[0];
renderCanvas.executeDrawQueue();
} }
@@ -23,6 +23,13 @@
small { small {
font-size: 0.6em; font-size: 0.6em;
} }
@media (prefers-color-scheme: dark) {
.center {
color: white;
}
}
</style> </style>
</head> </head>
-1
View File
@@ -6,7 +6,6 @@
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>output</title> <title>output</title>
<base href="/" /> <base href="/" />
</head> </head>
<body> <body>
+5 -5
View File
@@ -2,21 +2,21 @@ const WebpackDevServer = require("webpack-dev-server");
const webpack = require("webpack"); const webpack = require("webpack");
const codeeditorConfig = require("./webpack.dev.js"); const codeeditorConfig = require("./webpack.dev.js");
const outputframeConfig = require("./webpack.dev-outputframe.js"); const outputframeConfig = require("./webpack.dev.outputframe.js");
const codeeditorCompiler = webpack(codeeditorConfig); const codeeditorCompiler = webpack(codeeditorConfig);
const outputframeCompiler = webpack(outputframeConfig); const outputframeCompiler = webpack(outputframeConfig);
const server1 = new WebpackDevServer(codeeditorCompiler, { const server1 = new WebpackDevServer({
hot: true, hot: true,
historyApiFallback: true historyApiFallback: true
}) }, codeeditorCompiler);
const server2 = new WebpackDevServer(outputframeCompiler, { const server2 = new WebpackDevServer({
hot: true, hot: true,
historyApiFallback: true historyApiFallback: true
}) }, outputframeCompiler);
server1.listen(8020, "localhost", function() { console.log("server 1 rdy"); }) server1.listen(8020, "localhost", function() { console.log("server 1 rdy"); })
server2.listen(8021, "localhost", function() { console.log("server 2 rdy"); }) server2.listen(8021, "localhost", function() { console.log("server 2 rdy"); })
+4
View File
@@ -1,7 +1,11 @@
import { executeDrawQueue } from "../outputframe-app/injects/dom-helpers";
export function createScript(value: string) { export function createScript(value: string) {
var script: HTMLScriptElement = document.createElement("script"); var script: HTMLScriptElement = document.createElement("script");
script.setAttribute("async", ""); script.setAttribute("async", "");
script.innerHTML = value; script.innerHTML = value;
document.body.appendChild(script); document.body.appendChild(script);
executeDrawQueue();
} }
+16
View File
@@ -0,0 +1,16 @@
export function debounceManager(debounceTime: number): { ensureDebounce: (fn: Function) => void } {
var curHandle: number | null = null;
return {
ensureDebounce: (fn: Function) => {
if (curHandle != null) {
clearInterval(curHandle);
curHandle = null;
}
curHandle = setTimeout(() => {
fn();
}, debounceTime);
}
}
}