mirror of
https://github.com/photonstorm/phaser
synced 2025-02-16 22:18:29 +00:00
The WebGLRenderer will now validate that the mipmapFilter
property in the Game Config is a valid mipmap before assigning it.
This commit is contained in:
parent
8e20211774
commit
8e1809688c
3 changed files with 5 additions and 3 deletions
|
@ -361,7 +361,7 @@ var Config = new Class({
|
||||||
this.antialiasGL = GetValue(renderConfig, 'antialiasGL', true, config);
|
this.antialiasGL = GetValue(renderConfig, 'antialiasGL', true, config);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @const {string} Phaser.Core.Config#mipmapFilter - Sets the `mipmapFilter` property when the WebGL renderer is created.
|
* @const {string} Phaser.Core.Config#mipmapFilter - Sets the mipmap magFilter to be used when creating WebGL textures. Don't set unless you wish to create mipmaps. Set to one of the following: 'NEAREST', 'LINEAR', 'NEAREST_MIPMAP_NEAREST', 'LINEAR_MIPMAP_NEAREST', 'NEAREST_MIPMAP_LINEAR' or 'LINEAR_MIPMAP_LINEAR'.
|
||||||
*/
|
*/
|
||||||
this.mipmapFilter = GetValue(renderConfig, 'mipmapFilter', '', config);
|
this.mipmapFilter = GetValue(renderConfig, 'mipmapFilter', '', config);
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* @property {number} [batchSize=4096] - The default WebGL batch size. Represents the number of _quads_ that can be added to a single batch.
|
* @property {number} [batchSize=4096] - The default WebGL batch size. Represents the number of _quads_ that can be added to a single batch.
|
||||||
* @property {number} [maxLights=10] - The maximum number of lights allowed to be visible within range of a single Camera in the LightManager.
|
* @property {number} [maxLights=10] - The maximum number of lights allowed to be visible within range of a single Camera in the LightManager.
|
||||||
* @property {number} [maxTextures=-1] - When in WebGL mode, this sets the maximum number of GPU Textures to use. The default, -1, will use all available units. The WebGL1 spec says all browsers should provide a minimum of 8.
|
* @property {number} [maxTextures=-1] - When in WebGL mode, this sets the maximum number of GPU Textures to use. The default, -1, will use all available units. The WebGL1 spec says all browsers should provide a minimum of 8.
|
||||||
* @property {string} [mipmapFilter=''] - The mipmap magFilter to be used when creating WebGL textures.
|
* @property {string} [mipmapFilter=''] - The mipmap magFilter to be used when creating WebGL textures. Don't set unless you wish to create mipmaps. Set to one of the following: 'NEAREST', 'LINEAR', 'NEAREST_MIPMAP_NEAREST', 'LINEAR_MIPMAP_NEAREST', 'NEAREST_MIPMAP_LINEAR' or 'LINEAR_MIPMAP_LINEAR'.
|
||||||
* @property {Phaser.Types.Core.PipelineConfig} [pipeline] - The WebGL Pipeline configuration object.
|
* @property {Phaser.Types.Core.PipelineConfig} [pipeline] - The WebGL Pipeline configuration object.
|
||||||
* @property {boolean} [autoMobilePipeline=true] - Automatically enable the Mobile Pipeline if iOS or Android detected?
|
* @property {boolean} [autoMobilePipeline=true] - Automatically enable the Mobile Pipeline if iOS or Android detected?
|
||||||
* @property {string} [defaultPipeline='MultiPipeline'] - The WebGL Pipeline that Game Objects will use by default. Set to 'MultiPipeline' as standard.
|
* @property {string} [defaultPipeline='MultiPipeline'] - The WebGL Pipeline that Game Objects will use by default. Set to 'MultiPipeline' as standard.
|
||||||
|
|
|
@ -783,7 +783,9 @@ var WebGLRenderer = new Class({
|
||||||
gl.clearColor(clearColor.redGL, clearColor.greenGL, clearColor.blueGL, clearColor.alphaGL);
|
gl.clearColor(clearColor.redGL, clearColor.greenGL, clearColor.blueGL, clearColor.alphaGL);
|
||||||
|
|
||||||
// Mipmaps
|
// Mipmaps
|
||||||
if (config.mipmapFilter !== '')
|
var validMipMaps = [ 'NEAREST', 'LINEAR', 'NEAREST_MIPMAP_NEAREST', 'LINEAR_MIPMAP_NEAREST', 'NEAREST_MIPMAP_LINEAR', 'LINEAR_MIPMAP_LINEAR' ];
|
||||||
|
|
||||||
|
if (validMipMaps.indexOf(config.mipmapFilter) !== -1)
|
||||||
{
|
{
|
||||||
this.mipmapFilter = gl[config.mipmapFilter];
|
this.mipmapFilter = gl[config.mipmapFilter];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue