|
@@ -2474,7 +2474,7 @@ class Texture extends EventDispatcher {
|
|
|
|
|
|
}
|
|
|
|
|
|
-Texture.DEFAULT_IMAGE = undefined;
|
|
|
+Texture.DEFAULT_IMAGE = null;
|
|
|
Texture.DEFAULT_MAPPING = UVMapping;
|
|
|
|
|
|
Texture.prototype.isTexture = true;
|
|
@@ -18663,7 +18663,7 @@ function WebGLProgram( renderer, cacheKey, parameters, bindingStates ) {
|
|
|
( parameters.toneMapping !== NoToneMapping ) ? getToneMappingFunction( 'toneMapping', parameters.toneMapping ) : '',
|
|
|
|
|
|
parameters.dithering ? '#define DITHERING' : '',
|
|
|
- parameters.transparent ? '' : '#define OPAQUE',
|
|
|
+ parameters.opaque ? '#define OPAQUE' : '',
|
|
|
|
|
|
ShaderChunk[ 'encodings_pars_fragment' ], // this code is required here because it is used by the various encoding/decoding function defined below
|
|
|
getTexelEncodingFunction( 'linearToOutputTexel', parameters.outputEncoding ),
|
|
@@ -19165,7 +19165,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
|
|
|
specularIntensityMap: !! material.specularIntensityMap,
|
|
|
specularColorMap: !! material.specularColorMap,
|
|
|
|
|
|
- transparent: material.transparent,
|
|
|
+ opaque: material.transparent === false && material.blending === NormalBlending,
|
|
|
|
|
|
alphaMap: !! material.alphaMap,
|
|
|
alphaTest: useAlphaTest,
|
|
@@ -19435,7 +19435,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
|
|
|
_programLayers.enable( 21 );
|
|
|
if ( parameters.decodeVideoTexture )
|
|
|
_programLayers.enable( 22 );
|
|
|
- if ( parameters.transparent )
|
|
|
+ if ( parameters.opaque )
|
|
|
_programLayers.enable( 23 );
|
|
|
|
|
|
array.push( _programLayers.mask );
|
|
@@ -22601,9 +22601,9 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
|
|
|
|
const image = texture.image;
|
|
|
|
|
|
- if ( image === undefined ) {
|
|
|
+ if ( image === null ) {
|
|
|
|
|
|
- console.warn( 'THREE.WebGLRenderer: Texture marked for update but image is undefined' );
|
|
|
+ console.warn( 'THREE.WebGLRenderer: Texture marked for update but no image data found.' );
|
|
|
|
|
|
} else if ( image.complete === false ) {
|
|
|
|