litecanvas 0.93.2 → 0.94.1

package/dist/dist.dev.js

@@ -32,7 +32,7 @@
   };
 
   // src/version.js
-  var version = "0.93.2";
+  var version = "0.94.1";
 
   // src/index.js
   function litecanvas(settings = {}) {
@@ -52,7 +52,7 @@
       animate: true
     };
     settings = Object.assign(defaults, settings);
-    let _initialized = false, _plugins = [], _canvas, _scale = 1, _ctx, _outline_fix = 0.5, _timeScale = 1, _lastFrameTime, _deltaTime = 1 / 60, _accumulated, _rafid, _fontFamily = "sans-serif", _fontSize = 20, _rngSeed = Date.now(), _colors = defaultPalette, _defaultSound = [0.5, 0, 1750, , , 0.3, 1, , , , 600, 0.1], _coreEvents = "init,update,draw,tap,untap,tapping,tapped,resized", _mathFunctions = "PI,sin,cos,atan2,hypot,tan,abs,ceil,floor,trunc,min,max,pow,sqrt,sign,exp", _eventListeners = {};
+    let _initialized = false, _plugins = [], _canvas, _scale = 1, _ctx, _outline_fix = 0.5, _timeScale = 1, _lastFrameTime, _fpsInterval = 1e3 / 60, _accumulated, _rafid, _fontFamily = "sans-serif", _fontSize = 20, _rngSeed = Date.now(), _colors = defaultPalette, _defaultSound = [0.5, 0, 1750, , , 0.3, 1, , , , 600, 0.1], _coreEvents = "init,update,draw,tap,untap,tapping,tapped,resized", _mathFunctions = "PI,sin,cos,atan2,hypot,tan,abs,ceil,floor,trunc,min,max,pow,sqrt,sign,exp", _eventListeners = {};
     const instance = {
       /** @type {number} */
       W: 0,
@@ -958,7 +958,7 @@
           isNumber(value) && value >= 1,
           "[litecanvas] framerate() 1st param must be a positive number"
         );
-        _deltaTime = 1 / ~~value;
+        _fpsInterval = 1e3 / ~~value;
       },
       /**
        * Returns information about that engine instance.
@@ -974,7 +974,7 @@
           // 1
           _initialized,
           // 2
-          _deltaTime,
+          _fpsInterval / 1e3,
           // 3
           _scale,
           // 4
@@ -1028,8 +1028,8 @@
        */
       resume() {
         if (_initialized && !_rafid) {
-          _accumulated = _deltaTime;
-          _lastFrameTime = performance.now();
+          _accumulated = _fpsInterval;
+          _lastFrameTime = Date.now();
           _rafid = raf(drawFrame);
         }
       },
@@ -1085,7 +1085,7 @@
               // initial y
               yi: y,
               // timestamp
-              t: performance.now()
+              t: Date.now()
             };
             _taps.set(id, tap);
             return tap;
@@ -1105,7 +1105,7 @@
           /**
            * @param {{t: number}} tap
            */
-          (tap) => tap && performance.now() - tap.t <= 300
+          (tap) => tap && Date.now() - tap.t <= 300
         ), preventDefault = (
           /**
            * @param {Event} ev
@@ -1278,37 +1278,36 @@
           }
         );
       }
-      setInterval(() => {
-        if (_rafid) {
-          instance.pause();
-          instance.resume();
-        }
-      }, 5e3);
       _initialized = true;
       instance.emit("init", instance);
       instance.resume();
     }
-    function drawFrame(now) {
+    function drawFrame() {
       if (!settings.animate) {
-        return instance.emit("draw");
-      } else if (_rafid) {
-        _rafid = raf(drawFrame);
+        return instance.emit("draw", _ctx);
       }
+      let now = Date.now();
       let updated = 0;
-      let frameTime = (now - _lastFrameTime) / 1e3;
+      let frameTime = now - _lastFrameTime;
       _lastFrameTime = now;
-      if (frameTime < 0.1) {
-        _accumulated += frameTime;
-        while (_accumulated >= _deltaTime) {
-          updated++;
-          instance.emit("update", _deltaTime * _timeScale, updated);
-          instance.def("T", instance.T + _deltaTime * _timeScale);
-          _accumulated -= _deltaTime;
-        }
+      _accumulated += frameTime < 100 ? frameTime : _fpsInterval;
+      while (_accumulated >= _fpsInterval) {
+        updated++;
+        _accumulated -= _fpsInterval;
+        let dt = _fpsInterval / 1e3 * _timeScale;
+        instance.emit("update", dt, updated);
+        instance.def("T", instance.T + dt);
       }
       if (updated) {
-        instance.emit("draw");
+        instance.emit("draw", _ctx);
+        if (updated > 1) {
+          _accumulated = 0;
+          DEV: console.warn(
+            "[litecanvas] the last frame updated " + updated + " times. This can drop the FPS if it keeps happening."
+          );
+        }
       }
+      _rafid = raf(drawFrame);
     }
     function setupCanvas() {
       if ("string" === typeof settings.canvas) {
@@ -1369,7 +1368,6 @@
       }
       instance.textalign("start", "top");
       instance.emit("resized", _scale);
-      instance.cls(0);
       if (!settings.animate) {
         raf(drawFrame);
       }

package/dist/dist.js

@@ -44,7 +44,7 @@
       animate: true
     };
     settings = Object.assign(defaults, settings);
-    let _initialized = false, _plugins = [], _canvas, _scale = 1, _ctx, _outline_fix = 0.5, _timeScale = 1, _lastFrameTime, _deltaTime = 1 / 60, _accumulated, _rafid, _fontFamily = "sans-serif", _fontSize = 20, _rngSeed = Date.now(), _colors = defaultPalette, _defaultSound = [0.5, 0, 1750, , , 0.3, 1, , , , 600, 0.1], _coreEvents = "init,update,draw,tap,untap,tapping,tapped,resized", _mathFunctions = "PI,sin,cos,atan2,hypot,tan,abs,ceil,floor,trunc,min,max,pow,sqrt,sign,exp", _eventListeners = {};
+    let _initialized = false, _plugins = [], _canvas, _scale = 1, _ctx, _outline_fix = 0.5, _timeScale = 1, _lastFrameTime, _fpsInterval = 1e3 / 60, _accumulated, _rafid, _fontFamily = "sans-serif", _fontSize = 20, _rngSeed = Date.now(), _colors = defaultPalette, _defaultSound = [0.5, 0, 1750, , , 0.3, 1, , , , 600, 0.1], _coreEvents = "init,update,draw,tap,untap,tapping,tapped,resized", _mathFunctions = "PI,sin,cos,atan2,hypot,tan,abs,ceil,floor,trunc,min,max,pow,sqrt,sign,exp", _eventListeners = {};
     const instance = {
       /** @type {number} */
       W: 0,
@@ -663,7 +663,7 @@
        * @param {number} value
        */
       framerate(value) {
-        _deltaTime = 1 / ~~value;
+        _fpsInterval = 1e3 / ~~value;
       },
       /**
        * Returns information about that engine instance.
@@ -678,7 +678,7 @@
           // 1
           _initialized,
           // 2
-          _deltaTime,
+          _fpsInterval / 1e3,
           // 3
           _scale,
           // 4
@@ -732,8 +732,8 @@
        */
       resume() {
         if (_initialized && !_rafid) {
-          _accumulated = _deltaTime;
-          _lastFrameTime = performance.now();
+          _accumulated = _fpsInterval;
+          _lastFrameTime = Date.now();
           _rafid = raf(drawFrame);
         }
       },
@@ -786,7 +786,7 @@
               // initial y
               yi: y,
               // timestamp
-              t: performance.now()
+              t: Date.now()
             };
             _taps.set(id, tap);
             return tap;
