Merge pull request #12 from rdeits/webpack

rdeits · web-flow · commit b16e257f7590 · 2018-04-13T17:28:06.000-04:00
use new webpack-packaged meshcat viewer
diff --git a/src/meshcat/__init__.py b/src/meshcat/__init__.py
@@ -12,7 +12,6 @@ def viewer_assets_path():
     return os.path.abspath(
         os.path.join(
             os.path.dirname(__file__),
-            "viewer",
-            "static"
+            "viewer"
         )
     )
diff --git a/src/meshcat/servers/zmqserver.py b/src/meshcat/servers/zmqserver.py
@@ -27,8 +27,8 @@
 ioloop.install()
 
 
-VIEWER_ROOT = os.path.join(os.path.dirname(__file__), "..", "viewer", "static")
-VIEWER_HTML = "meshcat.html"
+VIEWER_ROOT = os.path.join(os.path.dirname(__file__), "..", "viewer", "dist")
+VIEWER_HTML = "index.html"
 
 DEFAULT_FILESERVER_PORT = 7000
 MAX_ATTEMPTS = 1000
diff --git a/src/meshcat/viewer b/src/meshcat/viewer
@@ -1 +1 @@
-Subproject commit 0204b70fef334cd715a0717d3cf1c5098b51b8ae
+Subproject commit 86146a03a3e72dd4d8f10aeee77a45810b369555
