diff --git a/Manifest.toml b/Manifest.toml index 43f779d..2c85c68 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -6,8 +6,8 @@ version = "0.3.2" [[AbstractPlotting]] deps = ["ColorBrewer", "ColorTypes", "Colors", "Contour", "FileIO", "FixedPointNumbers", "FreeType", "FreeTypeAbstraction", "GeometryTypes", "IntervalSets", "LinearAlgebra", "Markdown", "Observables", "Packing", "PlotUtils", "Printf", "Random", "Serialization", "Showoff", "SignedDistanceFields", "StaticArrays", "Statistics", "UnicodeFun"] -git-tree-sha1 = "8c2b1f93b85ae6e119a9e64df8bf3d82daee5d73" -repo-rev = "sd-manifest" +git-tree-sha1 = "5946b2ffd88af5d7a84afecfb35f1f84b089e9ab" +repo-rev = "master" repo-url = "https://github.com/JuliaPlots/AbstractPlotting.jl.git" uuid = "537997a7-5e4e-5d89-9595-2241ea00577e" version = "0.9.0" @@ -235,6 +235,12 @@ git-tree-sha1 = "035e2b5e9c335afae1e92ecfe532cf0620da869f" uuid = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98" version = "2.3.0" +[[GLMakie]] +deps = ["AbstractPlotting", "AxisArrays", "ColorBrewer", "ColorTypes", "ColorVectorSpace", "Colors", "Contour", "FileIO", "FixedPointNumbers", "FreeType", "FreeTypeAbstraction", "GLFW", "GeometryTypes", "ImageAxes", "ImageCore", "ImageMagick", "ImageTransformations", "IndirectArrays", "IntervalSets", "IterTools", "LinearAlgebra", "Makie", "Markdown", "ModernGL", "Observables", "Pkg", "PlotUtils", "Primes", "Printf", "QuartzImageIO", "Serialization", "Showoff", "StaticArrays", "UnicodeFun"] +git-tree-sha1 = "2e3cb969fd8f8cab98a4863d4a97d24bb1efdbd0" +uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a" +version = "0.0.1" + [[GeometryTypes]] deps = ["ColorTypes", "FixedPointNumbers", "IterTools", "LinearAlgebra", "StaticArrays", "Test"] git-tree-sha1 = "28b193e14466beecf928449e0f8505ff6de3709d" @@ -350,6 +356,14 @@ git-tree-sha1 = "c443e1c8d58a4e9f61b708ad0a88286c7042145b" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" version = "0.4.4" +[[Makie]] +deps = ["AbstractPlotting", "AxisArrays", "Base64", "ColorBrewer", "ColorTypes", "ColorVectorSpace", "Colors", "Contour", "FileIO", "FixedPointNumbers", "FreeType", "FreeTypeAbstraction", "GLFW", "GLMakie", "GeometryTypes", "ImageAxes", "ImageCore", "ImageMagick", "ImageTransformations", "IndirectArrays", "IntervalSets", "IterTools", "LinearAlgebra", "MakieGallery", "ModernGL", "Observables", "Pkg", "PlotUtils", "Primes", "QuartzImageIO", "Showoff", "StaticArrays", "Statistics", "UnicodeFun"] +git-tree-sha1 = "03fa9413877a6740b30cc18a0a3d4cb427ea09f1" +repo-rev = "master" +repo-url = "https://github.com/JuliaPlots/Makie.jl.git" +uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" +version = "0.9.0" + [[MakieGallery]] deps = ["AbstractPlotting", "BinaryProvider", "ColorTypes", "ColorVectorSpace", "Colors", "DataFrames", "Documenter", "FileIO", "FixedPointNumbers", "GDAL", "GeometryTypes", "ImageCore", "ImageFiltering", "ImageMagick", "ImageTransformations", "LinearAlgebra", "Markdown", "MeshIO", "ModernGL", "Pkg", "QuartzImageIO", "RDatasets", "Random", "Statistics", "Test"] git-tree-sha1 = "8885eed8b027d8a3b1d0b2aa5aaa997ad9df4158" diff --git a/Project.toml b/Project.toml index 504191b..f55b986 100644 --- a/Project.toml +++ b/Project.toml @@ -24,6 +24,7 @@ IndirectArrays = "9b13fd28-a010-5f03-acff-a1bbcff69959" IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953" IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" MakieGallery = "dbd62bd0-c9f5-5087-a2e1-f5c4bb0cec90" Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" ModernGL = "66fc600b-dfda-50eb-8b99-91cfa97b1301" diff --git a/src/drawing_primitives.jl b/src/drawing_primitives.jl index ffb7057..e1713b1 100644 --- a/src/drawing_primitives.jl +++ b/src/drawing_primitives.jl @@ -405,7 +405,6 @@ function draw_atomic(screen::GLScreen, scene::Scene, vol::Volume) ) convert(Mat4f0, m) * m2 end - delete!(gl_attributes, :color) visualize(vol[4], Style(:default), gl_attributes).children[] end end