Merge branch 'mrdoob:dev' into render-context

mrdoob · Jul 5, 2023 · ebfe1b8 · ebfe1b8
2 parents 69420ba + 08d5c96
commit ebfe1b8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/examples/webaudio_sandbox.html b/examples/webaudio_sandbox.html
@@ -227,7 +227,6 @@
 
 				controls.movementSpeed = 70;
 				controls.lookSpeed = 0.05;
-				controls.noFly = true;
 				controls.lookVertical = false;
 
 				//

diff --git a/examples/webgl_shadowmap.html b/examples/webgl_shadowmap.html
@@ -127,7 +127,6 @@
 
 				controls.lookSpeed = 0.0125;
 				controls.movementSpeed = 500;
-				controls.noFly = false;
 				controls.lookVertical = true;
 
 				controls.lookAt( scene.position );

diff --git a/examples/webgl_shadowmap_performance.html b/examples/webgl_shadowmap_performance.html
@@ -121,7 +121,6 @@
 
 				controls.lookSpeed = 0.0125;
 				controls.movementSpeed = 500;
-				controls.noFly = false;
 				controls.lookVertical = true;
 
 				controls.lookAt( scene.position );

diff --git a/examples/webgpu_tsl_editor.html b/examples/webgpu_tsl_editor.html
@@ -126,15 +126,21 @@
 					const editorDOM = document.getElementById( 'source' );
 					const resultDOM = document.getElementById( 'result' );
 
-					const tslCode = `// Simple example
+					const tslCode = `// Simple uv.x animation
 
-const { texture, uniform, vec4 } = TSL;
+const { texture, uniform, vec2, vec4, uv, oscSine, timerLocal } = TSL;
 
 //const samplerTexture = new THREE.Texture();
 const samplerTexture = new THREE.TextureLoader().load( './textures/uv_grid_opengl.jpg' );
+samplerTexture.wrapS = THREE.RepeatWrapping;
+//samplerTexture.wrapT = THREE.RepeatWrapping;
+
+const timer = timerLocal( .5 ); // .5 is speed
+const uv0 = uv();
+const animateUv = vec2( uv0.x.add( oscSine( timer ) ), uv0.y );
 
 // label is optional
-const myMap = texture( samplerTexture ).rgb.label( 'myTexture' );
+const myMap = texture( samplerTexture, animateUv ).rgb.label( 'myTexture' );
 const myColor = uniform( new THREE.Color( 0x0066ff ) ).label( 'myColor' );
 const opacity = .7;