Skip to content

Commit

Permalink
tests passed
Browse files Browse the repository at this point in the history
  • Loading branch information
apaoluzzi committed Jul 6, 2019
1 parent 0935b5d commit 66e7196
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ version = "0.1.0"

[deps]
#LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
#StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
ModernGL = "66fc600b-dfda-50eb-8b99-91cfa97b1301"
GLFW = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98"
#QHull = "a8468747-bd6f-53ef-9e5c-744dbc5c59e7"
#LinearAlgebraicRepresentation = "95167b0c-186a-594b-a231-52369c6de044"
#precompileDataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
QHull = "a8468747-bd6f-53ef-9e5c-744dbc5c59e7"
LinearAlgebraicRepresentation = "95167b0c-186a-594b-a231-52369c6de044"
#DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

[compat]
julia = "1.0"
Expand Down
3 changes: 3 additions & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
julia 1.1
# LinearAlgebra
StaticArrays
ModernGL
GLFW
LinearAlgebraicRepresentation
QHull
4 changes: 2 additions & 2 deletions src/Geometry.jl
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ end
function GLExplode(V,FVs,sx=1.2,sy=1.2,sz=1.2,colors=1,alpha=0.2::Float64)
assembly = GL.explodecells(V,FVs,sx,sy,sz)
meshes = Any[]
for k=0:length(assembly)-1
for k=1:length(assembly)
# Lar model with constant lemgth of cells, i.e a GRID object !!
V,FV = assembly[k]
col = GL.Point4d(1,1,1,1)
Expand All @@ -520,7 +520,7 @@ function GLExplode(V,FVs,sx=1.2,sy=1.2,sz=1.2,colors=1,alpha=0.2::Float64)
elseif 2 <= colors <= 12
col = GL.COLORS[colors]
else # colors > 12: cyclic colors w random component
col = GL.COLORS[k%12+1] - (rand(Float64,4)*0.1)
col = GL.COLORS[(k-1)%12+1] - (rand(Float64,4)*0.1)
end
#col *= alpha
push!(meshes, GL.GLGrid(V,FV,col,alpha) )
Expand Down

0 comments on commit 66e7196

Please sign in to comment.