diff --git a/Catalogue/Screenshot 2022-03-20 212123.png b/Catalogue/Screenshot 2022-03-20 212123.png new file mode 100644 index 0000000..128a5a4 Binary files /dev/null and b/Catalogue/Screenshot 2022-03-20 212123.png differ diff --git a/Catalogue/Screenshot 2022-03-20 212148.png b/Catalogue/Screenshot 2022-03-20 212148.png new file mode 100644 index 0000000..cfadb18 Binary files /dev/null and b/Catalogue/Screenshot 2022-03-20 212148.png differ diff --git a/Catalogue/Square answer.png b/Catalogue/Square answer.png new file mode 100644 index 0000000..18cf30a Binary files /dev/null and b/Catalogue/Square answer.png differ diff --git a/Catalogue/floral.html b/Catalogue/floral.html index 1983404..ad5f086 100644 --- a/Catalogue/floral.html +++ b/Catalogue/floral.html @@ -28,7 +28,7 @@ render(); render_clear(); - draw_floral(9, 200, rotation *0, centerX, centerY, "red"); + draw_floral(16, 200, rotation *0, centerX, centerY, "red"); }, 1000 / fps); diff --git a/Catalogue/npoly twist - accident.html b/Catalogue/npoly twist - accident.html new file mode 100644 index 0000000..ddad426 --- /dev/null +++ b/Catalogue/npoly twist - accident.html @@ -0,0 +1,141 @@ + + + + +
+ + + + + \ No newline at end of file diff --git a/Catalogue/npoly twist.html b/Catalogue/npoly twist.html new file mode 100644 index 0000000..a7773c3 --- /dev/null +++ b/Catalogue/npoly twist.html @@ -0,0 +1,109 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Catalogue/npolygon.html b/Catalogue/npolygon.html new file mode 100644 index 0000000..72a2e45 --- /dev/null +++ b/Catalogue/npolygon.html @@ -0,0 +1,71 @@ + + + + + + + + + diff --git a/Catalogue/poly last notes might delete.png b/Catalogue/poly last notes might delete.png new file mode 100644 index 0000000..3ba1540 Binary files /dev/null and b/Catalogue/poly last notes might delete.png differ diff --git a/Catalogue/square accident.html b/Catalogue/square accident.html new file mode 100644 index 0000000..42c6aa0 --- /dev/null +++ b/Catalogue/square accident.html @@ -0,0 +1,81 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Catalogue/square answer simplified.png b/Catalogue/square answer simplified.png new file mode 100644 index 0000000..66edbdb Binary files /dev/null and b/Catalogue/square answer simplified.png differ diff --git a/Catalogue/triangle twist.html b/Catalogue/triangle twist.html index bd7d699..3994d66 100644 --- a/Catalogue/triangle twist.html +++ b/Catalogue/triangle twist.html @@ -2,7 +2,7 @@ - + @@ -29,8 +29,8 @@ render(); render_clear(); - DrawTriangleTwist_angle(400,0,rotation,"red") - // DrawTriangleTwist_width(400,0,rotation,"red") + // DrawTriangleTwist_angle(400,0,rotation,"red") + DrawTriangleTwist_width(400,0,rotation,"red") }, 1000 / fps); rotation += deg_per_sec / fps; // was = j = innerRotation, now = rotation @@ -41,9 +41,10 @@ render(); - function DrawTriangleTwist_width(width, rotation,innerRotation, colour){ - - let widthMultiplier = 1 / (2 * Math.sin(Math.PI / 180 * (150 - innerRotation + 120 * Math.floor(innerRotation / 120)))) + function DrawTriangleTwist_angle(width, rotation,innerRotation, colour){ + let out_angle = innerRotation; + // let widthMultiplier = 1 / (2 * Math.sin(Math.PI / 180 * (150 - innerRotation + 120 * Math.floor(innerRotation / 120)))) + let widthMultiplier = 1 / (2 * Math.sin(Math.PI / 180 * (150 - out_angle + 120 * Math.floor(out_angle / 120)))) for (let i = 0; i < 25; i++) { draw_triangle(180+innerRotation*i,width*widthMultiplier**i, colour) @@ -51,7 +52,7 @@ } - function DrawTriangleTwist_angle(width, rotation,innerRotation, colour){ + function DrawTriangleTwist_width(width, rotation,innerRotation, colour){ let out_angle = 0 let innerAngle = innerRotation - (120*Math.floor(innerRotation/120)); @@ -62,7 +63,7 @@ out_angle = -120 / (2 * Math.cos(2 * Math.PI / 3 - (innerAngle * Math.PI / 180))) + 180 } - let widthMultiplier = 1 / (2 * Math.sin(Math.PI / 180 * (150 - out_angle + 120 * Math.floor(out_angle / 120)))) + let widthMultiplier = 1 / (2 * Math.sin(Math.PI / 180 * (150 - out_angle + 120 * Math.floor(out_angle / 120)))) //150 = 90+innerangle/2 for (let i = 0; i < 25; i++) { draw_triangle(180+out_angle*i,width*widthMultiplier**i, colour) @@ -70,9 +71,6 @@ } - - - function draw_triangle(ang, radius, colour) { ctx.beginPath(); ctx.moveTo(centerX + Math.cos(rad(90 + 120 * 1 + ang)) * radius, centerY + Math.sin(rad(90 + 120 * 1 + ang)) * radius);