Small fix

gbiobob · Jan 24, 2016 · f778457 · f778457
1 parent 20f50fd
commit f778457
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/js/components/galaxy.class.js b/js/components/galaxy.class.js
@@ -58,7 +58,7 @@ var Galaxy = {
     img.src = Ed3d.basePath + "textures/heightmap7.jpg";
 
     //-- Add optional infos
-    if(Ed3d.showGalaxyInfos) this.showGalaxyInfos();
+    this.showGalaxyInfos();
 
   },
 
@@ -69,6 +69,7 @@ var Galaxy = {
   'showGalaxyInfos' : function() {
 
     this.infos = new THREE.Object3D();
+    if(!Ed3d.showGalaxyInfos) return;
 
     $.getJSON(Ed3d.basePath + "data/milkyway.json", function(data) {
 

diff --git a/js/ed3dmap.js b/js/ed3dmap.js
@@ -579,6 +579,7 @@ function enableFarView (scale, withAnim) {
 
   //-- Enable 2D galaxy
   Galaxy.milkyway2D.visible = true;
+  Galaxy.infos.visible = true;
 
 
   //Galaxy.obj.scale.set(20,20,20);
@@ -623,6 +624,7 @@ function disableFarView(scale, withAnim) {
 
   //-- Disable 2D galaxy
   Galaxy.milkyway2D.visible = false;
+  Galaxy.infos.visible = false;
 
   //-- Show element
   Galaxy.milkyway[0].material.size = 16;

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