Flying speed now depends on graph size

Hopefully this will make controls less sensitive
anvaka · Aug 6, 2015 · 997d9b2 · 997d9b2
1 parent 45ed887
commit 997d9b2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/galaxy/help.jsx b/src/galaxy/help.jsx
@@ -78,6 +78,12 @@ function help(x) {
       <td><code>spacebar</code></td>
       <td>Toggle Steering</td>
       </tr>
+      <tr>
+      <td><code>shift</code></td>
+      <td>Move faster</td>
+      <td><code></code></td>
+      <td></td>
+      </tr>
       </tbody></table>
         </div>
         );

diff --git a/src/galaxy/native/renderer.js b/src/galaxy/native/renderer.js
@@ -61,9 +61,11 @@ function sceneRenderer(container) {
   function accelarate(isPrecise) {
     var input = renderer.input();
     if (isPrecise) {
-      input.movementSpeed /= 8;
+      input.movementSpeed *= 4;
+      input.rollSpeed *= 4;
     } else {
-      input.movementSpeed *= 8;
+      input.movementSpeed /= 4;
+      input.rollSpeed /= 4;
     }
   }
 
@@ -117,7 +119,6 @@ function sceneRenderer(container) {
       touchControl = createTouchControl(renderer);
       moveCameraInternal();
       var input = renderer.input();
-      input.movementSpeed *= 2.5;
       input.on('move', clearHover);
     }
 
@@ -127,6 +128,17 @@ function sceneRenderer(container) {
     hitTest.on('over', handleOver);
     hitTest.on('click', handleClick);
     hitTest.on('dblclick', handleDblClick);
+    hitTest.on('hitTestReady', adjustMovementSpeed);
+  }
+
+  function adjustMovementSpeed(tree) {
+    var input = renderer.input();
+    if (tree) {
+      var root = tree.getRoot();
+      input.movementSpeed = root.bounds.half * 0.02;
+    } else {
+      input.movementSpeed *= 2;
+    }
   }
 
   function focusScene() {
@@ -211,6 +223,7 @@ function sceneRenderer(container) {
     hitTest.off('over', handleOver);
     hitTest.off('click', handleClick);
     hitTest.off('dblclick', handleDblClick);
+    hitTest.off('hitTestReady', adjustMovementSpeed);
   }
 
   function handleClick(e) {

diff --git a/src/galaxy/service/graphLoader.js b/src/galaxy/service/graphLoader.js
@@ -119,6 +119,7 @@ function loadGraph(name, progress) {
     var links = new Int32Array(buffer);
     var lastArray = [];
     outLinks[0] = lastArray;
+    // TODO: Report progress?
     asyncFor(links, processLink, reportBack);
     var deffered = defer();