Merge branch 'refs/heads/master' into release/2.0

xyz-tools · Nov 23, 2019 · a4909fb · a4909fb
2 parents 4bf32b7 + dec9274
commit a4909fb
Show file tree

Hide file tree

Showing 40 changed files with 4,269 additions and 1,197 deletions.
diff --git a/.firebaserc b/.firebaserc
@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "gcode-preview"
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,8 @@
 src/demo/gcode-preview.js
 src/.rpt2_cache
 node_modules
-src/dist/__tests__
+dist/__tests__
+.rpt2_cache
+yarn-error.log
+.firebase/hosting.*
+TODO.md
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,5 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "singleQuote": true
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "files.exclude": {
     "**/.js.map": true
-  }
+  },
+  "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,11 +1,5 @@
 {
   // See https://go.microsoft.com/fwlink/?LinkId=733558
   // for the documentation about the tasks.json format
-  "version": "0.1.0",
-  "command": "tsc",
-  "isShellCommand": true,
-  "args": ["-w", "-p", "."],
-  "showOutput": "silent",
-  "isBackground": true,
-  "problemMatcher": "$tsc-watch"
+  "version": "2.0.0",
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
-## next
+## 2.0
+- updated demo page
+- toggle rendering of travel 
+- toggle rendering of extrusion
+- WebGL rendering with pan/zoom/rotate controls
+- added `lineWidth` option (canvas 2.5D only)
 - fully typed
-- added `lineWidth` option
 
 ## 1.0.0
 - ported to typescript

diff --git a/README.md b/README.md
@@ -1,8 +1,21 @@
-# gcode-previewer
-A simple GCode previewer written in plain javascript. Tested in Chrome only.
+# GCode Previewer
+A simple GCode parser & viewer with 3D printing in mind. Written in Typescript. 
 
-See a [demo](http://realstuffforabstractpeople.com/experiments/gcode-previewer/) here
+See a [demo](https://gcode-preview.web.app/) here
 
-<img src="https://cloud.githubusercontent.com/assets/461650/22948538/2d652a5e-f2ff-11e6-94f3-5ace7dc94682.png" width=400 />
+## WebGL 3D + pan/zoom/rotate controls
+<img src="https://user-images.githubusercontent.com/461650/69015936-812bd080-0999-11ea-94fc-67c63bf128af.png" width=400 />
+
+## Canvas 2.5D (static perspective)
+<img src="https://user-images.githubusercontent.com/461650/67150833-f9c93f80-f2bc-11e9-9887-3c721cf7bfa5.png" width=400 />
+
+
+## Known issues
+### Preview doesn't render in Brave
+This is caused by the device recognition shield in Brave. By changing the setting for "Device Recognition" in Shield settings to "Allow all device recognition attemps" or "Only block cross-site device recognition attemps" you should not get this error.
+https://github.com/mrdoob/three.js/issues/16904
+
+## Sponsors
+
+<img width=42 src="http://logo.q42.com/q42-logo.svg" />
 
-<img src="https://cloud.githubusercontent.com/assets/461650/22951718/81925114-f30a-11e6-831c-6d9ba3229447.png" width=400 />
diff --git a/demo/404.html b/demo/404.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Page Not Found</title>
+
+    <style media="screen">
+      body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
+      #message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px 16px; border-radius: 3px; }
+      #message h3 { color: #888; font-weight: normal; font-size: 16px; margin: 16px 0 12px; }
+      #message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
+      #message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
+      #message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
+      #message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
+      #message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
+      #load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
+      @media (max-width: 600px) {
+        body, #message { margin-top: 0; background: white; box-shadow: none; }
+        body { border-top: 16px solid #ffa100; }
+      }
+    </style>
+  </head>
+  <body>
+    <div id="message">
+      <h2>404</h2>
+      <h1>Page Not Found</h1>
+      <p>The specified file was not found on this website. Please check the URL for mistakes and try again.</p>
+      <h3>Why am I seeing this?</h3>
+      <p>This page was generated by the Firebase Command-Line Interface. To modify it, edit the <code>404.html</code> file in your project's configured <code>public</code> directory.</p>
+    </div>
+  </body>
+</html>