Skip to content

Commit

Permalink
Update meshcat core
Browse files Browse the repository at this point in the history
Comparison of differences in meshcat: meshcat-dev/meshcat@978cb8f...e87530b
  • Loading branch information
ferrolho committed Mar 17, 2024
1 parent ff4679f commit 545a917
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
7 changes: 4 additions & 3 deletions Artifacts.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[meshcat]
git-tree-sha1 = "15c3973b1084a231410e43e844c7714f1c41f163"
git-tree-sha1 = "9483bce71d0d05aa0b6b20303d31f81ecddfdcc6"

[[meshcat.download]]
url = "https://github.com/rdeits/meshcat/tarball/978cb8f519f9bb540e94b7f97a39ada4d7916b7c"
sha256 = "b3a5343bd0fcaabff4fcb73c0951a32d887d1cf0c69a64b52ea957704d4d1e0a"
url = "https://github.com/meshcat-dev/meshcat/tarball/e87530b"
sha256 = "08c07cdb6abbd09529104c0ae043d8baa1b8907b6f057162d8777c9b95ecbc64"
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MeshCat"
uuid = "283c5d60-a78f-5afe-a0af-af636b173e11"
authors = ["Robin Deits <[email protected]>"]
version = "0.16.1"
version = "0.16.2"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down
4 changes: 2 additions & 2 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![codecov.io](https://codecov.io/github/rdeits/MeshCat.jl/coverage.svg?branch=master)](https://codecov.io/github/rdeits/MeshCat.jl?branch=master)
[![](https://img.shields.io/badge/docs-dev-blue.svg)](https://rdeits.github.com/MeshCat.jl/dev)

[MeshCat](https://github.com/rdeits/meshcat) is a remotely-controllable 3D viewer, built on top of [three.js](https://threejs.org/). The viewer contains a tree of objects and transformations (i.e. a scene graph) and allows those objects and transformations to be added and manipulated with simple commands. This makes it easy to create 3D visualizations of geometries, mechanisms, and robots. MeshCat.jl runs on macOS, Linux, and Windows.
[MeshCat](https://github.com/meshcat-dev/meshcat) is a remotely-controllable 3D viewer, built on top of [three.js](https://threejs.org/). The viewer contains a tree of objects and transformations (i.e. a scene graph) and allows those objects and transformations to be added and manipulated with simple commands. This makes it easy to create 3D visualizations of geometries, mechanisms, and robots. MeshCat.jl runs on macOS, Linux, and Windows.

The MeshCat viewer runs entirely in the browser, with no external dependencies. All files are served locally, so no internet connection is required. Communication between the browser and your Julia code is managed by [HTTP.jl](https://github.com/JuliaWeb/HTTP.jl). That means that MeshCat should work:

Expand Down Expand Up @@ -39,7 +39,7 @@ MeshCat.jl is a successor to [DrakeVisualizer.jl](https://github.com/rdeits/Drak

You may also want to check out:

* [meshcat-python](https://github.com/rdeits/meshcat-python): the Python implementation of the same protocol
* [meshcat-python](https://github.com/meshcat-dev/meshcat-python): the Python implementation of the same protocol
* [MeshCatMechanisms.jl](https://github.com/rdeits/MeshCatMechanisms.jl) extensions to MeshCat.jl for visualizing mechanisms, robots, and URDFs

# Examples
Expand Down
2 changes: 1 addition & 1 deletion notebooks/animation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"We can also animate object properties. For example, let's animate the camera's `zoom` property to smoothly zoom out and then back in. Note that to do this, we have to access a deeper path in the visualizer to get to the actual camera object. For more information, see: https://github.com/rdeits/meshcat#camera-control"
"We can also animate object properties. For example, let's animate the camera's `zoom` property to smoothly zoom out and then back in. Note that to do this, we have to access a deeper path in the visualizer to get to the actual camera object. For more information, see: https://github.com/meshcat-dev/meshcat#camera-control"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/artifact_helper.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Tar, Inflate, SHA

function artifact_helper(sha::AbstractString)
url = "https://github.com/rdeits/meshcat/tarball/$sha"
url = "https://github.com/meshcat-dev/meshcat/tarball/$sha"
filename = download(url)

println("""
Expand Down
2 changes: 1 addition & 1 deletion src/assets.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ function develop_meshcat_assets(skip_confirmation=false)
end
println("Removing $meshcat_dir")
rm(meshcat_dir, force=true, recursive=true)
run(`git clone https://github.com/rdeits/meshcat $meshcat_dir`)
run(`git clone https://github.com/meshcat-dev/meshcat $meshcat_dir`)
rm(joinpath(meshcat_dir, "..", "meshcat.stamp"))
end
2 changes: 1 addition & 1 deletion src/lowering.jl
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ function lower(obj::MeshFileObject)
end


# TODO: Unify these two methods once https://github.com/rdeits/meshcat/issues/50 is resolved
# TODO: Unify these two methods once https://github.com/meshcat-dev/meshcat/issues/50 is resolved
pack_mesh_file_data(s::AbstractString) = s
pack_mesh_file_data(s::AbstractVector{UInt8}) = PackedVector(s)

Expand Down
4 changes: 2 additions & 2 deletions test/scenes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ using CoordinateTransformations
add_cats!(vis)
setprop!(vis["/Lights/SpotLight"], "visible", true)
# To understand why we need the <object> here, see the documentation for
# set_property at https://github.com/rdeits/meshcat
# set_property at https://github.com/meshcat-dev/meshcat
setprop!(vis["/Lights/SpotLight/<object>"], "castShadow", true)
setprop!(vis["/Lights/DirectionalLight"], "visible", false)
# To understand why we need the <object> here, see the documentation for
# set_property at https://github.com/rdeits/meshcat
# set_property at https://github.com/meshcat-dev/meshcat
setprop!(vis["/Lights/AmbientLight/<object>"], "intensity", 0.44)
end
end
Expand Down

0 comments on commit 545a917

Please sign in to comment.