From bc873ad2f708a8488d588faa82bad2c40f38ae50 Mon Sep 17 00:00:00 2001 From: Eli Grey <~@eligrey.com> Date: Wed, 1 Jun 2016 01:53:44 -0400 Subject: [PATCH] Fixed for non-HTML documents (#9041) * Fixed for non-HTML documents * Replaced Image constructor with createElementNS * Merging WebGLTextures.js This didn't commit for some reason --- src/Three.Legacy.js | 2 +- src/loaders/ImageLoader.js | 2 +- src/renderers/WebGLRenderer.js | 2 +- src/renderers/webgl/WebGLTextures.js | 4 ++-- src/renderers/webgl/plugins/SpritePlugin.js | 2 +- src/textures/Texture.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index ff5890f070..6431fc4280 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -768,7 +768,7 @@ THREE.CanvasRenderer = function () { console.error( 'THREE.CanvasRenderer has been moved to /examples/js/renderers/CanvasRenderer.js' ); - this.domElement = document.createElement( 'canvas' ); + this.domElement = document.createElementNS( 'http://www.w3.org/1999/xhtml', 'canvas' ); this.clear = function () {}; this.render = function () {}; this.setClearColor = function () {}; diff --git a/src/loaders/ImageLoader.js b/src/loaders/ImageLoader.js index 7bab1421d4..9c67d8a4e4 100644 --- a/src/loaders/ImageLoader.js +++ b/src/loaders/ImageLoader.js @@ -12,7 +12,7 @@ Object.assign( THREE.ImageLoader.prototype, { load: function ( url, onLoad, onProgress, onError ) { - var image = document.createElement( 'img' ); + var image = document.createElementNS( 'http://www.w3.org/1999/xhtml', 'img' ); image.onload = function () { URL.revokeObjectURL( image.src ); diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 5d604fe694..c03a04ecca 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -12,7 +12,7 @@ THREE.WebGLRenderer = function ( parameters ) { parameters = parameters || {}; - var _canvas = parameters.canvas !== undefined ? parameters.canvas : document.createElement( 'canvas' ), + var _canvas = parameters.canvas !== undefined ? parameters.canvas : document.createElementNS( 'http://www.w3.org/1999/xhtml', 'canvas' ), _context = parameters.context !== undefined ? parameters.context : null, _alpha = parameters.alpha !== undefined ? parameters.alpha : false, diff --git a/src/renderers/webgl/WebGLTextures.js b/src/renderers/webgl/WebGLTextures.js index ca72f397ab..e22a485e08 100644 --- a/src/renderers/webgl/WebGLTextures.js +++ b/src/renderers/webgl/WebGLTextures.js @@ -18,7 +18,7 @@ THREE.WebGLTextures = function ( _gl, extensions, state, properties, capabilitie var scale = maxSize / Math.max( image.width, image.height ); - var canvas = document.createElement( 'canvas' ); + var canvas = document.createElementNS( 'http://www.w3.org/1999/xhtml', 'canvas' ); canvas.width = Math.floor( image.width * scale ); canvas.height = Math.floor( image.height * scale ); @@ -45,7 +45,7 @@ THREE.WebGLTextures = function ( _gl, extensions, state, properties, capabilitie if ( image instanceof HTMLImageElement || image instanceof HTMLCanvasElement ) { - var canvas = document.createElement( 'canvas' ); + var canvas = document.createElementNS( 'http://www.w3.org/1999/xhtml', 'canvas' ); canvas.width = THREE.Math.nearestPowerOfTwo( image.width ); canvas.height = THREE.Math.nearestPowerOfTwo( image.height ); diff --git a/src/renderers/webgl/plugins/SpritePlugin.js b/src/renderers/webgl/plugins/SpritePlugin.js index 97972cf5a8..15263a4944 100644 --- a/src/renderers/webgl/plugins/SpritePlugin.js +++ b/src/renderers/webgl/plugins/SpritePlugin.js @@ -72,7 +72,7 @@ THREE.SpritePlugin = function ( renderer, sprites ) { alphaTest: gl.getUniformLocation( program, 'alphaTest' ) }; - var canvas = document.createElement( 'canvas' ); + var canvas = document.createElementNS( 'http://www.w3.org/1999/xhtml', 'canvas' ); canvas.width = 8; canvas.height = 8; diff --git a/src/textures/Texture.js b/src/textures/Texture.js index 99645043c4..1b9c0e3450 100644 --- a/src/textures/Texture.js +++ b/src/textures/Texture.js @@ -117,7 +117,7 @@ THREE.Texture.prototype = { } else { - canvas = document.createElement( 'canvas' ); + canvas = document.createElementNS( 'http://www.w3.org/1999/xhtml', 'canvas' ); canvas.width = image.width; canvas.height = image.height; -- GitLab