Add click out to disable object selection (+ fixes on hud)

mMONTAGEe-Workshop · Apr 18, 2016 · 35922e4 · 35922e4
1 parent 8816395
commit 35922e4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/js/components/action.class.js b/js/components/action.class.js
@@ -114,9 +114,12 @@ var Action = {
         if(intersection.object.clickable) {
 
           var indexPoint = intersection.index;
+          var selPoint = intersection.object.geometry.vertices[indexPoint];
 
-          Action.hoverOnObj(indexPoint);
-          return;
+          if(selPoint.visible) {
+            Action.hoverOnObj(indexPoint);
+            return;
+          }
         }
       }
 
@@ -227,6 +230,8 @@ var Action = {
 
     }
 
+    obj.disableSelection();
+
   },
 
   /**

diff --git a/js/components/galaxy.class.js b/js/components/galaxy.class.js
@@ -74,43 +74,44 @@ var Galaxy = {
     if(!Ed3d.showGalaxyInfos) return;
 
     this.infos = new THREE.Object3D();
+    var obj = this;
 
     $.getJSON(Ed3d.basePath + "data/milkyway.json", function(data) {
 
       $.each(data.quadrants, function(key, val) {
 
-        this.addText(key,val.x,-100,val.z,val.rotate);
+        obj.addText(key,val.x,-100,val.z,val.rotate);
 
       });
 
       $.each(data.arms, function(key, val) {
 
         $.each(val, function(keyCh, valCh) {
-          this.addText(key,valCh.x,0,valCh.z,valCh.rotate,300,true);
+          obj.addText(key,valCh.x,0,valCh.z,valCh.rotate,300,true);
         });
 
       });
 
       $.each(data.gaps, function(key, val) {
 
         $.each(val, function(keyCh, valCh) {
-          this.addText(key,valCh.x,0,valCh.z,valCh.rotate,160,true);
+          obj.addText(key,valCh.x,0,valCh.z,valCh.rotate,160,true);
         });
 
       });
 
       $.each(data.others, function(key, val) {
 
         $.each(val, function(keyCh, valCh) {
-          this.addText(key,valCh.x,0,valCh.z,valCh.rotate,160,true);
+          obj.addText(key,valCh.x,0,valCh.z,valCh.rotate,160,true);
         });
 
       });
 
 
     }).done(function() {
 
-      scene.add(this.infos);
+      scene.add(obj.infos);
 
     });
 

diff --git a/js/components/hud.class.js b/js/components/hud.class.js
@@ -20,7 +20,7 @@ var HUD = {
   'create' : function(container) {
 
     this.container = container;
-    
+
     if(!$('#'+this.container+' #controls').length && Ed3d.withOptionsPanel == true) {
 
       $('#'+this.container).append(
@@ -252,6 +252,8 @@ var HUD = {
 
       });
 
+      if(nbPoint==0) return;
+
       //-- Calc center of all selected points
       center.set(
         Math.round(center.x/nbPoint),

diff --git a/js/ed3dmap.min.js b/js/ed3dmap.min.js