added transform controls

walzimmer · Dec 4, 2018 · b1d4c01 · b1d4c01
1 parent 42506cd
commit b1d4c01
Show file tree

Hide file tree

Showing 6 changed files with 1,104 additions and 873 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/index.html b/index.html
@@ -128,11 +128,12 @@
     <script src="js/lib/controls/FlyControls.js"></script>
     <!--<script src="js/lib/Lensflare.js"></script>-->
     <!--<script src="js/lib/Lensflare.js"></script>-->
+
     <script src="js/lib/Detector.js"></script>
     <script src="js/lib/stats.min.js"></script>
     <script src='js/lib/dat.gui.min.js'></script>
     <script src="js/lib/controls/FirstPersonControls.js"></script>
-    <script src="js/lib/TransformControls.js"></script>
+    <script src="js/lib/controls/TransformControls.js"></script>
     <script src='js/lib/controls/KeyboardState.js'></script>
     <script src="js/lib/controls/threex.keyboardstate.js"></script>
     <script src='js/lib/Projector.js'></script>

diff --git a/js/base_label_tool.js b/js/base_label_tool.js
@@ -1192,10 +1192,12 @@ let labelTool = {
         }
         // open folder of selected object
         let selectionIndex = annotationObjects.getSelectionIndex();
-        let channels = annotationObjects.contents[this.currentFileIndex][selectionIndex]["channels"];
-        for (let channelIdx in channels) {
-            if (channels.hasOwnProperty(channelIdx)) {
-                annotationObjects.select(selectionIndex, channels[channelIdx].channel);
+        if (selectionIndex !== -1) {
+            let channels = annotationObjects.contents[this.currentFileIndex][selectionIndex]["channels"];
+            for (let channelIdx in channels) {
+                if (channels.hasOwnProperty(channelIdx)) {
+                    annotationObjects.select(selectionIndex, channels[channelIdx].channel);
+                }
             }
         }