diff --git a/0.作品模板.html b/0.作品模板.html index 09c9c37..be378e7 100644 --- a/0.作品模板.html +++ b/0.作品模板.html @@ -21,7 +21,7 @@ function draw() { background(0); - drawGrid(32); + drawGrid(255, 32); textInfo("作品模板", "2022-12-12"); } diff --git a/10.单摆.html b/10.单摆.html index 393009b..bfe52c3 100644 --- a/10.单摆.html +++ b/10.单摆.html @@ -19,7 +19,7 @@ function draw() { background(0); - drawGrid(32); + drawGrid(255, 32); 单摆.draw(); 单摆.update(); textInfo("单摆", "2022-12-14"); diff --git a/11.风扇.html b/11.风扇.html index 4b0a98e..ae30fca 100644 --- a/11.风扇.html +++ b/11.风扇.html @@ -46,7 +46,7 @@ function draw() { background(255); - drawGrid(32, 0); + drawGrid(0); let hx = width / 2; let hy = 100; diff --git a/3.火把.html b/3.火把.html index 71ca866..7391504 100644 --- a/3.火把.html +++ b/3.火把.html @@ -30,7 +30,7 @@ function draw() { clear(); background(0); - drawGrid(32); + drawGrid(255); if ( mouseIsPressed && diff --git a/6.引力模拟.html b/6.引力模拟.html index e99b068..fecc4ad 100644 --- a/6.引力模拟.html +++ b/6.引力模拟.html @@ -33,7 +33,7 @@ function draw() { background(0); - drawGrid(32); + drawGrid(255); for (let i = 0; i < plantsNumber; i++) { planets[i].update(); diff --git a/7.幸运转盘.html b/7.幸运转盘.html index bfc3312..487164a 100644 --- a/7.幸运转盘.html +++ b/7.幸运转盘.html @@ -36,7 +36,7 @@ function draw() { clear(); - background(64); + background(0); drawGrid(); 转盘.update(); 转盘.draw(); @@ -67,8 +67,8 @@ draw() { push(); // 绘制盘面 - fill(0); - stroke(200); + fill(200); + stroke(128); strokeWeight(2); translate(this.x, this.y); circle(0, 0, 500); @@ -85,7 +85,7 @@ // 绘制文字 push(); noStroke(); - fill(200); + fill(0); if (i == Math.floor(this.hand.heading / 每一格的角度)) { fill("red"); stroke("yellow"); diff --git a/8.小车的运动.html b/8.小车的运动.html index 88258bf..61d007f 100644 --- a/8.小车的运动.html +++ b/8.小车的运动.html @@ -30,7 +30,7 @@ function draw() { background(0); - drawGrid(32); + drawGrid(255); playdemos([追逐鼠标, 小车追逐, 小车巡游, 小车巡线], 10); } diff --git a/9.圆周与正弦波.html b/9.圆周与正弦波.html index 4d7b613..3335dbc 100644 --- a/9.圆周与正弦波.html +++ b/9.圆周与正弦波.html @@ -16,7 +16,7 @@ function draw() { background(0); - drawGrid(32); + drawGrid(255); noFill(); strokeWeight(2); stroke("lightgreen"); diff --git a/lib/utils.js b/lib/utils.js index 5858fe9..7ba0570 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -5,11 +5,14 @@ function loadJavaScript(path) { } function playdemos(list, delay = 10) { - let n = Math.floor((frameCount / (delay * 60)) % list.length); - list[n](); + let fps = frameRate(); + fps = 60; + let n = floor((frameCount / (delay * fps)) % list.length); + let func = list[n]; + func(); } -function drawGrid(fade = 64, color = 255) { +function drawGrid(color = 255, fade = 32) { push(); colorMode(RGB); stroke(color, fade);