Added domElement for events, added stop_calculating method to stop the layout calculation.

Author: davidpiegza

drawings/simple_graph.js

@@ -74,6 +74,9 @@ Drawing.SimpleGraph = function(options) {
 
   function init() {
     // Three.js initialization
+    renderer = new THREE.WebGLRenderer({antialias: true});
+    renderer.setSize( window.innerWidth, window.innerHeight );
+    
     camera = new THREE.TrackballCamera({
       fov: 40, 
       aspect: window.innerWidth / window.innerHeight,
@@ -89,6 +92,8 @@ Drawing.SimpleGraph = function(options) {
 
       staticMoving: false,
       dynamicDampingFactor: 0.3,
+      
+      domElement: renderer.domElement,
 
       keys: [ 65, 83, 68 ]
     });
@@ -105,6 +110,7 @@ Drawing.SimpleGraph = function(options) {
 
     if(that.selection) {
       object_selection = new THREE.ObjectSelection({
+        domElement: renderer.domElement,
         selected: function(obj) {
           // display info
           if(obj != null) {
@@ -117,9 +123,6 @@ Drawing.SimpleGraph = function(options) {
       });
     }
 
-    renderer = new THREE.WebGLRenderer({antialias: true});
-    renderer.setSize( window.innerWidth, window.innerHeight );
-
     document.body.appendChild( renderer.domElement );
 
     // Stats.js
@@ -302,9 +305,11 @@ Drawing.SimpleGraph = function(options) {
     draw_object.materials[0].map.image = textCanvas;
   }
 
-
   function randomFromTo(from, to) {
     return Math.floor(Math.random() * (to - from + 1) + from);
   }
-
+  
+  this.stop_calculating = function() {
+    graph.layout.stop_calculating();
+  }
 }

drawings/sphere_graph.js

@@ -65,6 +65,9 @@ Drawing.SphereGraph = function(options) {
 
   function init() {
     // Three.js initialization
+    renderer = new THREE.WebGLRenderer({antialias: true});
+    renderer.setSize( window.innerWidth, window.innerHeight );
+    
     camera = new THREE.TrackballCamera({
       fov: 35, 
       aspect: window.innerWidth / window.innerHeight,
@@ -80,6 +83,8 @@ Drawing.SphereGraph = function(options) {
 
       staticMoving: false,
       dynamicDampingFactor: 0.3,
+      
+      domElement: renderer.domElement,
 
       keys: [ 65, 83, 68 ]
     });
@@ -171,6 +176,7 @@ Drawing.SphereGraph = function(options) {
 
     if(that.selection) {
       object_selection = new THREE.ObjectSelection({
+        domElement: renderer.domElement,
         selected: function(obj) {
           // display info
           if(obj != null) {
@@ -182,10 +188,6 @@ Drawing.SphereGraph = function(options) {
       });
     }
 
-    renderer = new THREE.WebGLRenderer({antialias: true});
-
-    renderer.setSize( window.innerWidth, window.innerHeight );
-
     document.body.appendChild( renderer.domElement );
 
     // Stats.js
@@ -464,9 +466,7 @@ Drawing.SphereGraph = function(options) {
       }
       str += info_text[index];
     }
-    if(str != '') {
-      document.getElementById("graph-info").innerHTML = str;
-    }
+    document.getElementById("graph-info").innerHTML = str;
   }
 
   function drawText(draw_object, text) {
@@ -480,9 +480,11 @@ Drawing.SphereGraph = function(options) {
     draw_object.materials[0].map.image = textCanvas;
   }
 
-
   function randomFromTo(from, to) {
     return Math.floor(Math.random() * (to - from + 1) + from);
   }
 
+  this.stop_calculating = function() {
+    graph.layout.stop_calculating();
+  }
 }