@@ -806,7 +806,7 @@
           /**
            * @param {{t: number}} tap
            */
-          (tap) => tap && performance.now() - tap.t <= 300
+          (tap) => tap && Date.now() - tap.t <= 300
         ), preventDefault = (
           /**
            * @param {Event} ev
@@ -971,37 +971,33 @@
           }
         );
       }
-      setInterval(() => {
-        if (_rafid) {
-          instance.pause();
-          instance.resume();
-        }
-      }, 5e3);
       _initialized = true;
       instance.emit("init", instance);
       instance.resume();
     }
-    function drawFrame(now) {
+    function drawFrame() {
       if (!settings.animate) {
-        return instance.emit("draw");
-      } else if (_rafid) {
-        _rafid = raf(drawFrame);
+        return instance.emit("draw", _ctx);
       }
+      let now = Date.now();
       let updated = 0;
-      let frameTime = (now - _lastFrameTime) / 1e3;
+      let frameTime = now - _lastFrameTime;
       _lastFrameTime = now;
-      if (frameTime < 0.1) {
-        _accumulated += frameTime;
-        while (_accumulated >= _deltaTime) {
-          updated++;
-          instance.emit("update", _deltaTime * _timeScale, updated);
-          instance.def("T", instance.T + _deltaTime * _timeScale);
-          _accumulated -= _deltaTime;
-        }
+      _accumulated += frameTime < 100 ? frameTime : _fpsInterval;
+      while (_accumulated >= _fpsInterval) {
+        updated++;
+        _accumulated -= _fpsInterval;
+        let dt = _fpsInterval / 1e3 * _timeScale;
+        instance.emit("update", dt, updated);
+        instance.def("T", instance.T + dt);
       }
       if (updated) {
-        instance.emit("draw");
+        instance.emit("draw", _ctx);
+        if (updated > 1) {
+          _accumulated = 0;
+        }
       }
+      _rafid = raf(drawFrame);
     }
     function setupCanvas() {
       if ("string" === typeof settings.canvas) {
@@ -1042,7 +1038,6 @@
       }
       instance.textalign("start", "top");
       instance.emit("resized", _scale);
-      instance.cls(0);
       if (!settings.animate) {
         raf(drawFrame);
       }

package/dist/dist.min.js

@@ -1 +1 @@
-(()=>{var e=["#111","#6a7799","#aec2c2","#FFF1E8","#e83b3b","#fabc20","#155fd9","#3cbcfc","#327345","#63c64d","#6c2c1f","#ac7c00"];globalThis.litecanvas=function(t={}){let a=window,i=Math,l=2*i.PI,n=requestAnimationFrame,o=[],r=(e,t,a)=>{e.addEventListener(t,a,!1),o.push(()=>e.removeEventListener(t,a,!1))},s=e=>e.beginPath(),f=(e=>{let t=new AudioContext;return e.zzfxV=1,(a=1,i=.05,l=220,n=0,o=0,r=.1,s=0,f=1,c=0,d=0,u=0,p=0,m=0,h=0,g=0,w=0,v=0,x=1,y=0,b=0,k=0)=>{let E=Math,z=2*E.PI,I=c*=500*z/44100/44100,T=l*=(1-i+2*i*E.random(i=[]))*z/44100,C=0,A=0,L=0,S=1,M=0,N=0,P=0,D=k<0?-1:1,F=z*D*k*2/44100,q=E.cos(F),B=E.sin,H=B(F)/4,O=1+H,V=-2*q/O,W=(1-H)/O,R=(1+D*q)/2/O,G=-(D+q)/O,X=0,Y=0,$=0,j=0;for(n=44100*n+9,y*=44100,o*=44100,r*=44100,v*=44100,d*=500*z/85766121e6,g*=z/44100,u*=z/44100,p*=44100,m=44100*m|0,a*=.3*e.zzfxV,D=n+y+o+r+v|0;L<D;i[L++]=P*a)++N%(100*w|0)||(P=s?1<s?2<s?3<s?B(C*C):E.max(E.min(E.tan(C),1),-1):1-(2*C/z%2+2)%2:1-4*E.abs(E.round(C/z)-C/z):B(C),P=(m?1-b+b*B(z*L/m):1)*(P<0?-1:1)*E.abs(P)**f*(L<n?L/n:L<n+y?1-(L-n)/y*(1-x):L<n+y+o?x:L<D-v?(D-L-v)/r*x:0),P=v?P/2+(v>L?0:(L<D-v?1:(D-L)/v)*i[L-v|0]/2/a):P,k&&(P=j=R*X+G*(X=Y)+R*(Y=P)-W*$-V*($=j))),C+=(F=(l+=c+=d)*E.cos(g*A++))+F*h*B(L**5),S&&++S>p&&(l+=u,T+=u,S=0),!m||++M%m||(l=T,c=I,S=S||1);(a=t.createBuffer(1,D,44100)).getChannelData(0).set(i),(l=t.createBufferSource()).buffer=a,l.connect(t.destination),l.start()}})(a);t=Object.assign({width:null,height:null,autoscale:!0,pixelart:!1,canvas:null,global:!0,loop:null,tapEvents:!0,keyboardEvents:!0,animate:!0},t);let c=!1,d=[],u,p=1,m,h=.5,g=1,w,v=1/60,x,y,b="sans-serif",k=20,E=Date.now(),z=e,I=[.5,0,1750,,,.3,1,,,,600,.1],T={},C={W:0,H:0,T:0,MX:-1,MY:-1,TWO_PI:l,HALF_PI:l/4,lerp:(e,t,a)=>a*(t-e)+e,deg2rad:e=>i.PI/180*e,rad2deg:e=>180/i.PI*e,round:(e,t=0)=>{if(!t)return i.round(e);let a=10**t;return i.round(e*a)/a},clamp:(e,t,a)=>e<t?t:e>a?a:e,wrap:(e,t,a)=>e-(a-t)*i.floor((e-t)/(a-t)),map(e,t,a,i,l,n){let o=(e-t)/(a-t)*(l-i)+i;return n?C.clamp(o,i,l):o},norm:(e,t,a)=>C.map(e,t,a,0,1),wave:(e,t,a,i=Math.sin)=>e+(i(a)+1)/2*(t-e),rand:(e=0,t=1)=>(E=(1664525*E+0x3c6ef35f)%0x100000000)/0x100000000*(t-e)+e,randi:(e=0,t=1)=>i.floor(C.rand(e,t+1)),rseed(e){E=~~e},cls(e){null==e?m.clearRect(0,0,m.canvas.width,m.canvas.height):C.rectfill(0,0,m.canvas.width,m.canvas.height,e)},rect(e,t,a,i,l,n){s(m),m[n?"roundRect":"rect"](~~e-h,~~t-h,~~a+2*h,~~i+2*h,n),C.stroke(l)},rectfill(e,t,a,i,l,n){s(m),m[n?"roundRect":"rect"](~~e,~~t,~~a,~~i,n),C.fill(l)},circ(e,t,a,i){s(m),m.arc(~~e,~~t,~~a,0,l),C.stroke(i)},circfill(e,t,a,i){s(m),m.arc(~~e,~~t,~~a,0,l),C.fill(i)},oval(e,t,a,i,n){s(m),m.ellipse(~~e,~~t,~~a,~~i,0,0,l),C.stroke(n)},ovalfill(e,t,a,i,n){s(m),m.ellipse(~~e,~~t,~~a,~~i,0,0,l),C.fill(n)},line(e,t,a,i,l){s(m);let n=.5*(0!==h&&~~e==~~a),o=.5*(0!==h&&~~t==~~i);m.moveTo(~~e+n,~~t+o),m.lineTo(~~a+n,~~i+o),C.stroke(l)},linewidth(e){m.lineWidth=~~e,h=.5*(0!=~~e%2)},linedash(e,t=0){m.setLineDash(e),m.lineDashOffset=t},text(e,t,a,i=3,l="normal"){m.font=`${l} ${k}px ${b}`,m.fillStyle=z[~~i%z.length],m.fillText(a,~~e,~~t)},textfont(e){b=e},textsize(e){k=e},textalign(e,t){e&&(m.textAlign=e),t&&(m.textBaseline=t)},image(e,t,a){m.drawImage(a,~~e,~~t)},paint(e,t,a,i={}){let l=i.canvas||new OffscreenCanvas(1,1),n=i.scale||1,o=m;if(l.width=e*n,l.height=t*n,(m=l.getContext("2d")).scale(n,n),Array.isArray(a)){let e=0,t=0;for(let i of(m.imageSmoothingEnabled=!1,a)){for(let a of i)" "!==a&&"."!==a&&C.rectfill(e,t,1,1,parseInt(a,16)),e++;t++,e=0}}else a(m);return m=o,l.transferToImageBitmap()},ctx:e=>(e&&(m=e),m),push:()=>m.save(),pop:()=>m.restore(),translate:(e,t)=>m.translate(~~e,~~t),scale:(e,t)=>m.scale(e,t||e),rotate:e=>m.rotate(e),alpha(e){m.globalAlpha=C.clamp(e,0,1)},fill(e){m.fillStyle=z[~~e%z.length],m.fill()},stroke(e){m.strokeStyle=z[~~e%z.length],m.stroke()},clip(e){s(m),e(m),m.clip()},sfx:(e,t=0,i=1)=>!!a.zzfxV&&(!navigator.userActivation||!!navigator.userActivation.hasBeenActive)&&(e=e||I,(0!==t||1!==i)&&((e=e.slice())[0]=i*(e[0]||1),e[10]=~~e[10]+t),f.apply(0,e),e),volume(e){a.zzfxV=e},canvas:()=>u,use(e,t={}){c?N(e,t):d.push([e,t])},listen:(e,t)=>(T[e=e.toLowerCase()]=T[e]||new Set,T[e].add(t),()=>T&&T[e].delete(t)),emit(e,t,a,i,l){c&&(M("before:"+(e=e.toLowerCase()),t,a,i,l),M(e,t,a,i,l),M("after:"+e,t,a,i,l))},pal(t=e){z=t},def(e,i){C[e]=i,t.global&&(a[e]=i)},timescale(e){g=e},framerate(e){v=1/~~e},stat(e){let i={index:e,value:[t,c,v,p,T,z,I,g,a.zzfxV,E,k,b][e]};return C.emit("stat",i),i.value},quit(){for(let e of(C.pause(),C.emit("quit"),T={},o))e();if(t.global){for(let e in C)delete a[e];delete a.ENGINE}c=!1},pause(){cancelAnimationFrame(y),y=0},resume(){c&&!y&&(x=v,w=performance.now(),y=n(L))},paused:()=>!y};for(let e of"PI,sin,cos,atan2,hypot,tan,abs,ceil,floor,trunc,min,max,pow,sqrt,sign,exp".split(","))C[e]=i[e];function A(){let e=t.loop?t.loop:a;for(let t of"init,update,draw,tap,untap,tapping,tapped,resized".split(","))e[t]&&C.listen(t,e[t]);for(let[e,t]of d)N(e,t);if(t.autoscale&&r(a,"resize",S),t.tapEvents){let e=e=>[(e.pageX-u.offsetLeft)/p,(e.pageY-u.offsetTop)/p],t=new Map,i=(e,a,i)=>{let l={x:a,y:i,xi:a,yi:i,t:performance.now()};return t.set(e,l),l},l=(e,a,l)=>{let n=t.get(e)||i(e);n.x=a,n.y=l},n=e=>e&&performance.now()-e.t<=300,o=e=>e.preventDefault(),s=!1;r(u,"mousedown",t=>{if(0===t.button){o(t);let[a,l]=e(t);C.emit("tap",a,l,0),i(0,a,l),s=!0}}),r(u,"mouseup",a=>{if(0===a.button){o(a);let i=t.get(0),[l,r]=e(a);n(i)&&C.emit("tapped",i.xi,i.yi,0),C.emit("untap",l,r,0),t.delete(0),s=!1}}),r(a,"mousemove",t=>{o(t);let[a,i]=e(t);C.def("MX",a),C.def("MY",i),s&&(C.emit("tapping",a,i,0),l(0,a,i))}),r(u,"touchstart",t=>{for(let a of(o(t),t.changedTouches)){let[t,l]=e(a);C.emit("tap",t,l,a.identifier+1),i(a.identifier+1,t,l)}}),r(u,"touchmove",t=>{for(let a of(o(t),t.changedTouches)){let[t,i]=e(a);C.emit("tapping",t,i,a.identifier+1),l(a.identifier+1,t,i)}});let f=e=>{o(e);let a=[];if(e.targetTouches.length>0)for(let t of e.targetTouches)a.push(t.identifier+1);for(let[e,i]of t)a.includes(e)||(n(i)&&C.emit("tapped",i.xi,i.yi,e),C.emit("untap",i.x,i.y,e),t.delete(e))};r(u,"touchend",f),r(u,"touchcancel",f),r(a,"blur",()=>{for(let[e,a]of(s=!1,t))C.emit("untap",a.x,a.y,e),t.delete(e)})}if(t.keyboardEvents){let e=new Set,t=new Set,i=(e,t="")=>(t=t.toLowerCase())?e.has("space"===t?" ":t):e.size>0;r(a,"keydown",a=>{let i=a.key.toLowerCase();e.has(i)||(e.add(i),t.add(i))}),r(a,"keyup",t=>{e.delete(t.key.toLowerCase())}),r(a,"blur",()=>e.clear()),C.listen("after:update",()=>t.clear()),C.def("iskeydown",t=>i(e,t)),C.def("iskeypressed",e=>i(t,e))}setInterval(()=>{y&&(C.pause(),C.resume())},5e3),c=!0,C.emit("init",C),C.resume()}function L(e){if(!t.animate)return C.emit("draw");y&&(y=n(L));let a=0,i=(e-w)/1e3;if(w=e,i<.1)for(x+=i;x>=v;)a++,C.emit("update",v*g,a),C.def("T",C.T+v*g),x-=v;a&&C.emit("draw")}function S(){let e=t.width>0?t.width:innerWidth,a=t.width>0?t.height||t.width:innerHeight;if(C.def("W",e),C.def("H",a),u.width=e,u.height=a,t.autoscale){let l=+t.autoscale;u.style.display||(u.style.display="block",u.style.margin="auto"),p=i.min(innerWidth/e,innerHeight/a),p=l>1&&p>l?l:p,u.style.width=e*p+"px",u.style.height=a*p+"px"}t.pixelart&&(m.imageSmoothingEnabled=!1,u.style.imageRendering="pixelated"),C.textalign("start","top"),C.emit("resized",p),C.cls(0),t.animate||n(L)}function M(e,t,a,i,l){if(T[e])for(let n of T[e])n(t,a,i,l)}function N(e,t){let a=e(C,t);for(let e in a)C.def(e,a[e])}if(t.global){if(a.ENGINE)throw Error("only one global litecanvas is allowed");Object.assign(a,C),a.ENGINE=C}return m=(u=(u="string"==typeof t.canvas?document.querySelector(t.canvas):t.canvas)||document.createElement("canvas")).getContext("2d"),r(u,"click",()=>focus()),u.style="",S(),u.parentNode||document.body.appendChild(u),u.oncontextmenu=()=>!1,"loading"===document.readyState?r(a,"DOMContentLoaded",()=>n(A)):n(A),C}})();
+(()=>{var e=["#111","#6a7799","#aec2c2","#FFF1E8","#e83b3b","#fabc20","#155fd9","#3cbcfc","#327345","#63c64d","#6c2c1f","#ac7c00"];globalThis.litecanvas=function(t={}){let a=window,i=Math,l=2*i.PI,n=requestAnimationFrame,o=[],r=(e,t,a)=>{e.addEventListener(t,a,!1),o.push(()=>e.removeEventListener(t,a,!1))},s=e=>e.beginPath(),f=(e=>{let t=new AudioContext;return e.zzfxV=1,(a=1,i=.05,l=220,n=0,o=0,r=.1,s=0,f=1,c=0,d=0,u=0,p=0,h=0,m=0,g=0,w=0,v=0,x=1,y=0,b=0,k=0)=>{let E=Math,z=2*E.PI,T=c*=500*z/44100/44100,C=l*=(1-i+2*i*E.random(i=[]))*z/44100,I=0,A=0,L=0,S=1,D=0,M=0,N=0,P=k<0?-1:1,F=z*P*k*2/44100,q=E.cos(F),B=E.sin,H=B(F)/4,O=1+H,V=-2*q/O,W=(1-H)/O,R=(1+P*q)/2/O,G=-(P+q)/O,X=0,Y=0,$=0,j=0;for(n=44100*n+9,y*=44100,o*=44100,r*=44100,v*=44100,d*=500*z/85766121e6,g*=z/44100,u*=z/44100,p*=44100,h=44100*h|0,a*=.3*e.zzfxV,P=n+y+o+r+v|0;L<P;i[L++]=N*a)++M%(100*w|0)||(N=s?1<s?2<s?3<s?B(I*I):E.max(E.min(E.tan(I),1),-1):1-(2*I/z%2+2)%2:1-4*E.abs(E.round(I/z)-I/z):B(I),N=(h?1-b+b*B(z*L/h):1)*(N<0?-1:1)*E.abs(N)**f*(L<n?L/n:L<n+y?1-(L-n)/y*(1-x):L<n+y+o?x:L<P-v?(P-L-v)/r*x:0),N=v?N/2+(v>L?0:(L<P-v?1:(P-L)/v)*i[L-v|0]/2/a):N,k&&(N=j=R*X+G*(X=Y)+R*(Y=N)-W*$-V*($=j))),I+=(F=(l+=c+=d)*E.cos(g*A++))+F*m*B(L**5),S&&++S>p&&(l+=u,C+=u,S=0),!h||++D%h||(l=C,c=T,S=S||1);(a=t.createBuffer(1,P,44100)).getChannelData(0).set(i),(l=t.createBufferSource()).buffer=a,l.connect(t.destination),l.start()}})(a);t=Object.assign({width:null,height:null,autoscale:!0,pixelart:!1,canvas:null,global:!0,loop:null,tapEvents:!0,keyboardEvents:!0,animate:!0},t);let c=!1,d=[],u,p=1,h,m=.5,g=1,w,v=1e3/60,x,y,b="sans-serif",k=20,E=Date.now(),z=e,T=[.5,0,1750,,,.3,1,,,,600,.1],C={},I={W:0,H:0,T:0,MX:-1,MY:-1,TWO_PI:l,HALF_PI:l/4,lerp:(e,t,a)=>a*(t-e)+e,deg2rad:e=>i.PI/180*e,rad2deg:e=>180/i.PI*e,round:(e,t=0)=>{if(!t)return i.round(e);let a=10**t;return i.round(e*a)/a},clamp:(e,t,a)=>e<t?t:e>a?a:e,wrap:(e,t,a)=>e-(a-t)*i.floor((e-t)/(a-t)),map(e,t,a,i,l,n){let o=(e-t)/(a-t)*(l-i)+i;return n?I.clamp(o,i,l):o},norm:(e,t,a)=>I.map(e,t,a,0,1),wave:(e,t,a,i=Math.sin)=>e+(i(a)+1)/2*(t-e),rand:(e=0,t=1)=>(E=(1664525*E+0x3c6ef35f)%0x100000000)/0x100000000*(t-e)+e,randi:(e=0,t=1)=>i.floor(I.rand(e,t+1)),rseed(e){E=~~e},cls(e){null==e?h.clearRect(0,0,h.canvas.width,h.canvas.height):I.rectfill(0,0,h.canvas.width,h.canvas.height,e)},rect(e,t,a,i,l,n){s(h),h[n?"roundRect":"rect"](~~e-m,~~t-m,~~a+2*m,~~i+2*m,n),I.stroke(l)},rectfill(e,t,a,i,l,n){s(h),h[n?"roundRect":"rect"](~~e,~~t,~~a,~~i,n),I.fill(l)},circ(e,t,a,i){s(h),h.arc(~~e,~~t,~~a,0,l),I.stroke(i)},circfill(e,t,a,i){s(h),h.arc(~~e,~~t,~~a,0,l),I.fill(i)},oval(e,t,a,i,n){s(h),h.ellipse(~~e,~~t,~~a,~~i,0,0,l),I.stroke(n)},ovalfill(e,t,a,i,n){s(h),h.ellipse(~~e,~~t,~~a,~~i,0,0,l),I.fill(n)},line(e,t,a,i,l){s(h);let n=.5*(0!==m&&~~e==~~a),o=.5*(0!==m&&~~t==~~i);h.moveTo(~~e+n,~~t+o),h.lineTo(~~a+n,~~i+o),I.stroke(l)},linewidth(e){h.lineWidth=~~e,m=.5*(0!=~~e%2)},linedash(e,t=0){h.setLineDash(e),h.lineDashOffset=t},text(e,t,a,i=3,l="normal"){h.font=`${l} ${k}px ${b}`,h.fillStyle=z[~~i%z.length],h.fillText(a,~~e,~~t)},textfont(e){b=e},textsize(e){k=e},textalign(e,t){e&&(h.textAlign=e),t&&(h.textBaseline=t)},image(e,t,a){h.drawImage(a,~~e,~~t)},paint(e,t,a,i={}){let l=i.canvas||new OffscreenCanvas(1,1),n=i.scale||1,o=h;if(l.width=e*n,l.height=t*n,(h=l.getContext("2d")).scale(n,n),Array.isArray(a)){let e=0,t=0;for(let i of(h.imageSmoothingEnabled=!1,a)){for(let a of i)" "!==a&&"."!==a&&I.rectfill(e,t,1,1,parseInt(a,16)),e++;t++,e=0}}else a(h);return h=o,l.transferToImageBitmap()},ctx:e=>(e&&(h=e),h),push:()=>h.save(),pop:()=>h.restore(),translate:(e,t)=>h.translate(~~e,~~t),scale:(e,t)=>h.scale(e,t||e),rotate:e=>h.rotate(e),alpha(e){h.globalAlpha=I.clamp(e,0,1)},fill(e){h.fillStyle=z[~~e%z.length],h.fill()},stroke(e){h.strokeStyle=z[~~e%z.length],h.stroke()},clip(e){s(h),e(h),h.clip()},sfx:(e,t=0,i=1)=>!!a.zzfxV&&(!navigator.userActivation||!!navigator.userActivation.hasBeenActive)&&(e=e||T,(0!==t||1!==i)&&((e=e.slice())[0]=i*(e[0]||1),e[10]=~~e[10]+t),f.apply(0,e),e),volume(e){a.zzfxV=e},canvas:()=>u,use(e,t={}){c?M(e,t):d.push([e,t])},listen:(e,t)=>(C[e=e.toLowerCase()]=C[e]||new Set,C[e].add(t),()=>C&&C[e].delete(t)),emit(e,t,a,i,l){c&&(D("before:"+(e=e.toLowerCase()),t,a,i,l),D(e,t,a,i,l),D("after:"+e,t,a,i,l))},pal(t=e){z=t},def(e,i){I[e]=i,t.global&&(a[e]=i)},timescale(e){g=e},framerate(e){v=1e3/~~e},stat(e){let i={index:e,value:[t,c,v/1e3,p,C,z,T,g,a.zzfxV,E,k,b][e]};return I.emit("stat",i),i.value},quit(){for(let e of(I.pause(),I.emit("quit"),C={},o))e();if(t.global){for(let e in I)delete a[e];delete a.ENGINE}c=!1},pause(){cancelAnimationFrame(y),y=0},resume(){c&&!y&&(x=v,w=Date.now(),y=n(L))},paused:()=>!y};for(let e of"PI,sin,cos,atan2,hypot,tan,abs,ceil,floor,trunc,min,max,pow,sqrt,sign,exp".split(","))I[e]=i[e];function A(){let e=t.loop?t.loop:a;for(let t of"init,update,draw,tap,untap,tapping,tapped,resized".split(","))e[t]&&I.listen(t,e[t]);for(let[e,t]of d)M(e,t);if(t.autoscale&&r(a,"resize",S),t.tapEvents){let e=e=>[(e.pageX-u.offsetLeft)/p,(e.pageY-u.offsetTop)/p],t=new Map,i=(e,a,i)=>{let l={x:a,y:i,xi:a,yi:i,t:Date.now()};return t.set(e,l),l},l=(e,a,l)=>{let n=t.get(e)||i(e);n.x=a,n.y=l},n=e=>e&&Date.now()-e.t<=300,o=e=>e.preventDefault(),s=!1;r(u,"mousedown",t=>{if(0===t.button){o(t);let[a,l]=e(t);I.emit("tap",a,l,0),i(0,a,l),s=!0}}),r(u,"mouseup",a=>{if(0===a.button){o(a);let i=t.get(0),[l,r]=e(a);n(i)&&I.emit("tapped",i.xi,i.yi,0),I.emit("untap",l,r,0),t.delete(0),s=!1}}),r(a,"mousemove",t=>{o(t);let[a,i]=e(t);I.def("MX",a),I.def("MY",i),s&&(I.emit("tapping",a,i,0),l(0,a,i))}),r(u,"touchstart",t=>{for(let a of(o(t),t.changedTouches)){let[t,l]=e(a);I.emit("tap",t,l,a.identifier+1),i(a.identifier+1,t,l)}}),r(u,"touchmove",t=>{for(let a of(o(t),t.changedTouches)){let[t,i]=e(a);I.emit("tapping",t,i,a.identifier+1),l(a.identifier+1,t,i)}});let f=e=>{o(e);let a=[];if(e.targetTouches.length>0)for(let t of e.targetTouches)a.push(t.identifier+1);for(let[e,i]of t)a.includes(e)||(n(i)&&I.emit("tapped",i.xi,i.yi,e),I.emit("untap",i.x,i.y,e),t.delete(e))};r(u,"touchend",f),r(u,"touchcancel",f),r(a,"blur",()=>{for(let[e,a]of(s=!1,t))I.emit("untap",a.x,a.y,e),t.delete(e)})}if(t.keyboardEvents){let e=new Set,t=new Set,i=(e,t="")=>(t=t.toLowerCase())?e.has("space"===t?" ":t):e.size>0;r(a,"keydown",a=>{let i=a.key.toLowerCase();e.has(i)||(e.add(i),t.add(i))}),r(a,"keyup",t=>{e.delete(t.key.toLowerCase())}),r(a,"blur",()=>e.clear()),I.listen("after:update",()=>t.clear()),I.def("iskeydown",t=>i(e,t)),I.def("iskeypressed",e=>i(t,e))}c=!0,I.emit("init",I),I.resume()}function L(){if(!t.animate)return I.emit("draw",h);let e=Date.now(),a=0,i=e-w;for(w=e,x+=i<100?i:v;x>=v;){a++,x-=v;let e=v/1e3*g;I.emit("update",e,a),I.def("T",I.T+e)}a&&(I.emit("draw",h),a>1&&(x=0)),y=n(L)}function S(){let e=t.width>0?t.width:innerWidth,a=t.width>0?t.height||t.width:innerHeight;if(I.def("W",e),I.def("H",a),u.width=e,u.height=a,t.autoscale){let l=+t.autoscale;u.style.display||(u.style.display="block",u.style.margin="auto"),p=i.min(innerWidth/e,innerHeight/a),p=l>1&&p>l?l:p,u.style.width=e*p+"px",u.style.height=a*p+"px"}t.pixelart&&(h.imageSmoothingEnabled=!1,u.style.imageRendering="pixelated"),I.textalign("start","top"),I.emit("resized",p),t.animate||n(L)}function D(e,t,a,i,l){if(C[e])for(let n of C[e])n(t,a,i,l)}function M(e,t){let a=e(I,t);for(let e in a)I.def(e,a[e])}if(t.global){if(a.ENGINE)throw Error("only one global litecanvas is allowed");Object.assign(a,I),a.ENGINE=I}return h=(u=(u="string"==typeof t.canvas?document.querySelector(t.canvas):t.canvas)||document.createElement("canvas")).getContext("2d"),r(u,"click",()=>focus()),u.style="",S(),u.parentNode||document.body.appendChild(u),u.oncontextmenu=()=>!1,"loading"===document.readyState?r(a,"DOMContentLoaded",()=>n(A)):n(A),I}})();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "litecanvas",
-    "version": "0.93.2",
+    "version": "0.94.1",
     "description": "Lightweight HTML5 canvas 2D game engine suitable for small projects and creative coding. Inspired by PICO-8 and P5/Processing.",
     "license": "MIT",
     "author": "Luiz Bills <luizbills@pm.me>",

package/src/index.js

@@ -61,7 +61,7 @@ export default function litecanvas(settings = {}) {
         /** @type {number} */
         _lastFrameTime,
         /** @type {number} duration of a frame at 60 FPS (default) */
-        _deltaTime = 1 / 60,
+        _fpsInterval = 1000 / 60,
         /** @type {number} */
         _accumulated,
         /** @type {number?} */
@@ -1120,7 +1120,7 @@ export default function litecanvas(settings = {}) {
                 '[litecanvas] framerate() 1st param must be a positive number'
             )
 
-            _deltaTime = 1 / ~~value
+            _fpsInterval = 1000 / ~~value
         },
 
         /**
@@ -1138,7 +1138,7 @@ export default function litecanvas(settings = {}) {
                 // 1
                 _initialized,
                 // 2
-                _deltaTime,
+                _fpsInterval / 1000,
                 // 3
                 _scale,
                 // 4
@@ -1210,8 +1210,8 @@ export default function litecanvas(settings = {}) {
          */
         resume() {
             if (_initialized && !_rafid) {
-                _accumulated = _deltaTime
-                _lastFrameTime = performance.now()
+                _accumulated = _fpsInterval
+                _lastFrameTime = Date.now()
                 _rafid = raf(drawFrame)
             }
         },
