From d230f81e4c4ee4f1f6568b292703b760b848ddb2 Mon Sep 17 00:00:00 2001 From: nianxingyan Date: Fri, 24 Dec 2021 10:25:05 +0800 Subject: [PATCH 1/2] fix crash on desktop safari 15 --- package.json | 2 +- src/renderers/WebGLRenderer.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index dc55038b27789..8bc281014be81 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oppentech/three", - "version": "0.115.6", + "version": "0.115.7", "description": "JavaScript 3D library", "main": "build/three.js", "module": "build/three.module.js", diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index e077324457759..a8ae69151245d 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -198,7 +198,7 @@ function WebGLRenderer( parameters ) { preserveDrawingBuffer: _preserveDrawingBuffer, powerPreference: _powerPreference, failIfMajorPerformanceCaveat: _failIfMajorPerformanceCaveat, - xrCompatible: true + // xrCompatible: true }; // event listeners must be registered before WebGL context is created, see #12753 @@ -206,7 +206,7 @@ function WebGLRenderer( parameters ) { _canvas.addEventListener( 'webglcontextlost', onContextLost, false ); _canvas.addEventListener( 'webglcontextrestored', onContextRestore, false ); - _gl = _context || _canvas.getContext( 'webgl', contextAttributes ) || _canvas.getContext( 'experimental-webgl', contextAttributes ); + _gl = _context || _canvas.getContext( 'webgl2', contextAttributes ) || _canvas.getContext( 'webgl', contextAttributes ) || _canvas.getContext( 'experimental-webgl', contextAttributes ); if ( _gl === null ) { From c613dce967c6857a9d3baddba809869ae67a0864 Mon Sep 17 00:00:00 2001 From: nianxingyan Date: Thu, 30 Dec 2021 11:56:29 +0800 Subject: [PATCH 2/2] add vconsole.to webgl_loader_gltf.html --- examples/webgl_loader_gltf.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/webgl_loader_gltf.html b/examples/webgl_loader_gltf.html index 5e8aa13ad5d7a..bc10040d19c47 100644 --- a/examples/webgl_loader_gltf.html +++ b/examples/webgl_loader_gltf.html @@ -5,6 +5,10 @@ + +