technicalkiwi
/
animate
mirror of https://github.com/SamEyeBam/animate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update

This commit is contained in:
Sam 2023-03-21 19:08:08 +13:00
parent c15e5b1722
commit 572f9b4401
5 changed files with 350 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
Catalogue/floralPhyllo_accident.html
View File

@ -2,17 +2,21 @@
<html> <html>
<!-- ahhh --> <!-- ahhh -->
<body style="margin:0;overflow: hidden;"> <body style="margin: 0; overflow: hidden">
<canvas id="myCanvas" width="10" height="10" style="display: block;box-sizing: border-box;"> <canvas
Your browser does not support the HTML5 canvas tag.</canvas> id="myCanvas"
width="10"
height="10"
style="display: block; box-sizing: border-box"
>
Your browser does not support the HTML5 canvas tag.</canvas
>
<script> <script>
let c = document.getElementById("myCanvas"); let c = document.getElementById("myCanvas");
let ctx = c.getContext("2d"); let ctx = c.getContext("2d");
ctx.canvas.width = window.innerWidth; ctx.canvas.width = window.innerWidth;
ctx.canvas.height = window.innerHeight; ctx.canvas.height = window.innerHeight;
let deg_per_sec = 30 / 5000; let deg_per_sec = 30 / 5000;
let time = 99999999; let time = 99999999;
let fps = 60; let fps = 60;
@ -24,8 +28,6 @@
rotation = 0; //was = j = angle rotation = 0; //was = j = angle
currentFrame = 0; //was = i currentFrame = 0; //was = i
function render() { function render() {
if (currentFrame < time / (1 / fps)) { if (currentFrame < time / (1 / fps)) {
setTimeout(() => { setTimeout(() => {
@ -58,23 +60,18 @@
for (let n = 0; n < 300; n += 1) { for (let n = 0; n < 300; n += 1) {
ncolour = LerpRGB(colour1, colour2, Math.cos(rad(n / 2))); ncolour = LerpRGB(colour1, colour2, Math.cos(rad(n / 2)));
let a = n * (angle)//137.5; let a = n * angle; //137.5;
let r = c * Math.sqrt(n); let r = c * Math.sqrt(n);
let x = r * Math.cos(a) + centerX; let x = r * Math.cos(a) + centerX;
let y = r * Math.sin(a) + centerY; let y = r * Math.sin(a) + centerY;
drawEyelid(x, y); drawEyelid(x, y);
// ctx.beginPath(); // ctx.beginPath();
// ctx.arc(x, y, 8, 0, 2 * Math.PI); // ctx.arc(x, y, 8, 0, 2 * Math.PI);
// ctx.fillStyle = colourToText(ncolour); // ctx.fillStyle = colourToText(ncolour);
// ctx.fill(); // ctx.fill();
} }
} }
function rad(degrees) { function rad(degrees) {
var pi = Math.PI; var pi = Math.PI;
@ -93,7 +90,7 @@
} }
function colourToText(colour) { function colourToText(colour) {
return "rgb(" + colour[0] + "," + colour[1] + "," + colour[2] + ")" return "rgb(" + colour[0] + "," + colour[1] + "," + colour[2] + ")";
} }
function render_clear() { function render_clear() {
@ -103,111 +100,108 @@
} }
function drawEyelid(x1, y1) { function drawEyelid(x1, y1) {
x1 -= centerX x1 -= centerX;
y1 -= centerY y1 -= centerY;
let angle = Math.atan(y1 / x1); let angle = Math.atan(y1 / x1);
// if(angle >=Math.PI){ // if(angle >=Math.PI){
// angle -=Math.PI // angle -=Math.PI
// console.log("greater called") // console.log("greater called")
// } // }
angle= Math.abs(angle) angle = Math.abs(angle);
console.log(angle) console.log(angle);
let x2Old = 0 + leafWidth let x2Old = 0 + leafWidth;
let y2Old = 0 let y2Old = 0;
let x3Old = 0 + leafWidth / 2;
let y3Old = 0 + leafHeight / 2;
let x3Old = 0 + (leafWidth / 2); let x4Old = 0 + leafWidth / 2;
let y3Old = 0 + (leafHeight / 2); let y4Old = 0 - leafHeight / 2;
let x4Old = 0 + (leafWidth / 2); let x2 = x2Old * Math.cos(angle) - y2Old * Math.sin(angle);
let y4Old = 0 - (leafHeight / 2); let y2 = x2Old * Math.sin(angle) + y2Old * Math.cos(angle);
let x2 = x2Old * Math.cos(angle) - y2Old * Math.sin(angle) let x3 = x3Old * Math.cos(angle) - y3Old * Math.sin(angle);
let y2 = x2Old * Math.sin(angle) + y2Old * Math.cos(angle) let y3 = x3Old * Math.sin(angle) + y3Old * Math.cos(angle);
let x3 = x3Old * Math.cos(angle) - y3Old * Math.sin(angle) let x4 = x4Old * Math.cos(angle) - y4Old * Math.sin(angle);
let y3 = x3Old * Math.sin(angle) + y3Old * Math.cos(angle) let y4 = x4Old * Math.sin(angle) + y4Old * Math.cos(angle);
let x4 = x4Old * Math.cos(angle) - y4Old * Math.sin(angle) let oldx1 = x1;
let y4 = x4Old * Math.sin(angle) + y4Old * Math.cos(angle) let oldy1 = y1;
let oldx1 = x1 x1 += centerX; // +x2/2
let oldy1 = y1 y1 += centerY; // +x2/2
x2 += x1;
y2 += y1;
x3 += x1;
y3 += y1;
x4 += x1;
y4 += y1;
ctx.beginPath();
ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x3, y3, x2, y2);
x1 += centerX// +x2/2 ctx.moveTo(x1, y1);
y1 += centerY// +x2/2 ctx.quadraticCurveTo(x4, y4, x2, y2);
x2 += x1 ctx.fillStyle = "black";
y2 += y1 ctx.fill();
x3 += x1
y3 += y1
x4 += x1
y4 += y1
ctx.beginPath()
ctx.moveTo(x1, y1)
ctx.quadraticCurveTo(x3, y3, x2, y2)
ctx.moveTo(x1, y1) ctx.lineWidth = 1;
ctx.quadraticCurveTo(x4, y4, x2, y2) ctx.beginPath();
ctx.fillStyle = 'black' ctx.moveTo(x1, y1);
ctx.fill() ctx.quadraticCurveTo(x3, y3, x2, y2);
ctx.lineWidth = 1 ctx.moveTo(x1, y1);
ctx.beginPath() ctx.quadraticCurveTo(x4, y4, x2, y2);
ctx.moveTo(x1, y1) ctx.strokeStyle = "orange";
ctx.quadraticCurveTo(x3, y3, x2, y2) ctx.stroke();
ctx.moveTo(x1, y1)
ctx.quadraticCurveTo(x4, y4, x2, y2)
ctx.strokeStyle = 'orange'
ctx.stroke()
} }
function drawEyelid2(x1, y1) { function drawEyelid2(x1, y1) {
x1 -= centerX x1 -= centerX;
y1 -= centerY y1 -= centerY;
let angle = Math.atan(y1 / x1); let angle = Math.atan(y1 / x1);
let localLeafCenterX = -(leafWidth * Math.cos(Math.PI - angle)) / 2 let localLeafCenterX = -(leafWidth * Math.cos(Math.PI - angle)) / 2;
let localLeafCenterY = (leafWidth * Math.sin(Math.PI - angle)) / 2 let localLeafCenterY = (leafWidth * Math.sin(Math.PI - angle)) / 2;
let x2 = x1 - (leafWidth * Math.cos(Math.PI - angle)); let x2 = x1 - leafWidth * Math.cos(Math.PI - angle);
let y2 = y1 + (leafWidth * Math.sin(Math.PI - angle)); let y2 = y1 + leafWidth * Math.sin(Math.PI - angle);
let alpha = Math.atan(leafHeight / (leafWidth / 2)) let alpha = Math.atan(leafHeight / (leafWidth / 2));
let x3 = x1 + localLeafCenterX + leafHeight * Math.sin(alpha); let x3 = x1 + localLeafCenterX + leafHeight * Math.sin(alpha);
let y3 = y1 + localLeafCenterY - leafHeight * Math.cos(alpha); let y3 = y1 + localLeafCenterY - leafHeight * Math.cos(alpha);
let x4 = x1 + localLeafCenterX - leafHeight * Math.sin(alpha); let x4 = x1 + localLeafCenterX - leafHeight * Math.sin(alpha);
let y4 = y1 + localLeafCenterY + leafHeight * Math.cos(alpha); let y4 = y1 + localLeafCenterY + leafHeight * Math.cos(alpha);
x1 += centerX x1 += centerX;
y1 += centerY y1 += centerY;
x2 += centerX x2 += centerX;
y2 += centerY y2 += centerY;
x3 += centerX x3 += centerX;
y3 += centerY y3 += centerY;
x4 += centerX x4 += centerX;
y4 += centerY y4 += centerY;
ctx.beginPath() ctx.beginPath();
ctx.moveTo(x1, y1) ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x3, y3, x2, y2) ctx.quadraticCurveTo(x3, y3, x2, y2);
ctx.moveTo(x1, y1) ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x4, y4, x2, y2) ctx.quadraticCurveTo(x4, y4, x2, y2);
ctx.fillStyle = 'black' ctx.fillStyle = "black";
ctx.fill() ctx.fill();
ctx.lineWidth = 1 ctx.lineWidth = 1;
ctx.beginPath() ctx.beginPath();
ctx.moveTo(x1, y1) ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x3, y3, x2, y2) ctx.quadraticCurveTo(x3, y3, x2, y2);
ctx.moveTo(x1, y1) ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x4, y4, x2, y2) ctx.quadraticCurveTo(x4, y4, x2, y2);
ctx.strokeStyle = 'orange' ctx.strokeStyle = "orange";
ctx.stroke() ctx.stroke();
} }
</script> </script>
</body> </body>
</html> </html>

3
docs/index.html
View File

@ -13,7 +13,10 @@
<select id="shape-selector"> <select id="shape-selector">
<option value="PolyTwistColourWidth">PolyTwistColourWidth</option> <option value="PolyTwistColourWidth">PolyTwistColourWidth</option>
<option value="FloralPhyllo">FloralPhyllo</option> <option value="FloralPhyllo">FloralPhyllo</option>
<option value="FloralPhyllo_Accident">FloralPhyllo_Accident</option>
<option value="Spiral1">Spiral1</option> <option value="Spiral1">Spiral1</option>
<option value="FloralAccident">FloralAccident</option>
<option value="Nodal_expanding">Nodal_expanding</option>
</select> </select>
<div id="custom"></div> <div id="custom"></div>
<br> <br>

78
docs/js/helper.js
View File

@ -26,6 +26,24 @@ async function fetchConfig(className) {
{ type: "range", min: 1, max: 600, defaultValue: 240, property: "width" }, { type: "range", min: 1, max: 600, defaultValue: 240, property: "width" },
{ type: "color", defaultValue: "#4287f5", property: "colour" }, { type: "color", defaultValue: "#4287f5", property: "colour" },
], ],
FloralAccident: [
{ type: "range", min: 1, max: 50, defaultValue: 20, property: "sides" },
{ type: "range", min: 1, max: 600, defaultValue: 240, property: "width" },
{ type: "color", defaultValue: "#4287f5", property: "colour" },
],
FloralPhyllo_Accident: [
{ type: "range", min: 1, max: 50, defaultValue: 20, property: "sides" },
{ type: "range", min: 1, max: 600, defaultValue: 240, property: "width" },
{ type: "color", defaultValue: "#2D81FC", property: "colour1" },
{ type: "color", defaultValue: "#FC0362", property: "colour2" },
],
Nodal_expanding: [
{ type: "range", min: 1, max: 100, defaultValue: 5, property: "expand" },
{ type: "range", min: 1, max: 100000, defaultValue: 100000, property: "points" },
{ type: "range", min: 1, max: 10, defaultValue: 3, property: "line_width" },
{ type: "color", defaultValue: "#2D81FC", property: "colour1" },
{ type: "color", defaultValue: "#FC0362", property: "colour2" },
],
}; };
return config[className]; return config[className];
} }
@ -110,6 +128,66 @@ function drawEyelid(width, x1, y1, colour) {
ctx.stroke(); ctx.stroke();
} }
function drawEyelidAccident(x1, y1) {
let leafWidth = 120;
let leafHeight = 60;
x1 -= centerX;
y1 -= centerY;
let angle = Math.atan(y1 / x1);
// if(angle >=Math.PI){
// angle -=Math.PI
// console.log("greater called")
// }
angle = Math.abs(angle);
let x2Old = 0 + leafWidth;
let y2Old = 0;
let x3Old = 0 + leafWidth / 2;
let y3Old = 0 + leafHeight / 2;
let x4Old = 0 + leafWidth / 2;
let y4Old = 0 - leafHeight / 2;
let x2 = x2Old * Math.cos(angle) - y2Old * Math.sin(angle);
let y2 = x2Old * Math.sin(angle) + y2Old * Math.cos(angle);
let x3 = x3Old * Math.cos(angle) - y3Old * Math.sin(angle);
let y3 = x3Old * Math.sin(angle) + y3Old * Math.cos(angle);
let x4 = x4Old * Math.cos(angle) - y4Old * Math.sin(angle);
let y4 = x4Old * Math.sin(angle) + y4Old * Math.cos(angle);
let oldx1 = x1;
let oldy1 = y1;
x1 += centerX; // +x2/2
y1 += centerY; // +x2/2
x2 += x1;
y2 += y1;
x3 += x1;
y3 += y1;
x4 += x1;
y4 += y1;
ctx.beginPath();
ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x3, y3, x2, y2);
ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x4, y4, x2, y2);
ctx.fillStyle = "black";
ctx.fill();
ctx.lineWidth = 1;
ctx.beginPath();
ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x3, y3, x2, y2);
ctx.moveTo(x1, y1);
ctx.quadraticCurveTo(x4, y4, x2, y2);
ctx.strokeStyle = "orange";
ctx.stroke();
}
function DrawPolygon(sides, width, rotation, colour) { function DrawPolygon(sides, width, rotation, colour) {
ctx.beginPath(); ctx.beginPath();
ctx.moveTo( ctx.moveTo(

3
docs/js/index.js
View File

@ -21,6 +21,9 @@ function createInstance(className, args) {
PolyTwistColourWidth: PolyTwistColourWidth, PolyTwistColourWidth: PolyTwistColourWidth,
FloralPhyllo: FloralPhyllo, FloralPhyllo: FloralPhyllo,
Spiral1: Spiral1, Spiral1: Spiral1,
FloralAccident: FloralAccident,
FloralPhyllo_Accident: FloralPhyllo_Accident,
Nodal_expanding: Nodal_expanding,
// Add more class constructors here as needed // Add more class constructors here as needed
}; };

97
docs/js/objects.js
View File

@ -120,3 +120,100 @@ class Spiral1 extends BaseShape {
} }
} }
class FloralAccident extends BaseShape {
constructor(sides,width, colour) {
super();
this.sides = sides;
this.width = width;
this.colour = colour;
}
draw(rotation) {
var rot = Math.round((this.sides - 2) * 180 / this.sides * 2)
var piv = 360 / this.sides;
var stt = 0.5 * Math.PI - rad(rot) //+ rad(rotation);
var end = 0;
var n = this.width / ((this.width / 10) * (this.width / 10)) //pixel correction for mid leaf
for (let i = 1; i < this.sides + 1; i++) {
end = stt + rad(rot);
ctx.beginPath();
ctx.arc(centerX + Math.cos(rad(90 + piv * i + rotation)) * this.width, centerY + Math.sin(rad(90 + piv * i + rotation)) * this.width, this.width, stt - (stt - end + rad(rotation)) / 2, end + rad(n), 0);
ctx.strokeStyle = this.colour;
ctx.stroke();
ctx.beginPath();
ctx.arc(centerX + Math.cos(rad(90 + piv * i - rotation)) * this.width, centerY + Math.sin(rad(90 + piv * i - rotation)) * this.width, this.width, stt, end - (end - stt - rad(rotation)) / 2 + rad(n), 0);
ctx.strokeStyle = this.colour;
ctx.stroke();
stt = end + -(rad(rot - piv)) //+rad(30);
}
}
}
class FloralPhyllo_Accident extends BaseShape {
constructor(sides,width, colour1,colour2) {
super();
this.sides = sides;
this.width = width;
this.colour1 = colour1;
this.colour2 = colour2;
}
draw(angle) {
var c = 24; //something to do with width. but not width
for (let n = 0; n < 300; n += 1) {
let ncolour = LerpHex(this.colour1, this.colour2, Math.cos(rad(n / 2)));
let a = n * (angle/1000+100); //137.5;
let r = c * Math.sqrt(n);
let x = r * Math.cos(a) + centerX;
let y = r * Math.sin(a) + centerY;
drawEyelidAccident(x, y);
}
}
}
class Nodal_expanding extends BaseShape {
constructor(expand,points,line_width,colour1,colour2) {
super();
this.expand = expand;
this.points = points;
this.line_width = line_width;
this.colour1 = colour1;
this.colour2 = colour2;
}
draw(step) {
let colour_change = 0.5
var angle = 360 / this.points * step
var start_angle = angle;
var done = false;
var total_moves = 1;
var length = this.expand;
for (let z = 1; z <= 100; z++) { //why specifically 2500
ctx.beginPath();
let ncolour = LerpHex(this.colour1, this.colour2, Math.cos(rad(z * colour_change)));
ctx.moveTo(centerX + (Math.cos(rad(angle * (z - 1) + 0)) * (length - this.expand)), centerY + (Math.sin(rad(angle * (z - 1) + 0)) * (length - this.expand)));
ctx.lineTo(centerX + (Math.cos(rad(angle * z + 0)) * length), centerY + (Math.sin(rad(angle * z + 0)) * length));
length += this.expand;
ctx.lineWidth = this.line_width;//try 1
ctx.strokeStyle = ncolour;
// ctx.strokeStyle = colourToText(ncolour);
console.log(ncolour)
ctx.stroke();
}
}
}