Update obj.jl

updated to handle .obj indices correctly

Author: Asdow

src/obj.jl

@@ -26,21 +26,21 @@ struct Mesh
     vertices::Vector{Vertex}
     normals::Vector{Normal}
     texcoords::Vector{TextureCoordinate}
-    vindices::Vector{SVec{3,UInt32}} # vertex indices
-    nindices::Vector{SVec{3,UInt32}} # normal indices
-    tindices::Vector{SVec{3,UInt32}} # texture indices
+    # vindices::Vector{SVec{3,UInt32}} # vertex indices
+    # nindices::Vector{SVec{3,UInt32}} # normal indices
+    # tindices::Vector{SVec{3,UInt32}} # texture indices
 end
 
 
 
 function loadOBJ(path::String)
     names = String[]
-    vertices = Array{Vertex,1}[]
-    normals = Array{Normal,1}[]
-    texturecoords = Array{TextureCoordinate,1}[]
-    vertexFaces = Array{SVec{3,UInt32},1}[]
-    normalFaces = Array{SVec{3,UInt32},1}[]
-    textureFaces = Array{SVec{3,UInt32},1}[]
+    temp_vertices = Vertex[]
+    temp_normals = Normal[]
+    temp_texturecoords = TextureCoordinate[]
+    vertexFaces = Array{UInt32,1}[]
+    normalFaces = Array{UInt32,1}[]
+    textureFaces = Array{UInt32,1}[]
 
 
     stream = open(path)
@@ -54,18 +54,18 @@ function loadOBJ(path::String)
             if command == "o"
                 name = lines[end]
                 push!( names, String(name) )
-                push!( vertices, Vertex[] )
-                push!( normals, Normal[] )
-                push!( texturecoords, TextureCoordinate[] )
-                push!( vertexFaces, SVec{3,UInt32}[] )
-                push!( normalFaces, SVec{3,UInt32}[] )
-                push!( textureFaces, SVec{3,UInt32}[] )
+                # push!( temp_vertices, Vertex[] )
+                # push!( temp_normals, Normal[] )
+                # push!( temp_texturecoords, TextureCoordinate[] )
+                push!( vertexFaces, UInt32[] )
+                push!( normalFaces, UInt32[] )
+                push!( textureFaces, UInt32[] )
             elseif command == "v"
-                push!( vertices[end], parse.(Float32,lines) )
+                push!( temp_vertices, parse.(Float32,lines) )
             elseif command == "vn"
-                push!( normals[end], parse.(Float32,lines) )
+                push!( temp_normals, parse.(Float32,lines) )
             elseif command == "vt"
-                push!( texturecoords[end], parse.(Float32,lines) )
+                push!( temp_texturecoords, parse.(Float32,lines) )
             # Handle faces
         elseif command == "f"
                 # Handle missing texture coordinate indices case, ie.
@@ -81,10 +81,8 @@ function loadOBJ(path::String)
                         push!(normalIndices, parsed[2])
                     end
 
-                    vertexTriangle = SVec3( vertIndices )
-                    push!( vertexFaces[end], vertexTriangle )
-                    normalTriangle = SVec3( normalIndices )
-                    push!( normalFaces[end], normalTriangle )
+                    append!( vertexFaces[end], vertIndices )
+                    append!( normalFaces[end], normalIndices )
                 # Handle full indices case, ie.
                 # f v1/vt1/vn1 v2/vt2/vn2 v3/vt2/vn3 ...
             elseif any(x->occursin("/", x), lines)
@@ -99,30 +97,54 @@ function loadOBJ(path::String)
                         push!(texCoordinateIndices, parsed[2])
                         push!(normalIndices, parsed[3])
                     end
-                    push!( vertexFaces[end],  SVec3( vertIndices ) )
-                    push!( normalFaces[end], SVec3( normalIndices ) )
-                    push!( textureFaces[end], SVec3( texCoordinateIndices ) )
+                    append!( vertexFaces[end], vertIndices )
+                    append!( normalFaces[end], normalIndices )
+                    append!( textureFaces[end], texCoordinateIndices )
                 # Handle only vertex indices
                 else
                     parsed = parse.(UInt32, lines)
-                    push!( vertexFaces[end],  SVec3( parsed ) )
+                    append!( vertexFaces[end],  parsed )
                 end
             end
         end
     end
     close(stream)
 
 
+    # Go through objects' indices and push correct vertex data into their vectors
+    vertices = Array{Vertex,1}[]
+    normals = Array{Normal,1}[]
+    texturecoords = Array{TextureCoordinate,1}[]
+
+    #FIXME Handles only .objs with full indices v1/vt1/vn1 case
+    for name in 1:length(names)
+        push!( vertices, Vertex[] )
+        push!( normals, Normal[] )
+        push!( texturecoords, TextureCoordinate[] )
+        for i in 1:length(vertexFaces[name])
+            vFace = vertexFaces[name][i]
+            nFace = normalFaces[name][i]
+            uvFace = textureFaces[name][i]
+
+            vertexPos = temp_vertices[vFace]
+            vertexNormal = temp_normals[nFace]
+            vertexUV = temp_texturecoords[uvFace]
+
+            # Add the vertex to the object's data
+            push!(vertices[name], vertexPos)
+            push!(normals[name], vertexNormal)
+            push!(texturecoords[name], vertexUV)
+        end
+    end
+
+
     meshes = Mesh[]
     for i in 1:length(names)
         mesh = Mesh(
             names[i],
             vertices[i],
             normals[i],
             texturecoords[i],
-            vertexFaces[i],
-            normalFaces[i],
-            textureFaces[i]
         )
         push!( meshes, mesh )
     end