fixes and tests for 2dm

Probably incorrect, waiting for input from @michelk
JuliaIO · Sep 3, 2015 · 9d9f3b1 · 9d9f3b1
1 parent f3255e9
commit 9d9f3b1
Show file tree

Hide file tree

Showing 3 changed files with 35,746 additions and 2 deletions.
diff --git a/src/io/2dm.jl b/src/io/2dm.jl
@@ -13,9 +13,9 @@ function load(st::Stream{format"2DM"}, MeshType=GLNormalMesh)
             if w[1] == "ND"
                 push!(vertices, Point{3, Float32}(w[3:end]))
             elseif w[1] == "E3T"
-                push!(faces, Triangle{Cuint}(w[3:end]))
+                push!(faces, Face{3, Cuint, 0}(w[3:5]))
             elseif w[1] == "E4Q"
-                push!(faces, Face{4, Cuint, 0}(w[3:end]))
+                push!(faces, triangulate(FT, Face{4, Cuint, 0}(w[3:6]))...)
             else
                 continue
             end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -86,5 +86,12 @@ facts("MeshIO") do
 			@fact length(vertices(msh)) --> 2248
 			@fact length(normals(msh)) --> 2248
 		end
+		context("2DM") do
+			msh = load(joinpath(tf, "test.2dm"))
+			@fact typeof(msh) --> GLNormalMesh
+			#@fact length(faces(msh)) --> 3954
+			#@fact length(vertices(msh)) --> 2248
+			#@fact length(normals(msh)) --> 2248
+		end
 	end
 end