3D Viewer WIP

app/js/viewer.js

@@ -274,15 +274,6 @@ function init3D() {
       antialias: false,
       preserveDrawingBuffer: true
     });
-
-  } else if (canvas) {
-    printLog('No WebGL Support found on this computer! Disabled 3D Viewer - Sorry!');
-    return false;
-    $('#gcodeviewertab').hide()
-    // renderer = new THREE.CanvasRenderer();
-
-  };
-
     // ThreeJS Render/Control/Camera
     scene = new THREE.Scene();
     camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 20000);
@@ -332,6 +323,16 @@ function init3D() {
       animate();
     }, 200)
 
+  } else if (canvas) {
+    printLog('No WebGL Support found on this computer! Disabled 3D Viewer - Sorry!');
+    $('#gcodeviewertab').hide()
+    // renderer = new THREE.CanvasRenderer();
+
+    return false;
+  };
+
+
+
 }
 
 function animate() {

app/js/websocket.js

@@ -10,6 +10,16 @@ var simstopped = false;
 var bellstate = false;
 var toast = Metro.toast.create;
 
+var webgl = (function() {
+  try {
+    return !!window.WebGLRenderingContext && !!document.createElement('canvas').getContext('experimental-webgl');
+  } catch (e) {
+    return false;
+  }
+})();
+
+
+
 $(document).ready(function() {
   initSocket();
 
@@ -248,6 +258,7 @@ function initSocket() {
       $('#zPos').html(zpos);
     }
 
+    if (webgl) {
       if (!isJogWidget) {
         if (!simRunning) {
           cone.position.x = status.machine.position.work.x
@@ -255,6 +266,7 @@ function initSocket() {
           cone.position.z = (parseFloat(status.machine.position.work.z) + 20)
         }
       }
+    }
 
     // $('#T0CurTemp').html(status.machine.temperature.actual.t0.toFixed(1) + " / " + status.machine.temperature.setpoint.t0.toFixed(1));
     // $('#T1CurTemp').html(status.machine.temperature.actual.t1.toFixed(1) + " / " + status.machine.temperature.setpoint.t1.toFixed(1));