diff --git a/src/core/index.js b/src/core/index.js index 689b18d..c5f3536 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -36,19 +36,20 @@ Texture: require('./textures/Texture'), BaseTexture: require('./textures/BaseTexture'), RenderTexture: require('./textures/RenderTexture'), - BaseRenderTexture: require('./textures/BaseRenderTexture'), + BaseRenderTexture: require('./textures/BaseRenderTexture'), VideoBaseTexture: require('./textures/VideoBaseTexture'), TextureUvs: require('./textures/TextureUvs'), // renderers - canvas CanvasRenderer: require('./renderers/canvas/CanvasRenderer'), - CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), + CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - WebGLManager: require('./renderers/webgl/managers/WebGLManager'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), RenderTarget: require('./renderers/webgl/utils/RenderTarget'), + Quad: require('./renderers/webgl/utils/Quad'), // filters - webgl SpriteMaskFilter: require('./renderers/webgl/filters/spriteMask/SpriteMaskFilter'), diff --git a/src/core/index.js b/src/core/index.js index 689b18d..c5f3536 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -36,19 +36,20 @@ Texture: require('./textures/Texture'), BaseTexture: require('./textures/BaseTexture'), RenderTexture: require('./textures/RenderTexture'), - BaseRenderTexture: require('./textures/BaseRenderTexture'), + BaseRenderTexture: require('./textures/BaseRenderTexture'), VideoBaseTexture: require('./textures/VideoBaseTexture'), TextureUvs: require('./textures/TextureUvs'), // renderers - canvas CanvasRenderer: require('./renderers/canvas/CanvasRenderer'), - CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), + CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - WebGLManager: require('./renderers/webgl/managers/WebGLManager'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), RenderTarget: require('./renderers/webgl/utils/RenderTarget'), + Quad: require('./renderers/webgl/utils/Quad'), // filters - webgl SpriteMaskFilter: require('./renderers/webgl/filters/spriteMask/SpriteMaskFilter'), diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d0ef80c..3406a62 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -99,7 +99,7 @@ // initialize the context so it is ready for the managers. this.gl = createContext(this.view, this._contextOptions); - this.gl.id = this.CONTEXT_UID = CONTEXT_UID++; + this.CONTEXT_UID = CONTEXT_UID++; this.state = new WebGLState(this.gl); this.renderingToScreen = true; diff --git a/src/core/index.js b/src/core/index.js index 689b18d..c5f3536 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -36,19 +36,20 @@ Texture: require('./textures/Texture'), BaseTexture: require('./textures/BaseTexture'), RenderTexture: require('./textures/RenderTexture'), - BaseRenderTexture: require('./textures/BaseRenderTexture'), + BaseRenderTexture: require('./textures/BaseRenderTexture'), VideoBaseTexture: require('./textures/VideoBaseTexture'), TextureUvs: require('./textures/TextureUvs'), // renderers - canvas CanvasRenderer: require('./renderers/canvas/CanvasRenderer'), - CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), + CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - WebGLManager: require('./renderers/webgl/managers/WebGLManager'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), RenderTarget: require('./renderers/webgl/utils/RenderTarget'), + Quad: require('./renderers/webgl/utils/Quad'), // filters - webgl SpriteMaskFilter: require('./renderers/webgl/filters/spriteMask/SpriteMaskFilter'), diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d0ef80c..3406a62 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -99,7 +99,7 @@ // initialize the context so it is ready for the managers. this.gl = createContext(this.view, this._contextOptions); - this.gl.id = this.CONTEXT_UID = CONTEXT_UID++; + this.CONTEXT_UID = CONTEXT_UID++; this.state = new WebGLState(this.gl); this.renderingToScreen = true; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 8f205e1..4ef28d5 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -32,7 +32,7 @@ for (var i = 0; i < maxTextures; i++) { if(i > 0)src += '\nelse '; - if(i < maxTextures-1)src += 'if(ndx == ' + i + '.0)'; + if(i < maxTextures-1)src += 'if(vTextureId == ' + i + '.0)'; src += '\n{'; src += '\n\tcolor = texture2D(uSamplers['+i+'], vTextureCoord);'; src += '\n}'; @@ -54,7 +54,6 @@ 'void main(void){', 'vec4 color;', - 'float ndx = vTextureId;', '%forloop%', 'gl_FragColor = color * vColor;', '}' diff --git a/src/core/index.js b/src/core/index.js index 689b18d..c5f3536 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -36,19 +36,20 @@ Texture: require('./textures/Texture'), BaseTexture: require('./textures/BaseTexture'), RenderTexture: require('./textures/RenderTexture'), - BaseRenderTexture: require('./textures/BaseRenderTexture'), + BaseRenderTexture: require('./textures/BaseRenderTexture'), VideoBaseTexture: require('./textures/VideoBaseTexture'), TextureUvs: require('./textures/TextureUvs'), // renderers - canvas CanvasRenderer: require('./renderers/canvas/CanvasRenderer'), - CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), + CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - WebGLManager: require('./renderers/webgl/managers/WebGLManager'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), RenderTarget: require('./renderers/webgl/utils/RenderTarget'), + Quad: require('./renderers/webgl/utils/Quad'), // filters - webgl SpriteMaskFilter: require('./renderers/webgl/filters/spriteMask/SpriteMaskFilter'), diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d0ef80c..3406a62 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -99,7 +99,7 @@ // initialize the context so it is ready for the managers. this.gl = createContext(this.view, this._contextOptions); - this.gl.id = this.CONTEXT_UID = CONTEXT_UID++; + this.CONTEXT_UID = CONTEXT_UID++; this.state = new WebGLState(this.gl); this.renderingToScreen = true; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 8f205e1..4ef28d5 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -32,7 +32,7 @@ for (var i = 0; i < maxTextures; i++) { if(i > 0)src += '\nelse '; - if(i < maxTextures-1)src += 'if(ndx == ' + i + '.0)'; + if(i < maxTextures-1)src += 'if(vTextureId == ' + i + '.0)'; src += '\n{'; src += '\n\tcolor = texture2D(uSamplers['+i+'], vTextureCoord);'; src += '\n}'; @@ -54,7 +54,6 @@ 'void main(void){', 'vec4 color;', - 'float ndx = vTextureId;', '%forloop%', 'gl_FragColor = color * vColor;', '}' diff --git a/src/core/utils/index.js b/src/core/utils/index.js index 07d43bb..a2e9893 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -9,7 +9,6 @@ EventEmitter: require('eventemitter3'), pluginTarget: require('./pluginTarget'), - async: require('async'), /** * Gets the next unique identifier diff --git a/src/core/index.js b/src/core/index.js index 689b18d..c5f3536 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -36,19 +36,20 @@ Texture: require('./textures/Texture'), BaseTexture: require('./textures/BaseTexture'), RenderTexture: require('./textures/RenderTexture'), - BaseRenderTexture: require('./textures/BaseRenderTexture'), + BaseRenderTexture: require('./textures/BaseRenderTexture'), VideoBaseTexture: require('./textures/VideoBaseTexture'), TextureUvs: require('./textures/TextureUvs'), // renderers - canvas CanvasRenderer: require('./renderers/canvas/CanvasRenderer'), - CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), + CanvasRenderTarget: require('./renderers/canvas/utils/CanvasRenderTarget'), // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), - WebGLManager: require('./renderers/webgl/managers/WebGLManager'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), RenderTarget: require('./renderers/webgl/utils/RenderTarget'), + Quad: require('./renderers/webgl/utils/Quad'), // filters - webgl SpriteMaskFilter: require('./renderers/webgl/filters/spriteMask/SpriteMaskFilter'), diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d0ef80c..3406a62 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -99,7 +99,7 @@ // initialize the context so it is ready for the managers. this.gl = createContext(this.view, this._contextOptions); - this.gl.id = this.CONTEXT_UID = CONTEXT_UID++; + this.CONTEXT_UID = CONTEXT_UID++; this.state = new WebGLState(this.gl); this.renderingToScreen = true; diff --git a/src/core/sprites/webgl/generateMultiTextureShader.js b/src/core/sprites/webgl/generateMultiTextureShader.js index 8f205e1..4ef28d5 100644 --- a/src/core/sprites/webgl/generateMultiTextureShader.js +++ b/src/core/sprites/webgl/generateMultiTextureShader.js @@ -32,7 +32,7 @@ for (var i = 0; i < maxTextures; i++) { if(i > 0)src += '\nelse '; - if(i < maxTextures-1)src += 'if(ndx == ' + i + '.0)'; + if(i < maxTextures-1)src += 'if(vTextureId == ' + i + '.0)'; src += '\n{'; src += '\n\tcolor = texture2D(uSamplers['+i+'], vTextureCoord);'; src += '\n}'; @@ -54,7 +54,6 @@ 'void main(void){', 'vec4 color;', - 'float ndx = vTextureId;', '%forloop%', 'gl_FragColor = color * vColor;', '}' diff --git a/src/core/utils/index.js b/src/core/utils/index.js index 07d43bb..a2e9893 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -9,7 +9,6 @@ EventEmitter: require('eventemitter3'), pluginTarget: require('./pluginTarget'), - async: require('async'), /** * Gets the next unique identifier diff --git a/src/interaction/InteractionManager.js b/src/interaction/InteractionManager.js index 6b3638e..56b9945 100644 --- a/src/interaction/InteractionManager.js +++ b/src/interaction/InteractionManager.js @@ -90,7 +90,7 @@ * @member {HTMLElement} * @private */ - this.moveWhenInside = true; + this.moveWhenInside = false; /** * Have events been attached to the dom element?