Merge pull request #46 from Absulit/dev

Dev

Author: Absulit

index.html

@@ -25,19 +25,19 @@
   <script type="importmap">
       {
         "imports": {
-            "points": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/points.min.js",
+            "points": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/points.min.js",
 
-            "points/animation": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/animation.min.js",
-            "points/audio": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/audio.min.js",
-            "points/color": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/color.min.js",
-            "points/debug": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/debug.min.js",
-            "points/effects": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/effects.min.js",
-            "points/image": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/image.min.js",
-            "points/math": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/math.min.js",
-            "points/noise2d": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/noise2d.min.js",
-            "points/classicnoise2d": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/classicnoise2d.min.js",
-            "points/random": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/random.min.js",
-            "points/sdf": "https://cdn.jsdelivr.net/gh/absulit/points@0.5.1/build/core/sdf.min.js",
+            "points/animation": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/animation.min.js",
+            "points/audio": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/audio.min.js",
+            "points/color": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/color.min.js",
+            "points/debug": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/debug.min.js",
+            "points/effects": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/effects.min.js",
+            "points/image": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/image.min.js",
+            "points/math": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/math.min.js",
+            "points/noise2d": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/noise2d.min.js",
+            "points/classicnoise2d": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/classicnoise2d.min.js",
+            "points/random": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/random.min.js",
+            "points/sdf": "https://cdn.jsdelivr.net/gh/absulit/points@0.6.0/build/core/sdf.min.js",
 
             "datgui": "https://cdn.jsdelivr.net/gh/dataarts/dat.gui@0.7.9/build/dat.gui.module.js"
         }

src/renderpasses/renderpass0/frag.js

@@ -134,15 +134,10 @@ const audioLength = 826.; // 800. 826. 550.
 const minNumSides = 3.;
 
 @fragment
-fn main(
-    @location(0) color: vec4f,
-    @location(1) uv: vec2f,
-    @location(2) ratio: vec2f,  // relation between params.screen.x and params.screen.y
-    @location(3) uvr: vec2f,    // uv with aspect ratio corrected
-    @location(4) mouse: vec2f,
-    @builtin(position) position: vec4f
-) -> @location(0) vec4f {
-
+fn main(in:FragmentIn) -> @location(0) vec4f {
+    let uv = in.uv;
+    let uvr = in.uvr;
+    let ratio = in.ratio;
     let center = vec2(.5) * ratio;
 
     // params.audioLength 1024

src/renderpasses/renderpass0/vert.js

@@ -5,15 +5,8 @@ const vert = /*wgsl*/`
 ${structs}
 
 @vertex
-fn main(
-    @location(0) position: vec4<f32>,
-    @location(1) color: vec4<f32>,
-    @location(2) uv: vec2<f32>,
-    @location(3) normal: vec3<f32>,
-    @builtin(vertex_index) vertexIndex: u32
-) -> Fragment {
-
-    return defaultVertexBody(position, color, uv, normal);
+fn main(in:VertexIn) -> FragmentIn {
+    return defaultVertexBody(in.position, in.color, in.uv, in.normal);
 }
 `;