Просмотр исходного кода

Merge branch 'dev' into seteffects

Mr.doob 1 день назад
Родитель
Сommit
30c3a72de2
3 измененных файлов с 6 добавлено и 28 удалено
  1. 2 13
      examples/webgl_materials_video.html
  2. 2 14
      examples/webgpu_materials_video.html
  3. 2 1
      test/e2e/puppeteer.js

+ 2 - 13
examples/webgl_materials_video.html

@@ -8,9 +8,6 @@
 	</head>
 	<body>
 
-		<div id="overlay">
-			<button id="startButton">Play</button>
-		</div>
 		<div id="container"></div>
 
 		<div id="info">
@@ -18,7 +15,7 @@
 			playing <a href="http://durian.blender.org/" target="_blank" rel="noopener">sintel</a> trailer
 		</div>
 
-		<video id="video" loop crossOrigin="anonymous" playsinline style="display:none">
+		<video id="video" loop muted crossOrigin="anonymous" playsinline style="display:none">
 			<source src="textures/sintel.ogv" type='video/ogg; codecs="theora, vorbis"'>
 			<source src="textures/sintel.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
 		</video>
@@ -58,18 +55,10 @@
 				xgrid = 20,
 				ygrid = 10;
 
-			const startButton = document.getElementById( 'startButton' );
-			startButton.addEventListener( 'click', function () {
-
-				init();
-
-			} );
+			init();
 
 			function init() {
 
-				const overlay = document.getElementById( 'overlay' );
-				overlay.remove();
-
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 

+ 2 - 14
examples/webgpu_materials_video.html

@@ -8,10 +8,6 @@
 	</head>
 	<body>
 
-		<div id="overlay">
-			<button id="startButton">Play</button>
-		</div>
-
 		<div id="container"></div>
 
 		<div id="info">
@@ -26,7 +22,7 @@
 			</small>
 		</div>
 
-		<video id="video" loop crossOrigin="anonymous" playsinline style="display:none">
+		<video id="video" loop muted crossOrigin="anonymous" playsinline style="display:none">
 			<source src="textures/sintel.ogv" type='video/ogg; codecs="theora, vorbis"'>
 			<source src="textures/sintel.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
 		</video>
@@ -66,18 +62,10 @@
 				xgrid = 20,
 				ygrid = 10;
 
-			const startButton = document.getElementById( 'startButton' );
-			startButton.addEventListener( 'click', function () {
-
-				init();
-
-			} );
+			init();
 
 			function init() {
 
-				const overlay = document.getElementById( 'overlay' );
-				overlay.remove();
-
 				container = document.createElement( 'div' );
 				document.body.appendChild( container );
 

+ 2 - 1
test/e2e/puppeteer.js

@@ -31,8 +31,9 @@ const exceptionList = [
 	'webgl_shadowmap',
 	'webaudio_visualizer',
 	'webgpu_compute_audio',
-	'webgpu_tsl_editor',
+	'webgpu_compute_sort_bitonic',
 	'webgpu_storage_buffer',
+	'webgpu_tsl_editor',
 	'webxr_vr_video',
 
 	// Need more time to render

粤ICP备19079148号