diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index 0c41545..104f521 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -647,7 +647,7 @@ */ packInterleavedGeometry(element, attributeBuffer, indexBuffer, aIndex, iIndex) { - const packedVerticies = aIndex / this.vertexSize; + const packedVertices = aIndex / this.vertexSize; const indicies = element.indices; const textureId = element._texture.baseTexture._id; @@ -738,7 +738,7 @@ for (let i = 0; i < indicies.length; i++) { - indexBuffer[iIndex++] = packedVerticies + indicies[i]; + indexBuffer[iIndex++] = packedVertices + indicies[i]; } } diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index 0c41545..104f521 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -647,7 +647,7 @@ */ packInterleavedGeometry(element, attributeBuffer, indexBuffer, aIndex, iIndex) { - const packedVerticies = aIndex / this.vertexSize; + const packedVertices = aIndex / this.vertexSize; const indicies = element.indices; const textureId = element._texture.baseTexture._id; @@ -738,7 +738,7 @@ for (let i = 0; i < indicies.length; i++) { - indexBuffer[iIndex++] = packedVerticies + indicies[i]; + indexBuffer[iIndex++] = packedVertices + indicies[i]; } } diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 5f74c25..8154746 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -49,9 +49,9 @@ const isBuiltin = (typeof def === 'string'); const identifier = isBuiltin ? def : def.name; - const size = isBuiltin ? builtinAttributeSizes[identifier] : def.size; + const size = isBuiltin ? builtinAttributeSizes[identifier] : def.glSize; - this.addAttribute(identifier, this._buffer, size, def === 'aTextureId', TYPES.FLOAT); + this.addAttribute(identifier, this._buffer, size, def === 'aTextureId', def.glType); }); this.addIndex(this._indexBuffer); diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index 0c41545..104f521 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -647,7 +647,7 @@ */ packInterleavedGeometry(element, attributeBuffer, indexBuffer, aIndex, iIndex) { - const packedVerticies = aIndex / this.vertexSize; + const packedVertices = aIndex / this.vertexSize; const indicies = element.indices; const textureId = element._texture.baseTexture._id; @@ -738,7 +738,7 @@ for (let i = 0; i < indicies.length; i++) { - indexBuffer[iIndex++] = packedVerticies + indicies[i]; + indexBuffer[iIndex++] = packedVertices + indicies[i]; } } diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 5f74c25..8154746 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -49,9 +49,9 @@ const isBuiltin = (typeof def === 'string'); const identifier = isBuiltin ? def : def.name; - const size = isBuiltin ? builtinAttributeSizes[identifier] : def.size; + const size = isBuiltin ? builtinAttributeSizes[identifier] : def.glSize; - this.addAttribute(identifier, this._buffer, size, def === 'aTextureId', TYPES.FLOAT); + this.addAttribute(identifier, this._buffer, size, def === 'aTextureId', def.glType); }); this.addIndex(this._indexBuffer); diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..5b75137 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -46,7 +46,6 @@ this.currentRenderer.stop(); this.currentRenderer = objectRenderer; - this.currentRenderer.start(); } diff --git a/packages/core/src/batch/AbstractBatchRenderer.js b/packages/core/src/batch/AbstractBatchRenderer.js index 0c41545..104f521 100644 --- a/packages/core/src/batch/AbstractBatchRenderer.js +++ b/packages/core/src/batch/AbstractBatchRenderer.js @@ -647,7 +647,7 @@ */ packInterleavedGeometry(element, attributeBuffer, indexBuffer, aIndex, iIndex) { - const packedVerticies = aIndex / this.vertexSize; + const packedVertices = aIndex / this.vertexSize; const indicies = element.indices; const textureId = element._texture.baseTexture._id; @@ -738,7 +738,7 @@ for (let i = 0; i < indicies.length; i++) { - indexBuffer[iIndex++] = packedVerticies + indicies[i]; + indexBuffer[iIndex++] = packedVertices + indicies[i]; } } diff --git a/packages/core/src/batch/BatchGeometry.js b/packages/core/src/batch/BatchGeometry.js index 5f74c25..8154746 100644 --- a/packages/core/src/batch/BatchGeometry.js +++ b/packages/core/src/batch/BatchGeometry.js @@ -49,9 +49,9 @@ const isBuiltin = (typeof def === 'string'); const identifier = isBuiltin ? def : def.name; - const size = isBuiltin ? builtinAttributeSizes[identifier] : def.size; + const size = isBuiltin ? builtinAttributeSizes[identifier] : def.glSize; - this.addAttribute(identifier, this._buffer, size, def === 'aTextureId', TYPES.FLOAT); + this.addAttribute(identifier, this._buffer, size, def === 'aTextureId', def.glType); }); this.addIndex(this._indexBuffer); diff --git a/packages/core/src/batch/BatchSystem.js b/packages/core/src/batch/BatchSystem.js index 2d1a8bf..5b75137 100644 --- a/packages/core/src/batch/BatchSystem.js +++ b/packages/core/src/batch/BatchSystem.js @@ -46,7 +46,6 @@ this.currentRenderer.stop(); this.currentRenderer = objectRenderer; - this.currentRenderer.start(); } diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index efbc6dd..6572004 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -365,7 +365,6 @@ _render(renderer) { this.calculateVertices(); - renderer.batch.setObjectRenderer(renderer.plugins[this.pluginName]); renderer.plugins[this.pluginName].render(this); }