Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for 1.0 #56

Merged
merged 3 commits into from
Aug 15, 2018
Merged

Fixes for 1.0 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9293d5
Import hex from Colors (no longer exported by Base).
tkoolen Aug 15, 2018
39bde45
Update Pkg usage in demo notebook.
tkoolen Aug 15, 2018
a19308c
linspace -> Compat.range
tkoolen Aug 15, 2018
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
13 changes: 9 additions & 4 deletions demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"source": [
"# Activate the MeshCat package, and import some other \n",
"# useful functions\n",
"using Compat\n",
"using MeshCat\n",
"using CoordinateTransformations\n",
"import GeometryTypes: HyperRectangle, Vec, Point, HomogenousMesh, SignedDistanceField\n",
Expand Down Expand Up @@ -335,7 +336,11 @@
"# just simple boxes. Let's load a 3D mesh and visualize it:\n",
"using MeshIO\n",
"using FileIO\n",
"cat_mesh = load(joinpath(Pkg.dir(\"GeometryTypes\"), \"test\", \"data\", \"cat.obj\"))\n",
"if VERSION < v\"0.7-\"\n",
" cat_mesh = load(joinpath(Pkg.dir(\"GeometryTypes\"), \"test\", \"data\", \"cat.obj\"))\n",
"else\n",
" cat_mesh = load(joinpath(dirname(pathof(GeometryTypes)), \"..\", \"test\", \"data\", \"cat.obj\"))\n",
"end\n",
"setobject!(vis, cat_mesh)\n",
"settransform!(vis, LinearMap(AngleAxis(pi/2, 1, 0, 0)))"
]
Expand Down Expand Up @@ -399,7 +404,7 @@
"outputs": [],
"source": [
"delete!(vis)\n",
"pointcloud = PointCloud([[x, 0 + 0.01 * randn(), 0.5] for x in linspace(-1, 1, 1000)])\n",
"pointcloud = PointCloud([[x, 0 + 0.01 * randn(), 0.5] for x in Compat.range(-1, stop=1, length=1000)])\n",
"setobject!(vis[:pointcloud], pointcloud)"
]
},
Expand Down Expand Up @@ -472,15 +477,15 @@
],
"metadata": {
"kernelspec": {
"display_name": "Julia 0.6.3",
"display_name": "Julia 0.6.4",
"language": "julia",
"name": "julia-0.6"
},
"language_info": {
"file_extension": ".jl",
"mimetype": "application/julia",
"name": "julia",
"version": "0.6.3"
"version": "0.6.4"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion src/MeshCat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Mux
import AssetRegistry
using GeometryTypes, CoordinateTransformations
using Rotations: rotation_between, Rotation
using Colors: Color, Colorant, RGB, RGBA, alpha
using Colors: Color, Colorant, RGB, RGBA, alpha, hex
using StaticArrays: StaticVector, SVector, SDiagonal
using GeometryTypes: raw
using Parameters: @with_kw
Expand Down