Merge pull request #15 from Absulit/dev

small issues fixed

Author: Absulit

src/main.js

@@ -14,6 +14,7 @@ const gui = new dat.GUI({ name: 'Points GUI' });
 const folderOptions = gui.addFolder('options');
 const folderControls = gui.addFolder('controls');
 const folderSongs = gui.addFolder('songs');
+const MAXCHARS = 30;
 
 let audio = null;
 let loop = false;
@@ -54,6 +55,7 @@ function playSong(song) {
 
     audio && audio.pause() && (audio = null);
     audio = points.setAudio('audio', audioUrl, options.volume, false, false);
+    points.setUniform('numChars', title.length < MAXCHARS ? title.length : MAXCHARS);
     points.setStorageMap('chars', strToCodes(title));
     let artworkLoaded = 0;
     song?.artworkColors && points.setStorageMap('artworkColors', song?.artworkColors.flat());
@@ -158,6 +160,7 @@ async function onCompleteTags(result) {
     }
 
     folderSongs.add(song, 'fn').name(song.name);
+    points.setUniform('numChars', title.length < MAXCHARS ? title.length : MAXCHARS);
     points.setStorageMap('chars', strToCodes(title));
 }
 
@@ -321,13 +324,14 @@ points.setSampler('textImageSampler', {
 });
 points.setTexture2d('feedbackTexture', true);
 
-audio = points.setAudio('audio', './../80s-pulse-synthwave-dude-212407.mp3', options.volume, loop, false);
+audio = points.setAudio('audio', '', options.volume, loop, false); // TODO returl null if empty or null is passed
 
 points.setUniform('showMessage', 1);
 points.setUniform('rand', 0);
 points.setUniform('progress', 0);
 points.setUniform('artworkLoaded', 0);
 // points.setUniform('somecolor', colors.color2, 'vec3f');
+points.setUniform('numChars', 12);
 points.setStorageMap('chars', strToCodes('Gravity Pull'), 'array<f32>')// TODO: setStorageMap doesn't work with u32 wrong sized
 points.setStorageMap('message', strToCodes('Select a song to Play'), 'array<f32>')// TODO: setStorageMap doesn't work with u32 wrong sized
 points.setStorageMap('artworkColors', Array(16).fill(1), 'array<vec4f>');
@@ -345,8 +349,6 @@ if (await points.init(renderPasses)) {
     el.classList.toggle('show');
 }
 
-
-
 points.canvas.addEventListener('click', _ => {
     if (pauseClickTimeout) {
         return;
@@ -356,7 +358,8 @@ points.canvas.addEventListener('click', _ => {
         pauseClickTimeout = null;
     }, 300);
 });
-document.addEventListener('dblclick', _ => {
+
+points.canvas.addEventListener('dblclick', _ => {
     clearTimeout(pauseClickTimeout);
     pauseClickTimeout = null;
     points.fullscreen = !points.fullscreen;

src/renderpasses/renderpass0/frag.js

@@ -129,8 +129,7 @@ const MATRIX4 = vec4f(.572,.717,.549, 1);
 
 const TAU = PI * 2; // TODO: fix on main library
 const TAUQUARTER = TAU * .25;
-const NUMCHARS = 30;
-const MAXBITS = 256;
+const MAXBYTES = 256;
 const CHLEN = 0.125;
 const DINTENSITY = .0041;//0.0151;
 const B = vec3(); // black
@@ -159,19 +158,19 @@ fn main(
 
     // params.audioLength 1024
 
-    let audioX = audio.data[ u32(uv.x * audioLength)] / MAXBITS;
-    let audioX2 = audio.data[ u32(audioLength - uv.x * audioLength)] / MAXBITS;
-    let audio1 = audio.data[ u32(.9 * audioLength)] / MAXBITS;
+    let audioX = audio.data[ u32(uv.x * audioLength)] / MAXBYTES;
+    let audioX2 = audio.data[ u32(audioLength - uv.x * audioLength)] / MAXBYTES;
+    let audio1 = audio.data[ u32(.9 * audioLength)] / MAXBYTES;
 
     // CHANNELS
-    let c0 = audio.data[ 0 ] / MAXBITS;
-    let c1 = audio.data[ u32(CHLEN * 1 * audioLength)] / MAXBITS;
-    let c2 = audio.data[ u32(CHLEN * 2 * audioLength)] / MAXBITS;
-    let c3 = audio.data[ u32(CHLEN * 3 * audioLength)] / MAXBITS;
-    let c4 = audio.data[ u32(CHLEN * 4 * audioLength)] / MAXBITS;
-    let c5 = audio.data[ u32(CHLEN * 5 * audioLength)] / MAXBITS;
-    let c6 = audio.data[ u32(CHLEN * 6 * audioLength)] / MAXBITS;
-    let c7 = audio.data[ u32(CHLEN * 7 * audioLength)] / MAXBITS;
+    let c0 = audio.data[ 0 ] / MAXBYTES;
+    let c1 = audio.data[ u32(CHLEN * 1 * audioLength)] / MAXBYTES;
+    let c2 = audio.data[ u32(CHLEN * 2 * audioLength)] / MAXBYTES;
+    let c3 = audio.data[ u32(CHLEN * 3 * audioLength)] / MAXBYTES;
+    let c4 = audio.data[ u32(CHLEN * 4 * audioLength)] / MAXBYTES;
+    let c5 = audio.data[ u32(CHLEN * 5 * audioLength)] / MAXBYTES;
+    let c6 = audio.data[ u32(CHLEN * 6 * audioLength)] / MAXBYTES;
+    let c7 = audio.data[ u32(CHLEN * 7 * audioLength)] / MAXBYTES;
 
 
     let s = sdfCircle(center, maxCircleRadius * c4, .1 * audioX, uvr);
@@ -240,7 +239,8 @@ fn main(
     let textScale = 2.476 * ratio.y + c0;
     let textUVR = uvr / textScale;
     let spaceRatio = .0017 * ratio.x;
-    for (var index = 0; index < NUMCHARS; index++) {
+
+    for (var index = 0; index < i32(params.numChars); index++) {
         let indexF32 = f32(index);
         let charIndex = u32(chars[index]);
         let charPosition = charSizeF32 * vec2(indexF32, 0);