tforgione
/
3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected bug in case of texture coords in loader

This commit is contained in:
Thomas FORGIONE 2015-06-11 11:09:25 +02:00
parent 70372f8ea2
commit d399952097
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geo/Mesh.js
View File

@ -40,11 +40,13 @@ geo.MeshStreamer.prototype.loadFromFile = function(path, callback) {
// Texture coord // Texture coord
var texCoord = self.textureCoords[self.textureCoords.push(new geo.TextureCoord(line)) - 1]; var texCoord = self.textureCoords[self.textureCoords.push(new geo.TextureCoord(line)) - 1];
self.orderedElements.push(texCoord);
} else { } else {
// Just a simple vertex // Just a simple vertex
var vertex = self.vertices[self.vertices.push(new geo.Vertex(line)) - 1]; 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 // Create face
var face = self.faces[self.faces.push(new geo.Face(line)) - 1]; 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() { geo.MeshStreamer.prototype.tryMerge = function() {
if (this.faces[0].aTexture) { if (this.faces[0].aTexture) {
return; return this.orderedElements;
} else { } else {
return this.merge(); return this.merge();
} }