diff --git a/.gitignore b/.gitignore index 6009346..5d454ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .ipynb_checkpoints deps/build.log +Manifest.toml diff --git a/.travis.yml b/.travis.yml index d9b54d1..0c7e97f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ matrix: - os: linux julia: 1.1 env: TESTCMD="xvfb-run julia" + - os: linux + julia: 1.2 + env: TESTCMD="xvfb-run julia" - os: linux julia: nightly env: TESTCMD="xvfb-run julia" @@ -39,6 +42,8 @@ before_install: script: - julia --color=yes -e "using Pkg; if VERSION >= v\"1.1.0-rc1\"; Pkg.build(verbose=true); else Pkg.build(); end" + # work-around for https://github.com/JuliaWeb/MbedTLS.jl/issues/193 + - julia --color=yes -e "using Pkg; if VERSION >= v\"1.2.0\"; Pkg.update(\"MbedTLS\"); end" - $TESTCMD --check-bounds=yes --color=yes -e 'using Pkg; Pkg.test("MeshCat", coverage=true)' - julia --color=yes -e 'using MeshCat; MeshCat.develop_meshcat_assets(true)' - julia --color=yes -e 'import Pkg; Pkg.build("MeshCat")' diff --git a/Manifest.toml b/Manifest.toml deleted file mode 100644 index cf75e4f..0000000 --- a/Manifest.toml +++ /dev/null @@ -1,315 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -[[AssetRegistry]] -deps = ["Distributed", "JSON", "Pidfile", "SHA", "Test"] -git-tree-sha1 = "b25e88db7944f98789130d7b503276bc34bc098e" -uuid = "bf4720bc-e11a-5d0c-854e-bdca1663c893" -version = "0.1.0" - -[[Base64]] -uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" - -[[BinDeps]] -deps = ["Compat", "Libdl", "SHA", "URIParser"] -git-tree-sha1 = "12093ca6cdd0ee547c39b1870e0c9c3f154d9ca9" -uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" -version = "0.8.10" - -[[BinaryProvider]] -deps = ["Libdl", "Logging", "SHA"] -git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.6" - -[[CSTParser]] -deps = ["Tokenize"] -git-tree-sha1 = "376a39f1862000442011390f1edf5e7f4dcc7142" -uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f" -version = "0.6.0" - -[[Cassette]] -git-tree-sha1 = "09aed2c4093e9ed29b08f6660ad959fcb6847cd1" -uuid = "7057c7e9-c182-5462-911a-8362d720325c" -version = "0.2.5" - -[[ColorTypes]] -deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "10050a24b09e8e41b951e9976b109871ce98d965" -uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.8.0" - -[[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport", "Test"] -git-tree-sha1 = "9f0a0210450acb91c730b730a994f8eef1d3d543" -uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.9.5" - -[[Compat]] -deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "84aa74986c5b9b898b0d1acaf3258741ee64754f" -uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "2.1.0" - -[[CoordinateTransformations]] -deps = ["Compat", "Rotations", "StaticArrays"] -git-tree-sha1 = "47f05d0b7f4999609f92e657147df000818c1f24" -uuid = "150eb455-5306-5404-9cee-2592286d6298" -version = "0.5.0" - -[[DataStructures]] -deps = ["InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "0809951a1774dc724da22d26e4289bbaab77809a" -uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.0" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[DelimitedFiles]] -deps = ["Mmap"] -uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" - -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - -[[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "0513f1a8991e9d83255e0140aace0d0fc4486600" -uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.0" - -[[FileWatching]] -uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" - -[[FixedPointNumbers]] -git-tree-sha1 = "d14a6fa5890ea3a7e5dcab6811114f132fec2b4b" -uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" -version = "0.6.1" - -[[FunctionalCollections]] -deps = ["Test"] -git-tree-sha1 = "04cb9cfaa6ba5311973994fe3496ddec19b6292a" -uuid = "de31a74c-ac4f-5751-b3fd-e18cd04993ca" -version = "0.5.0" - -[[GeometryTypes]] -deps = ["ColorTypes", "FixedPointNumbers", "IterTools", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "2b0bfb379a54bdfcd2942f388f7d045f8952373d" -uuid = "4d00f742-c7ba-57c2-abde-4428a4b178cb" -version = "0.7.5" - -[[HTTP]] -deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "03ddc88af7f2d963fac5aa9f3ac8e11914d68a78" -uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.4" - -[[Hiccup]] -deps = ["MacroTools", "Test"] -git-tree-sha1 = "6187bb2d5fcbb2007c39e7ac53308b0d371124bd" -uuid = "9fb69e20-1954-56bb-a84f-559cc56a8ff7" -version = "0.2.2" - -[[IniFile]] -deps = ["Test"] -git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8" -uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" -version = "0.5.0" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[IterTools]] -git-tree-sha1 = "2ebe60d7343962966d1779a74a760f13217a6901" -uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" -version = "1.2.0" - -[[JSExpr]] -deps = ["JSON", "MacroTools", "Observables", "Test", "WebIO"] -git-tree-sha1 = "013bc2143a2e84ea489365cf30db3407deb540c2" -uuid = "97c1335a-c9c5-57fe-bc5d-ec35cebe8660" -version = "0.5.0" - -[[JSON]] -deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"] -git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa" -uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.20.0" - -[[Lazy]] -deps = ["Compat", "MacroTools", "Test"] -git-tree-sha1 = "aec38c7e7f255a678af22651c74100e3cd39ea20" -uuid = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0" -version = "0.13.2" - -[[LibGit2]] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - -[[Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - -[[LinearAlgebra]] -deps = ["Libdl"] -uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - -[[MacroTools]] -deps = ["CSTParser", "Compat", "DataStructures", "Test", "Tokenize"] -git-tree-sha1 = "d6e9dedb8c92c3465575442da456aec15a89ff76" -uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.1" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" - -[[MbedTLS]] -deps = ["BinaryProvider", "Dates", "Distributed", "Libdl", "Random", "Sockets", "Test"] -git-tree-sha1 = "2d94286a9c2f52c63a16146bb86fd6cdfbf677c6" -uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "0.6.8" - -[[Mmap]] -uuid = "a63ad114-7e13-5084-954f-fe012c677804" - -[[MsgPack]] -deps = ["Compat", "Random", "Test"] -git-tree-sha1 = "c44b3470fa98705f9c12cb44ec9504de3af027ad" -uuid = "99f44e22-a591-53d1-9472-aa23ef4bd671" -version = "0.2.0" - -[[Mux]] -deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Lazy", "Pkg", "Sockets", "Test", "WebSockets"] -git-tree-sha1 = "5b41f03d63400c290bab4e1a49fb9ac36de1084a" -uuid = "a975b10e-0019-58db-a62f-e48ff68538c9" -version = "0.7.0" - -[[Observables]] -deps = ["Test"] -git-tree-sha1 = "dc02cec22747d1d10d9f70d8a1c03432b5bfbcd0" -uuid = "510215fc-4207-5dde-b226-833fc4488ee2" -version = "0.2.3" - -[[OrderedCollections]] -deps = ["Random", "Serialization", "Test"] -git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1" -uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.1.0" - -[[Parameters]] -deps = ["Markdown", "OrderedCollections", "REPL", "Test"] -git-tree-sha1 = "70bdbfb2bceabb15345c0b54be4544813b3444e4" -uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" -version = "0.10.3" - -[[Pidfile]] -deps = ["FileWatching", "Test"] -git-tree-sha1 = "1ffd82728498b5071cde851bbb7abd780d4445f3" -uuid = "fa939f87-e72e-5be4-a000-7fc836dbe307" -version = "1.1.0" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - -[[Random]] -deps = ["Serialization"] -uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[Reexport]] -deps = ["Pkg"] -git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" -uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "0.2.0" - -[[Requires]] -deps = ["Test"] -git-tree-sha1 = "f6fbf4ba64d295e146e49e021207993b6b48c7d1" -uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "0.5.2" - -[[Rotations]] -deps = ["LinearAlgebra", "Random", "StaticArrays", "Statistics", "Test"] -git-tree-sha1 = "dfb3ceb177a59f25fee4e2f26c1aeb92b73d3a0e" -uuid = "6038ab10-8711-5258-84ad-4b1120ba62dc" -version = "0.11.1" - -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - -[[Serialization]] -uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" - -[[SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - -[[Sockets]] -uuid = "6462fe0b-24de-5631-8697-dd941f90decc" - -[[SparseArrays]] -deps = ["LinearAlgebra", "Random"] -uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - -[[StaticArrays]] -deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "db23bbf50064c582b6f2b9b043c8e7e98ea8c0c6" -uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.11.0" - -[[Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] -uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" - -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[Tokenize]] -git-tree-sha1 = "0de343efc07da00cd449d5b04e959ebaeeb3305d" -uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624" -version = "0.5.4" - -[[URIParser]] -deps = ["Test", "Unicode"] -git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69" -uuid = "30578b45-9adc-5946-b283-645ec420af67" -version = "0.4.0" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - -[[WebIO]] -deps = ["AssetRegistry", "Base64", "Compat", "Distributed", "FunctionalCollections", "JSON", "Logging", "Observables", "Random", "Requires", "Sockets", "UUIDs", "WebSockets", "Widgets"] -git-tree-sha1 = "458ebbd85da851b01bed01e6321b0d8f4c7044b0" -uuid = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" -version = "0.8.6" - -[[WebSockets]] -deps = ["Base64", "Dates", "Distributed", "HTTP", "Logging", "Random", "Sockets", "Test"] -git-tree-sha1 = "13f763d38c7a05688938808b49cb29b18b60c8c8" -uuid = "104b5d7c-a370-577a-8038-80a2059c5097" -version = "1.5.2" - -[[Widgets]] -deps = ["Colors", "Dates", "Observables", "OrderedCollections", "Test"] -git-tree-sha1 = "c53befc70c6b91eaa2a9888c2f6ac2d92720a81b" -uuid = "cc8bc4a8-27d6-5769-a93b-9d913e69aa62" -version = "0.6.1" diff --git a/Project.toml b/Project.toml index ace0bc9..c34f384 100644 --- a/Project.toml +++ b/Project.toml @@ -26,11 +26,11 @@ WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" [compat] AssetRegistry = "0.1" -Cassette = "≥ 0.2.5" +Cassette = "0.2.5" GeometryTypes = "0.6, 0.7" JSExpr = "0.3, 0.5" Mux = "0.7" -WebIO = "0.8" +WebIO = "0.8.11" julia = "0.7, 1" [extras] diff --git a/appveyor.yml b/appveyor.yml index 699ba9d..65481e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ environment: matrix: - julia_version: 1 - julia_version: 1.1 + - julia_version: 1.2 - julia_version: nightly platform: diff --git a/deps/build.jl b/deps/build.jl index c4be771..8f48c23 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -2,7 +2,7 @@ using Base.Filesystem using BinDeps: unpack_cmd, download_cmd -const meshcat_sha = "3122cecd5da022ad96bb0c8dc0f811a1bc492350" +const meshcat_sha = "2628e6020f510ffa8fef52123e2941f7fef39428" const meshcat_url = "https://github.com/rdeits/meshcat/archive/$meshcat_sha.zip" const assets_dir = normpath(joinpath(@__DIR__, "..", "assets")) diff --git a/notebooks/Manifest.toml b/notebooks/Manifest.toml deleted file mode 100644 index e178769..0000000 --- a/notebooks/Manifest.toml +++ /dev/null @@ -1,343 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -[[AssetRegistry]] -deps = ["Distributed", "JSON", "Pidfile", "SHA", "Test"] -git-tree-sha1 = "b25e88db7944f98789130d7b503276bc34bc098e" -uuid = "bf4720bc-e11a-5d0c-854e-bdca1663c893" -version = "0.1.0" - -[[Base64]] -uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" - -[[BinDeps]] -deps = ["Compat", "Libdl", "SHA", "URIParser"] -git-tree-sha1 = "12093ca6cdd0ee547c39b1870e0c9c3f154d9ca9" -uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" -version = "0.8.10" - -[[BinaryProvider]] -deps = ["Libdl", "Logging", "SHA"] -git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.6" - -[[CSTParser]] -deps = ["Tokenize"] -git-tree-sha1 = "376a39f1862000442011390f1edf5e7f4dcc7142" -uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f" -version = "0.6.0" - -[[Cassette]] -git-tree-sha1 = "2f5d4d747eb39ce6410438993e00ccd5a0f4bc27" -uuid = "7057c7e9-c182-5462-911a-8362d720325c" -version = "0.2.4" - -[[ColorTypes]] -deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "10050a24b09e8e41b951e9976b109871ce98d965" -uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.8.0" - -[[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport", "Test"] -git-tree-sha1 = "9f0a0210450acb91c730b730a994f8eef1d3d543" -uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.9.5" - -[[Compat]] -deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "84aa74986c5b9b898b0d1acaf3258741ee64754f" -uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "2.1.0" - -[[CoordinateTransformations]] -deps = ["Compat", "Rotations", "StaticArrays"] -git-tree-sha1 = "47f05d0b7f4999609f92e657147df000818c1f24" -uuid = "150eb455-5306-5404-9cee-2592286d6298" -version = "0.5.0" - -[[DataStructures]] -deps = ["InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "0809951a1774dc724da22d26e4289bbaab77809a" -uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.0" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[DelimitedFiles]] -deps = ["Mmap"] -uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" - -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - -[[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "0513f1a8991e9d83255e0140aace0d0fc4486600" -uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.0" - -[[FileIO]] -deps = ["Pkg"] -git-tree-sha1 = "351f001a78aa1b7ad2696e386e110b5abd071c71" -uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.0.7" - -[[FileWatching]] -uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" - -[[FixedPointNumbers]] -git-tree-sha1 = "d14a6fa5890ea3a7e5dcab6811114f132fec2b4b" -uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" -version = "0.6.1" - -[[FunctionalCollections]] -deps = ["Test"] -git-tree-sha1 = "04cb9cfaa6ba5311973994fe3496ddec19b6292a" -uuid = "de31a74c-ac4f-5751-b3fd-e18cd04993ca" -version = "0.5.0" - -[[GeometryTypes]] -deps = ["ColorTypes", "FixedPointNumbers", "IterTools", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "2b0bfb379a54bdfcd2942f388f7d045f8952373d" -uuid = "4d00f742-c7ba-57c2-abde-4428a4b178cb" -version = "0.7.5" - -[[HTTP]] -deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "03ddc88af7f2d963fac5aa9f3ac8e11914d68a78" -uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.4" - -[[Hiccup]] -deps = ["MacroTools", "Test"] -git-tree-sha1 = "6187bb2d5fcbb2007c39e7ac53308b0d371124bd" -uuid = "9fb69e20-1954-56bb-a84f-559cc56a8ff7" -version = "0.2.2" - -[[IniFile]] -deps = ["Test"] -git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8" -uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" -version = "0.5.0" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[IterTools]] -git-tree-sha1 = "2ebe60d7343962966d1779a74a760f13217a6901" -uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" -version = "1.2.0" - -[[JSExpr]] -deps = ["JSON", "MacroTools", "Observables", "Test", "WebIO"] -git-tree-sha1 = "013bc2143a2e84ea489365cf30db3407deb540c2" -uuid = "97c1335a-c9c5-57fe-bc5d-ec35cebe8660" -version = "0.5.0" - -[[JSON]] -deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"] -git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa" -uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.20.0" - -[[Lazy]] -deps = ["Compat", "MacroTools", "Test"] -git-tree-sha1 = "aec38c7e7f255a678af22651c74100e3cd39ea20" -uuid = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0" -version = "0.13.2" - -[[LibGit2]] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - -[[Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - -[[LinearAlgebra]] -deps = ["Libdl"] -uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - -[[MacroTools]] -deps = ["CSTParser", "Compat", "DataStructures", "Test"] -git-tree-sha1 = "daecd9e452f38297c686eba90dba2a6d5da52162" -uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.0" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" - -[[MbedTLS]] -deps = ["BinaryProvider", "Dates", "Distributed", "Libdl", "Random", "Sockets", "Test"] -git-tree-sha1 = "2d94286a9c2f52c63a16146bb86fd6cdfbf677c6" -uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "0.6.8" - -[[MeshCat]] -deps = ["AssetRegistry", "Base64", "BinDeps", "Cassette", "Colors", "CoordinateTransformations", "DocStringExtensions", "GeometryTypes", "JSExpr", "LinearAlgebra", "MsgPack", "Mux", "Parameters", "Requires", "Rotations", "Sockets", "StaticArrays", "UUIDs", "WebIO"] -path = ".." -uuid = "283c5d60-a78f-5afe-a0af-af636b173e11" -version = "0.8.0" - -[[MeshIO]] -deps = ["ColorTypes", "FileIO", "GeometryTypes", "Printf", "Test"] -git-tree-sha1 = "3e01e12c4c626578a9d47fac0d15c9fe8dad5139" -uuid = "7269a6da-0436-5bbc-96c2-40638cbb6118" -version = "0.3.1" - -[[Meshing]] -deps = ["GeometryTypes", "LinearAlgebra", "Profile", "Statistics", "Test"] -git-tree-sha1 = "4a61ec51d3f1548f779ae46ff43638797a96de92" -uuid = "e6723b4c-ebff-59f1-b4b7-d97aa5274f73" -version = "0.4.1" - -[[Mmap]] -uuid = "a63ad114-7e13-5084-954f-fe012c677804" - -[[MsgPack]] -deps = ["Compat", "Random", "Test"] -git-tree-sha1 = "c44b3470fa98705f9c12cb44ec9504de3af027ad" -uuid = "99f44e22-a591-53d1-9472-aa23ef4bd671" -version = "0.2.0" - -[[Mux]] -deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Lazy", "Pkg", "Sockets", "Test", "WebSockets"] -git-tree-sha1 = "5b41f03d63400c290bab4e1a49fb9ac36de1084a" -uuid = "a975b10e-0019-58db-a62f-e48ff68538c9" -version = "0.7.0" - -[[Observables]] -deps = ["Test"] -git-tree-sha1 = "dc02cec22747d1d10d9f70d8a1c03432b5bfbcd0" -uuid = "510215fc-4207-5dde-b226-833fc4488ee2" -version = "0.2.3" - -[[OrderedCollections]] -deps = ["Random", "Serialization", "Test"] -git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1" -uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.1.0" - -[[Parameters]] -deps = ["Markdown", "OrderedCollections", "REPL", "Test"] -git-tree-sha1 = "70bdbfb2bceabb15345c0b54be4544813b3444e4" -uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" -version = "0.10.3" - -[[Pidfile]] -deps = ["FileWatching", "Test"] -git-tree-sha1 = "1ffd82728498b5071cde851bbb7abd780d4445f3" -uuid = "fa939f87-e72e-5be4-a000-7fc836dbe307" -version = "1.1.0" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[Profile]] -deps = ["Printf"] -uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - -[[Random]] -deps = ["Serialization"] -uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[Reexport]] -deps = ["Pkg"] -git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" -uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "0.2.0" - -[[Requires]] -deps = ["Test"] -git-tree-sha1 = "f6fbf4ba64d295e146e49e021207993b6b48c7d1" -uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "0.5.2" - -[[Rotations]] -deps = ["LinearAlgebra", "Random", "StaticArrays", "Statistics", "Test"] -git-tree-sha1 = "dfb3ceb177a59f25fee4e2f26c1aeb92b73d3a0e" -uuid = "6038ab10-8711-5258-84ad-4b1120ba62dc" -version = "0.11.1" - -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - -[[Serialization]] -uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" - -[[SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - -[[Sockets]] -uuid = "6462fe0b-24de-5631-8697-dd941f90decc" - -[[SparseArrays]] -deps = ["LinearAlgebra", "Random"] -uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - -[[StaticArrays]] -deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "db23bbf50064c582b6f2b9b043c8e7e98ea8c0c6" -uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.11.0" - -[[Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] -uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" - -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[Tokenize]] -git-tree-sha1 = "0de343efc07da00cd449d5b04e959ebaeeb3305d" -uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624" -version = "0.5.4" - -[[URIParser]] -deps = ["Test", "Unicode"] -git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69" -uuid = "30578b45-9adc-5946-b283-645ec420af67" -version = "0.4.0" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - -[[WebIO]] -deps = ["AssetRegistry", "Base64", "Compat", "Distributed", "FunctionalCollections", "JSON", "Logging", "Observables", "Random", "Requires", "Sockets", "UUIDs", "WebSockets", "Widgets"] -git-tree-sha1 = "458ebbd85da851b01bed01e6321b0d8f4c7044b0" -uuid = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" -version = "0.8.6" - -[[WebSockets]] -deps = ["Base64", "Dates", "Distributed", "HTTP", "Logging", "Random", "Sockets", "Test"] -git-tree-sha1 = "13f763d38c7a05688938808b49cb29b18b60c8c8" -uuid = "104b5d7c-a370-577a-8038-80a2059c5097" -version = "1.5.2" - -[[Widgets]] -deps = ["Colors", "Dates", "Observables", "OrderedCollections", "Test"] -git-tree-sha1 = "c53befc70c6b91eaa2a9888c2f6ac2d92720a81b" -uuid = "cc8bc4a8-27d6-5769-a93b-9d913e69aa62" -version = "0.6.1" diff --git a/notebooks/Project.toml b/notebooks/Project.toml index 81164b6..8326ff3 100644 --- a/notebooks/Project.toml +++ b/notebooks/Project.toml @@ -6,3 +6,11 @@ GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb" MeshCat = "283c5d60-a78f-5afe-a0af-af636b173e11" MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118" Meshing = "e6723b4c-ebff-59f1-b4b7-d97aa5274f73" + +[compat] +Colors = "0.9" +CoordinateTransformations = "0.5" +FileIO = "1" +GeometryTypes = "0.7" +MeshIO = "0.3" +Meshing = "0.4" diff --git a/notebooks/animation.ipynb b/notebooks/animation.ipynb index de9dbe4..1ca691b 100644 --- a/notebooks/animation.ipynb +++ b/notebooks/animation.ipynb @@ -19,9 +19,8 @@ "source": [ "# Optional: \n", "# These commands tell the Julia package manager to use the exact\n", - "# set of dependencies specified in the Project.toml and\n", - "# Manifest.toml files in this folder. That should\n", - "# give you a nice, reproducible environment for testing. \n", + "# set of dependencies specified in the Project.toml file in this folder. \n", + "# That should give you a nice, reproducible environment for testing. \n", "\n", "using Pkg\n", "Pkg.activate(@__DIR__)\n", diff --git a/notebooks/demo.ipynb b/notebooks/demo.ipynb index cf3c998..e3f30bc 100644 --- a/notebooks/demo.ipynb +++ b/notebooks/demo.ipynb @@ -17,9 +17,8 @@ "source": [ "# Optional: \n", "# These commands tell the Julia package manager to use the exact\n", - "# set of dependencies specified in the Project.toml and\n", - "# Manifest.toml files in this folder. That should\n", - "# give you a nice, reproducible environment for testing. \n", + "# set of dependencies specified in the Project.toml file in this folder. \n", + "# That should give you a nice, reproducible environment for testing. \n", "\n", "using Pkg\n", "Pkg.activate(@__DIR__)\n", diff --git a/src/visualizer.jl b/src/visualizer.jl index 9b3f12b..886ce36 100644 --- a/src/visualizer.jl +++ b/src/visualizer.jl @@ -7,7 +7,7 @@ mutable struct CoreVisualizer controls::Dict{String, Tuple{Observable, AbstractControl}} function CoreVisualizer() - scope = WebIO.Scope(imports=ASSET_KEYS) + scope = WebIO.Scope(imports=ASSET_KEYS, outbox=Channel{Any}(Inf)) command_channel = Observable(scope, "meshcat-command", UInt8[]) request_channel = Observable(scope, "meshcat-request", "") controls_channel = Observable(scope, "meshcat-controls", []) @@ -115,16 +115,8 @@ end function Base.wait(c::CoreVisualizer) pool = c.scope.pool - while true - while isready(pool.new_connections) - push!(pool.connections, take!(pool.new_connections)) - end - if !isempty(pool.connections) - break - else - sleep(0.25) - end - end + WebIO.ensure_connection(pool) + nothing end """