Merge pull request Duet3D#379 from Duet3D/HotFix/gcodeviewer-objectse…

…lection Object selection was not functioning properly
abates-dentsu · Aug 10, 2021 · bd70c87 · bd70c87
2 parents 7d12f31 + 500c477
commit bd70c87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/plugins/GCodeViewer/viewer/gcodeviewer.js b/src/plugins/GCodeViewer/viewer/gcodeviewer.js
@@ -113,7 +113,7 @@ export default class {
     this.orbitCamera = new ArcRotateCamera('Camera', Math.PI / 2, 2.356194, 250, new Vector3(bedCenter.x, -2, bedCenter.y), this.scene);
     this.orbitCamera.invertRotation = false;
     this.orbitCamera.attachControl(this.canvas, false);
-    this.orbitCamera.maxZ = 100000000;
+    this.orbitCamera.maxZ = 100000;
     this.orbitCamera.lowerRadiusLimit = 10;
     this.updateCameraInertiaProperties()
     //    this.orbitCamera.wheelDeltaPercentage = 0.02;

diff --git a/src/plugins/HeightMap/3dbjs.js b/src/plugins/HeightMap/3dbjs.js
@@ -1,3 +1,4 @@
+'use strict'
 
 import { Engine } from '@babylonjs/core/Engines/engine'
 import { Scene } from '@babylonjs/core/scene'
@@ -83,7 +84,7 @@ export default class {
             this.orbitCamera = new ArcRotateCamera('Camera', 0, 0, 250, new Vector3(0, 0, 0), this.scene);
             this.orbitCamera.invertRotation = false;
             this.orbitCamera.attachControl(this.canvas, true);
-            this.orbitCamera.maxZ = 1000000;
+            this.orbitCamera.maxZ = 100000;
             this.orbitCamera.lowerRadiusLimit = 10;
 
             //Motion Settings
@@ -304,7 +305,7 @@ export default class {
 
         this.bedMesh.isPickable = false;
 
-        this.advancedTexture = AdvancedDynamicTexture.CreateFullscreenUI("UI");
+        this.advancedTexture = AdvancedDynamicTexture.CreateFullscreenUI("UI", true, this.scene);
         //build axes labels
             this.axesLabelMeshes.forEach(mesh => mesh.dispose());
             this.axesLabelMeshes = [];