diff --git a/src/core/renderers/webgl/State.js b/src/core/renderers/webgl/State.js index 6591bae..be5b166 100644 --- a/src/core/renderers/webgl/State.js +++ b/src/core/renderers/webgl/State.js @@ -135,7 +135,7 @@ set blendMode(value) // eslint-disable-line require-jsdoc { // 17 is NO BLEND - this.blend = (value === 17); + this.blend = (value !== 17); this._blendMode = value; } diff --git a/src/core/renderers/webgl/State.js b/src/core/renderers/webgl/State.js index 6591bae..be5b166 100644 --- a/src/core/renderers/webgl/State.js +++ b/src/core/renderers/webgl/State.js @@ -135,7 +135,7 @@ set blendMode(value) // eslint-disable-line require-jsdoc { // 17 is NO BLEND - this.blend = (value === 17); + this.blend = (value !== 17); this._blendMode = value; } diff --git a/src/core/renderers/webgl/managers/StateManager.js b/src/core/renderers/webgl/managers/StateManager.js index b146e72..3d2b5da 100755 --- a/src/core/renderers/webgl/managers/StateManager.js +++ b/src/core/renderers/webgl/managers/StateManager.js @@ -74,22 +74,25 @@ state = state || this.defaultState; // TODO maybe to an object check? ( this.state === state )? - if (this.stateId === state.data) return; - - let diff = this.stateId ^ state.data; - let i = 0; - - // order from least to most common - while (diff) + if (this.stateId !== state.data) { - if (diff & 1) + let diff = this.stateId ^ state.data; + let i = 0; + + // order from least to most common + while (diff) { - // state change! - this.map[i].call(this, !!(state.data & (1 << i))); + if (diff & 1) + { + // state change! + this.map[i].call(this, !!(state.data & (1 << i))); + } + + diff = diff >> 1; + i++; } - diff = diff >> 1; - i++; + this.stateId = state.data; } // based on the above settings we check for specific modes.. @@ -99,8 +102,6 @@ { this.checks[i](this, state); } - - this.stateId = state.data; } /** diff --git a/src/core/renderers/webgl/State.js b/src/core/renderers/webgl/State.js index 6591bae..be5b166 100644 --- a/src/core/renderers/webgl/State.js +++ b/src/core/renderers/webgl/State.js @@ -135,7 +135,7 @@ set blendMode(value) // eslint-disable-line require-jsdoc { // 17 is NO BLEND - this.blend = (value === 17); + this.blend = (value !== 17); this._blendMode = value; } diff --git a/src/core/renderers/webgl/managers/StateManager.js b/src/core/renderers/webgl/managers/StateManager.js index b146e72..3d2b5da 100755 --- a/src/core/renderers/webgl/managers/StateManager.js +++ b/src/core/renderers/webgl/managers/StateManager.js @@ -74,22 +74,25 @@ state = state || this.defaultState; // TODO maybe to an object check? ( this.state === state )? - if (this.stateId === state.data) return; - - let diff = this.stateId ^ state.data; - let i = 0; - - // order from least to most common - while (diff) + if (this.stateId !== state.data) { - if (diff & 1) + let diff = this.stateId ^ state.data; + let i = 0; + + // order from least to most common + while (diff) { - // state change! - this.map[i].call(this, !!(state.data & (1 << i))); + if (diff & 1) + { + // state change! + this.map[i].call(this, !!(state.data & (1 << i))); + } + + diff = diff >> 1; + i++; } - diff = diff >> 1; - i++; + this.stateId = state.data; } // based on the above settings we check for specific modes.. @@ -99,8 +102,6 @@ { this.checks[i](this, state); } - - this.stateId = state.data; } /** diff --git a/src/mesh/Mesh.js b/src/mesh/Mesh.js index f0aaa89..7c16ebb 100644 --- a/src/mesh/Mesh.js +++ b/src/mesh/Mesh.js @@ -59,7 +59,7 @@ * @default PIXI.BLEND_MODES.NORMAL * @see PIXI.BLEND_MODES */ - this.blendMode = core.BLEND_MODES.SCREEN; + this.blendMode = core.BLEND_MODES.NORMAL; this.state.blendMode = this.blendMode; /**