Skip to content
This repository was archived by the owner on Nov 22, 2023. It is now read-only.

last fixes for tagging + glvisualize #100

Merged
merged 8 commits into from
Jun 7, 2017
Merged

last fixes for tagging + glvisualize #100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
00f25a8
convert HomogenousMesh constructor to an @generated function to work …
rdeits Jun 1, 2017
d157632
fix test
rdeits Jun 1, 2017
3e48b26
fix bug and correct typo
rdeits Jun 1, 2017
93fb423
fix last glvisualize problems
SimonDanisch Jun 7, 2017
04eaa11
remove debug
SimonDanisch Jun 7, 2017
caac727
add test for creating mesh from sphere
SimonDanisch Jun 7, 2017
272d96f
removed unused
SimonDanisch Jun 7, 2017
5bc0a41
don't steal from iterators.jl anymore
SimonDanisch Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
convert HomogenousMesh constructor to an @generated function to work … 
…around segfault

fixes #92
  • Loading branch information
@rdeits @SimonDanisch
rdeits authored and SimonDanisch committed Jun 7, 2017
commit 00f25a8fd14d5d3c319fa7519d004fd57cd98e81
2 changes: 1 addition & 1 deletion src/meshes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ isvoid{T}(::Type{Vector{T}}) = isvoid(T)
field = fnames[i]
target_type = fieldtype(HM1, i)
source_type = fieldtype(HM2, i)
if !isleaftype(fieldtype(HM1, i)) # target is not defined
if isleaftype(fieldtype(HM1, i)) # target is not defined
push!(expr.args, :(getfield(primitive, $(QuoteNode(field)))))
elseif !isvoid(target_type) && isvoid(source_type) # target not there yet, maybe we can decompose though (e.g. normals)
push!(expr.args, :(decompose($(HM1.parameters[i]), primitive)))
Expand Down
5 changes: 4 additions & 1 deletion test/meshes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ end
mesh = PlainMesh{eltype(VT), FT}(vertices=vs, faces=fs)
@test convert(GLNormalMesh, mesh) == GLNormalMesh(vs, fs)
end

@testset "construction" begin
# test for https://github.com/JuliaGeometry/GeometryTypes.jl/issues/92
m = HomogenousMesh(vs, fs)
@test HomogenousMesh(m) == m
end


Expand Down