diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js index 4f6f7c9..43fc869 100644 --- a/src/core/renderers/webgl/managers/FilterManager.js +++ b/src/core/renderers/webgl/managers/FilterManager.js @@ -247,6 +247,7 @@ // renderer._bindGLShader(shader); let currentState; + const uniforms = filter.uniforms; if (uniforms.filterArea) { diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js index 4f6f7c9..43fc869 100644 --- a/src/core/renderers/webgl/managers/FilterManager.js +++ b/src/core/renderers/webgl/managers/FilterManager.js @@ -247,6 +247,7 @@ // renderer._bindGLShader(shader); let currentState; + const uniforms = filter.uniforms; if (uniforms.filterArea) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 54a172d..91a326e 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -63,7 +63,7 @@ { func += `\nif (uniformValues.${i}.baseTexture) { - var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, true); + var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, false); if(uniformData.${i}.value !== location) { diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js index 4f6f7c9..43fc869 100644 --- a/src/core/renderers/webgl/managers/FilterManager.js +++ b/src/core/renderers/webgl/managers/FilterManager.js @@ -247,6 +247,7 @@ // renderer._bindGLShader(shader); let currentState; + const uniforms = filter.uniforms; if (uniforms.filterArea) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 54a172d..91a326e 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -63,7 +63,7 @@ { func += `\nif (uniformValues.${i}.baseTexture) { - var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, true); + var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, false); if(uniformData.${i}.value !== location) { diff --git a/src/mesh/Mesh.js b/src/mesh/Mesh.js index 8ff73f7..dd11031 100644 --- a/src/mesh/Mesh.js +++ b/src/mesh/Mesh.js @@ -45,6 +45,9 @@ super(geometry, new core.Shader(meshProgram, uniforms), null, drawMode); + this.uvs = geometry.getAttribute('aTextureCoord').data; + this.vertices = geometry.getAttribute('aVertexPosition').data; + this.uniforms = uniforms; this.texture = texture; diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js index 4f6f7c9..43fc869 100644 --- a/src/core/renderers/webgl/managers/FilterManager.js +++ b/src/core/renderers/webgl/managers/FilterManager.js @@ -247,6 +247,7 @@ // renderer._bindGLShader(shader); let currentState; + const uniforms = filter.uniforms; if (uniforms.filterArea) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 54a172d..91a326e 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -63,7 +63,7 @@ { func += `\nif (uniformValues.${i}.baseTexture) { - var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, true); + var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, false); if(uniformData.${i}.value !== location) { diff --git a/src/mesh/Mesh.js b/src/mesh/Mesh.js index 8ff73f7..dd11031 100644 --- a/src/mesh/Mesh.js +++ b/src/mesh/Mesh.js @@ -45,6 +45,9 @@ super(geometry, new core.Shader(meshProgram, uniforms), null, drawMode); + this.uvs = geometry.getAttribute('aTextureCoord').data; + this.vertices = geometry.getAttribute('aVertexPosition').data; + this.uniforms = uniforms; this.texture = texture; diff --git a/src/mesh/Rope.js b/src/mesh/Rope.js index 5621a7d..7e970ef 100644 --- a/src/mesh/Rope.js +++ b/src/mesh/Rope.js @@ -41,10 +41,9 @@ */ refresh() { - const points = this.points; - if(!points)return; + if (!points) return; const vertexBuffer = this.geometry.getAttribute('aVertexPosition'); const uvBuffer = this.geometry.getAttribute('aTextureCoord'); diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js index 4f6f7c9..43fc869 100644 --- a/src/core/renderers/webgl/managers/FilterManager.js +++ b/src/core/renderers/webgl/managers/FilterManager.js @@ -247,6 +247,7 @@ // renderer._bindGLShader(shader); let currentState; + const uniforms = filter.uniforms; if (uniforms.filterArea) { diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js index 54a172d..91a326e 100644 --- a/src/core/shader/generateUniformsSync.js +++ b/src/core/shader/generateUniformsSync.js @@ -63,7 +63,7 @@ { func += `\nif (uniformValues.${i}.baseTexture) { - var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, true); + var location = renderer.bindTexture(uniformValues.${i}.baseTexture, ${textureCount++}, false); if(uniformData.${i}.value !== location) { diff --git a/src/mesh/Mesh.js b/src/mesh/Mesh.js index 8ff73f7..dd11031 100644 --- a/src/mesh/Mesh.js +++ b/src/mesh/Mesh.js @@ -45,6 +45,9 @@ super(geometry, new core.Shader(meshProgram, uniforms), null, drawMode); + this.uvs = geometry.getAttribute('aTextureCoord').data; + this.vertices = geometry.getAttribute('aVertexPosition').data; + this.uniforms = uniforms; this.texture = texture; diff --git a/src/mesh/Rope.js b/src/mesh/Rope.js index 5621a7d..7e970ef 100644 --- a/src/mesh/Rope.js +++ b/src/mesh/Rope.js @@ -41,10 +41,9 @@ */ refresh() { - const points = this.points; - if(!points)return; + if (!points) return; const vertexBuffer = this.geometry.getAttribute('aVertexPosition'); const uvBuffer = this.geometry.getAttribute('aTextureCoord'); diff --git a/src/mesh/index.js b/src/mesh/index.js index a402b70..9094f68 100644 --- a/src/mesh/index.js +++ b/src/mesh/index.js @@ -9,5 +9,5 @@ export { default as Buffer } from './geometry/Buffer'; export { default as Geometry } from './geometry/Geometry'; export { default as Plane } from './Plane'; -// export { default as NineSlicePlane } from './NineSlicePlane'; +export { default as NineSlicePlane } from './NineSlicePlane'; export { default as Rope } from './Rope';