@@ -1280,7 +1280,7 @@ export default function litecanvas(settings = {}) {
                             // initial y
                             yi: y,
                             // timestamp
-                            t: performance.now(),
+                            t: Date.now(),
                         }
                         _taps.set(id, tap)
                         return tap
@@ -1300,7 +1300,7 @@ export default function litecanvas(settings = {}) {
                     /**
                      * @param {{t: number}} tap
                      */
-                    (tap) => tap && performance.now() - tap.t <= 300,
+                    (tap) => tap && Date.now() - tap.t <= 300,
                 preventDefault =
                     /**
                      * @param {Event} ev
@@ -1506,52 +1506,48 @@ export default function litecanvas(settings = {}) {
             )
         }
 
-        // this seems to solve a wierd bug that drop the FPS
-        // when switching tabs in the browser
-        setInterval(() => {
-            if (_rafid) {
-                instance.pause()
-                instance.resume()
-            }
-        }, 5000)
-
         // start the engine
         _initialized = true
         instance.emit('init', instance)
         instance.resume()
     }
 
-    /**
-     * @param {DOMHighResTimeStamp} now
-     */
-    function drawFrame(now) {
+    function drawFrame() {
         if (!settings.animate) {
-            return instance.emit('draw')
-        }
-        // request the next frame
-        // only when the engine loop are not paused (_rafid >= 1)
-        else if (_rafid) {
-            _rafid = raf(drawFrame)
+            return instance.emit('draw', _ctx)
         }
 
+        let now = Date.now()
         let updated = 0
-        let frameTime = (now - _lastFrameTime) / 1000
+        let frameTime = now - _lastFrameTime
 
         _lastFrameTime = now
+        _accumulated += frameTime < 100 ? frameTime : _fpsInterval
 
-        if (frameTime < 0.1) {
-            _accumulated += frameTime
-            while (_accumulated >= _deltaTime) {
-                updated++
-                instance.emit('update', _deltaTime * _timeScale, updated)
-                instance.def('T', instance.T + _deltaTime * _timeScale)
-                _accumulated -= _deltaTime
-            }
+        while (_accumulated >= _fpsInterval) {
+            updated++
+            _accumulated -= _fpsInterval
+
+            let dt = (_fpsInterval / 1000) * _timeScale
+
+            instance.emit('update', dt, updated)
+            instance.def('T', instance.T + dt)
         }
 
         if (updated) {
-            instance.emit('draw')
+            instance.emit('draw', _ctx)
+            if (updated > 1) {
+                _accumulated = 0
+                DEV: console.warn(
+                    '[litecanvas] the last frame updated ' +
+                        updated +
+                        ' times. This can drop the FPS if it keeps happening.'
+                )
+            }
         }
+
+        // request the next frame
+        _rafid = raf(drawFrame)
     }
 
     function setupCanvas() {
@@ -1638,9 +1634,6 @@ export default function litecanvas(settings = {}) {
         // note: not triggered before the "init" event
         instance.emit('resized', _scale)
 
-        // paint a temporary background
-        instance.cls(0)
-
         // force redraw when the canvas is not animated
         if (!settings.animate) {
             raf(drawFrame)

package/src/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.93.2'
+export const version = '0.94.1'

package/types/types.d.ts

@@ -613,16 +613,17 @@ type LitecanvasOptions = {
     /**
      * Specify your game loop callbacks.
      * By default use that global functions (if they exist):
-     * - `window.init(): void`
+     * - `window.init(instance: LitecanvasInstance): void`
      * - `window.update(dt: number): void`
-     * - `window.draw(): void`
-     * - `window.resized(): void`
-     * - `window.tap(tapX: number, tapY: number, tapId: number): void`
-     * - `window.untap(tapX: number, tapY: number, tapId: number): void`
-     * - `window.tapped(tapX: number, tapY: number, tapId: number): void`
-     * - `window.tapping(tapX: number, tapY: number, tapId: number): void`
+     * - `window.draw(ctx: CanvasRenderingContext2D): void`
+     * - `window.resized(scale: number): void`
+     * - `window.tap(tapX: number, tapY: number, touchId: number): void`
+     * - `window.untap(tapX: number, tapY: number, touchId: number): void`
+     * - `window.tapped(tapX: number, tapY: number, touchId: number): void`
+     * - `window.tapping(tapX: number, tapY: number, touchId: number): void`
      */
     loop?: LitecanvasGameLoop
+
     /**
      * default: `true`
      *
@@ -652,10 +653,10 @@ type LitecanvasGameLoop = {
     update?: (dt: number) => void
     draw?: () => void
     resized?: () => void
-    tap?: (tapX: number, tapY: number, tapId: number) => void
-    untap?: (tapX: number, tapY: number, tapId: number) => void
-    tapped?: (tapX: number, tapY: number, tapId: number) => void
-    tapping?: (tapX: number, tapY: number, tapId: number) => void
+    tap?: (tapX: number, tapY: number, touchId: number) => void
+    untap?: (tapX: number, tapY: number, touchId: number) => void
+    tapped?: (tapX: number, tapY: number, touchId: number) => void
+    tapping?: (tapX: number, tapY: number, touchId: number) => void
 }
 
 type drawCallback = (context: OffscreenCanvasRenderingContext2D) => void