From b3d9aa079a9e1cef3342837c0621e0024a30305f Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 5 Jun 2019 08:21:45 -0300 Subject: [PATCH 1/3] To radians function + Added toRadians function in Boilerplate.js + Added a demo for the function + Added new dist using makefile script --- demos/degrees-radians/degrees-radians.js | 74 ++++++++++++++++++++++++ demos/degrees-radians/index.html | 44 ++++++++++++++ demos/fullscreen/fullscreen.js | 2 +- dist/zdog.dist.js | 4 ++ js/boilerplate.js | 4 ++ 5 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 demos/degrees-radians/degrees-radians.js create mode 100644 demos/degrees-radians/index.html diff --git a/demos/degrees-radians/degrees-radians.js b/demos/degrees-radians/degrees-radians.js new file mode 100644 index 0000000..2da76dd --- /dev/null +++ b/demos/degrees-radians/degrees-radians.js @@ -0,0 +1,74 @@ +// ----- setup ----- // + +var isSpinning = true; +var eggplant = '#636'; +var garnet = '#C25'; +var orange = '#E62'; +var gold = '#EA0'; + +var illo = new Zdog.Illustration({ + element: '.illo', + zoom: 4, + resize: 'fullscreen', + dragRotate: true, + onDragStart: function() { + isSpinning = false; + }, + onResize: function( width, height ) { + this.zoom = Math.min( width, height ) / 50; + }, +}); + +// ----- model ----- // + +new Zdog.Ellipse({ + diameter: 16, + addTo: illo, + translate: { z: 10 }, + stroke: 4, + color: eggplant, +}); + +new Zdog.Rect({ + width: 5, + height: 5, + addTo: illo, + stroke: 3, + color: garnet, +}); + +new Zdog.Rect({ + width: 2, + height: 2, + addTo: illo, + stroke: 2, + translate:{ + z: -5, + }, + color: orange, +}); + +new Zdog.Rect({ + width: 1, + height: 1, + addTo: illo, + stroke: 1, + translate:{ + z: -8, + }, + color: gold, +}); + + +// ----- animate -----a // + +function animate() { + // Spinning 5 degrees on both axis + illo.rotate.y += isSpinning ? Zdog.toRadians(5) : 0; + illo.rotate.x += isSpinning ? Zdog.toRadians(5) : 0; + illo.updateRenderGraph(); + requestAnimationFrame( animate ); +} + +animate(); + diff --git a/demos/degrees-radians/index.html b/demos/degrees-radians/index.html new file mode 100644 index 0000000..927da8c --- /dev/null +++ b/demos/degrees-radians/index.html @@ -0,0 +1,44 @@ + + + + + + + fullscreen + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/fullscreen/fullscreen.js b/demos/fullscreen/fullscreen.js index 93ed064..2cca4f1 100644 --- a/demos/fullscreen/fullscreen.js +++ b/demos/fullscreen/fullscreen.js @@ -58,7 +58,7 @@ new Zdog.Shape({ color: orange, }); -// ----- animate ----- // +// ----- animate -----a // function animate() { illo.rotate.y += isSpinning ? 0.03 : 0; diff --git a/dist/zdog.dist.js b/dist/zdog.dist.js index b9fefbf..cc891a6 100644 --- a/dist/zdog.dist.js +++ b/dist/zdog.dist.js @@ -25,6 +25,10 @@ var Zdog = {}; Zdog.TAU = Math.PI * 2; +Zdog.toRadians = function(degrees) { + return (Math.PI * degrees) / 180; +}; + Zdog.extend = function( a, b ) { for ( var prop in b ) { a[ prop ] = b[ prop ]; diff --git a/js/boilerplate.js b/js/boilerplate.js index a22ddc9..d1bb37d 100644 --- a/js/boilerplate.js +++ b/js/boilerplate.js @@ -25,6 +25,10 @@ var Zdog = {}; Zdog.TAU = Math.PI * 2; +Zdog.toRadians = function(degrees) { + return (Math.PI * degrees) / 180; +}; + Zdog.extend = function( a, b ) { for ( var prop in b ) { a[ prop ] = b[ prop ]; From b258e8263d10c1edac5712a6b23bb53e7b3f88f9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 5 Jun 2019 08:46:59 -0300 Subject: [PATCH 2/3] Removed typo from comment --- demos/degrees-radians/degrees-radians.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/degrees-radians/degrees-radians.js b/demos/degrees-radians/degrees-radians.js index 2da76dd..aa462ce 100644 --- a/demos/degrees-radians/degrees-radians.js +++ b/demos/degrees-radians/degrees-radians.js @@ -60,7 +60,7 @@ new Zdog.Rect({ }); -// ----- animate -----a // +// ----- animate ----- // function animate() { // Spinning 5 degrees on both axis From 74619ce514c32f468ab3fc33a2a53944bf1ba410 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 5 Jun 2019 08:48:16 -0300 Subject: [PATCH 3/3] Removed same typo from comment in another file --- demos/fullscreen/fullscreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/fullscreen/fullscreen.js b/demos/fullscreen/fullscreen.js index 2cca4f1..93ed064 100644 --- a/demos/fullscreen/fullscreen.js +++ b/demos/fullscreen/fullscreen.js @@ -58,7 +58,7 @@ new Zdog.Shape({ color: orange, }); -// ----- animate -----a // +// ----- animate ----- // function animate() { illo.rotate.y += isSpinning ? 0.03 : 0;