exampes fixes and cleanup

MagnusThor · May 7, 2024 · d573800 · d573800
1 parent 77c6609
commit d573800
Show file tree

Hide file tree

Showing 15 changed files with 121 additions and 88 deletions.
diff --git a/example/ExampleMassive.js b/example/ExampleMassive.js
@@ -29,7 +29,7 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
     const textures = [
         {
             key: "iChannel0",
-            source: "assets/noise2  .png", // ms 
+            source: "assets/noise2.png", // ms 
             type: ITexture_1.TextureType.IMAGE,
         },
         {

diff --git a/example/ExampleMassive.ts b/example/ExampleMassive.ts
@@ -5,9 +5,7 @@ import { ITexture, TextureType } from "../src/ITexture";
 import { rectGeometry } from "./meshes/Rectangle";
 import { Scene } from "../src/Scene";
 import { Mesh } from "../src/Mesh";
-
 import { FPS } from 'yy-fps'
-import { prismBreakShader } from "./shaders/wglsl/prismBreakShader";
 import { flamesShader } from "./shaders/wglsl/flamesShader";
 
 document.addEventListener("DOMContentLoaded", async () => {
@@ -24,10 +22,11 @@ document.addEventListener("DOMContentLoaded", async () => {
 
   const geometry = new Geometry(device, rectGeometry);
 
+
   const textures: Array<ITexture> = [
     {
       key: "iChannel0",
-      source: "assets/noise2  .png", // ms 
+      source: "assets/noise2.png", // ms 
       type: TextureType.IMAGE,
     },
 

diff --git a/example/build/comp-bundle.js b/example/build/comp-bundle.js
diff --git a/example/build/massive-bundle.js → example/build/flames-bundle.js b/example/build/massive-bundle.js → example/build/flames-bundle.js
diff --git a/example/build/frag-bundle.js b/example/build/frag-bundle.js
diff --git a/example/index3.html b/example/index3.html
@@ -23,8 +23,8 @@
 </head>
 <body>
     <div id="render-result">
-        <canvas width="1280" height="720"></canvas>
+        <canvas width="800" height="450"></canvas>
     </div>
-    <script src="build/massive-bundle.js"></script>
+    <script src="build/flames-bundle.js"></script>
 </body>
 </html>
diff --git a/example/shaders/wglsl/flamesShader.js b/example/shaders/wglsl/flamesShader.js
@@ -13,7 +13,8 @@ exports.flamesShader = {
    
 	struct Uniforms {
 		resolution: vec3<f32>,
-		time: f32
+		time: f32,
+		mouse: vec4<f32>
 	  };
 	
 	  @group(0) @binding(0) var<uniform> uniforms: Uniforms;
@@ -94,7 +95,7 @@ exports.flamesShader = {
 
 	fn mainImage(invocation_id: vec2<f32>) -> vec4<f32> {
 
-		let mouse: vec4<f32> =  vec4<f32>(0.0,0.0,0.0,0.);
+		let mouse: vec4<f32> = uniforms.mouse;
 	
 		let R: vec2<f32> = uniforms.resolution.xy;
 		let y_inverted_location = vec2<i32>(i32(invocation_id.x), i32(R.y) - i32(invocation_id.y));
@@ -106,7 +107,9 @@ exports.flamesShader = {
 		let q: vec2<f32> = fragCoord.xy / uniforms.resolution.xy;
 		let p: vec2<f32> = (-1. + 2. * q) * vec2<f32>(uniforms.resolution.x / uniforms.resolution.y, 1.);
 		var mo: vec2<f32> = mouse.xy / uniforms.resolution.xy;
-		if (mouse.w <= 0.00001) { mo = vec2<f32>(0.); }
+		
+		//if (mouse.w <= 0.00001) { mo = vec2<f32>(0.); }
+
 		let an: f32 = -0.07 * uniforms.time + 3. * mo.x;
 		var ro: vec3<f32> = 4.5 * normalize(vec3<f32>(cos(an), 0.5, sin(an)));
 		ro.y = ro.y + (1.);

diff --git a/example/shaders/wglsl/flamesShader.ts b/example/shaders/wglsl/flamesShader.ts
@@ -13,7 +13,8 @@ export const flamesShader: IMaterialShader = {
    
 	struct Uniforms {
 		resolution: vec3<f32>,
-		time: f32
+		time: f32,
+		mouse: vec4<f32>
 	  };
 	
 	  @group(0) @binding(0) var<uniform> uniforms: Uniforms;
@@ -94,7 +95,7 @@ export const flamesShader: IMaterialShader = {
 
 	fn mainImage(invocation_id: vec2<f32>) -> vec4<f32> {
 
-		let mouse: vec4<f32> =  vec4<f32>(0.0,0.0,0.0,0.);
+		let mouse: vec4<f32> = uniforms.mouse;
 	
 		let R: vec2<f32> = uniforms.resolution.xy;
 		let y_inverted_location = vec2<i32>(i32(invocation_id.x), i32(R.y) - i32(invocation_id.y));
@@ -106,7 +107,9 @@ export const flamesShader: IMaterialShader = {
 		let q: vec2<f32> = fragCoord.xy / uniforms.resolution.xy;
 		let p: vec2<f32> = (-1. + 2. * q) * vec2<f32>(uniforms.resolution.x / uniforms.resolution.y, 1.);
 		var mo: vec2<f32> = mouse.xy / uniforms.resolution.xy;
-		if (mouse.w <= 0.00001) { mo = vec2<f32>(0.); }
+		
+		//if (mouse.w <= 0.00001) { mo = vec2<f32>(0.); }
+
 		let an: f32 = -0.07 * uniforms.time + 3. * mo.x;
 		var ro: vec3<f32> = 4.5 * normalize(vec3<f32>(cos(an), 0.5, sin(an)));
 		ro.y = ro.y + (1.);