Merge pull request #106 from JuliaIO/ff/fix-save

Fix old function name

Author: ffreyer

src/io/obj.jl

@@ -199,7 +199,7 @@ end
 function save(f::Stream{format"OBJ"}, mesh::AbstractMesh)
     # TODO: allow saving with faceviews (i.e. build the / or // syntax)
     if any(v -> v isa FaceView, values(vertex_attributes(mesh)))
-        mesh = GeometryBasics.clear_faceviews(mesh)
+        mesh = GeometryBasics.expand_faceviews(Mesh(mesh))
     end
 
     io = stream(f)

test/runtests.jl

@@ -146,10 +146,26 @@ end
             @test test_face_indices(msh)
 
             msh = load(joinpath(tf, "cube.obj")) # quads
+            @test msh isa MetaMesh
             @test length(faces(msh)) == 12
             @test length(coordinates(msh)) == 8
             @test test_face_indices(msh)
 
+            @testset "OBJ meta and mtl data" begin
+                @test msh[:material_names] == ["Material"]
+                @test msh[:shading] == BitVector([0])
+                @test msh[:object] == ["Cube"]
+                @test length(msh[:materials]) == 1
+                @test length(msh[:materials]["Material"]) == 7
+                @test msh[:materials]["Material"]["refractive index"]   === 1f0
+                @test msh[:materials]["Material"]["illumination model"] === 2
+                @test msh[:materials]["Material"]["alpha"]              === 1f0
+                @test msh[:materials]["Material"]["diffuse"]            === Vec3f(0.64, 0.64, 0.64)
+                @test msh[:materials]["Material"]["specular"]           === Vec3f(0.5, 0.5, 0.5)
+                @test msh[:materials]["Material"]["shininess"]          === 96.07843f0
+                @test msh[:materials]["Material"]["ambient"]            === Vec3f(0.0, 0.0, 0.0)
+            end
+
             msh = load(joinpath(tf, "cube_uv.obj"))
             @test typeof(msh.uv) == Vector{Vec{2,Float32}}
             @test length(msh.uv) == 8
@@ -166,7 +182,28 @@ end
             msh = load(joinpath(tf, "test_face_normal.obj"))
             @test length(faces(msh)) == 1
             @test length(coordinates(msh)) == 3
+            @test length(normals(msh)) == 3
             @test test_face_indices(msh)
+            @test normals(msh) isa FaceView
+
+            # test correctness of reordered vertices
+            msh2 = expand_faceviews(Mesh(msh))
+            @test !(normals(msh2) isa FaceView)
+            @test length(faces(msh2)) == 1
+            @test coordinates(coordinates(msh2)[faces(msh2)[1]]) == (Vec3f(0), Vec3f(0.062805, 0.591207, 0.902102), Vec3f(0.058382, 0.577691, 0.904429))
+            @test normals(msh2)[faces(msh2)[1]] == (Vec3f(0.9134, 0.104, 0.3934), Vec3f(0.8079, 0.4428, 0.3887), Vec3f(0.8943, 0.4474, 0.0))
+
+            # test that save works with FaceViews
+            mktempdir() do tmpdir
+                save(joinpath(tmpdir, "test.obj"), msh)
+                msh1 = load(joinpath(tmpdir, "test.obj"))
+                msh3 = expand_faceviews(Mesh(msh1)) # should be unnecessary atm
+                @test length(faces(msh2)) == length(faces(msh3))
+                for (f1, f2) in zip(faces(msh2), faces(msh3))
+                    @test coordinates(msh2)[f1] == coordinates(msh3)[f2]
+                    @test normals(msh2)[f1] == normals(msh3)[f2]
+                end
+            end
         end
         @testset "2DM" begin
             msh = load(joinpath(tf, "test.2dm"))

test/not_supported/cube.mtl renamed to test/testfiles/cube.mtl

@@ -1,8 +1,8 @@
 v 0.000000 0.000000 0.000000
 v 0.062805 0.591207 0.902102
 v 0.058382 0.577691 0.904429
-vn 0.913400 0.104000 0.393400
 vn 0.807900 0.442800 0.388700
+vn 0.913400 0.104000 0.393400
 vn 0.894300 0.447400 0.000000
 s 1
-f 1//1 2//2 3//3
+f 1//2 2//1 3//3