From d39995209733c041f990b6399c9668490b6ed297 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Thu, 11 Jun 2015 11:09:25 +0200 Subject: [PATCH] Corrected bug in case of texture coords in loader --- geo/Mesh.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geo/Mesh.js b/geo/Mesh.js index ad4f57e..2c0beb3 100644 --- a/geo/Mesh.js +++ b/geo/Mesh.js @@ -40,11 +40,13 @@ geo.MeshStreamer.prototype.loadFromFile = function(path, callback) { // Texture coord var texCoord = self.textureCoords[self.textureCoords.push(new geo.TextureCoord(line)) - 1]; + self.orderedElements.push(texCoord); } else { // Just a simple vertex var vertex = self.vertices[self.vertices.push(new geo.Vertex(line)) - 1]; + self.orderedElements.push(vertex); } @@ -52,6 +54,7 @@ geo.MeshStreamer.prototype.loadFromFile = function(path, callback) { // Create face var face = self.faces[self.faces.push(new geo.Face(line)) - 1]; + self.orderedElements.push(face); } @@ -65,7 +68,7 @@ geo.MeshStreamer.prototype.loadFromFile = function(path, callback) { geo.MeshStreamer.prototype.tryMerge = function() { if (this.faces[0].aTexture) { - return; + return this.orderedElements; } else { return this.merge(); }