fix: analytic

qiao · qiao · commit 6da32cae79e1 · 2012-02-16T17:01:23.000+08:00
diff --git a/demo/index.html b/demo/index.html
@@ -13,7 +13,6 @@
     <script type="text/javascript" src="./lib/jquery.pubsub.js"></script>
     <script type="text/javascript" src="./lib/fd-slider/fd-slider.js"></script>
     <script type="text/javascript" src="../lib/terrain.js"></script>
-    <script type="text/javascript" src="./main.js"></script>
   </head>
   <body>
     <div id="sidebar">
@@ -60,6 +59,7 @@ <h1 id="title">Fractal Terrain Generator</h1>
     <div id="container"></div>
 
     <a href="https://github.com/qiao/fractal-terrain-generator"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/assets.github.com/img/71eeaab9d563c2b3c590319b398dd35683265e85/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub"></img></a>
+    <script type="text/javascript" src="./main.js"></script>
     <script type="text/javascript">
       $(function() {
         var _gaq = _gaq || [];
diff --git a/demo/main.js b/demo/main.js
@@ -311,29 +311,49 @@ var TerrainView = (function() {
 
 })();
 
-$(document).ready(function() {
-
-  // create slider for the size selector
-  fdSlider.createSlider({
-    inp:document.getElementById("opt-size"),
-    animation:"tween",
-    hideInput:true,
-    callbacks: {
-      change: [update]
-    }
-  }); 
+var TerrainController = (function() {
+
 
   var model = TerrainModel;
   var view  = TerrainView;
 
-  view.init('#container');
-  //view.drawCoordinate(new THREE.Vector3(0, 0, 0), 300);
-  view.animate(30);
+  function init() {
+    // replace the builtin Math.random method with the one provided by RandomPool
+    RandomPool.hook();
+
+    initUI();
+    animate();
+    bindEvents();
+
+    update();
+  }
+
+  function initUI() {
+    // create slider for the size selector
+    fdSlider.createSlider({
+      inp:document.getElementById("opt-size"),
+      animation:"tween",
+      hideInput:true,
+      callbacks: {
+        change: [update]
+      }
+    }); 
+
+    view.init('#container');
+  }
 
-  $.subscribe('terrain-update', view.update);
+  function animate() {
+    view.animate(30);
+  }
 
-  // replace the builtin Math.random method with the one provided by RandomPool
-  RandomPool.hook();
+  function bindEvents() {
+    $.subscribe('terrain-update', view.update);
+
+    $('#new').on('click', function() { reset(); return false; });
+    $('#opt-size').on('change', update);
+    $('#opt-smoothness').on('change', update);
+    $('#opt-z').on('change', updateZ);
+  }
 
   function reset() {
     RandomPool.reset();
@@ -355,11 +375,8 @@ $(document).ready(function() {
     model.updateZ(zScale);
   }
 
-  $('#new').on('click', function() { reset(); return false; });
-  $('#opt-size').on('change', update);
-  $('#opt-smoothness').on('change', update);
-  $('#opt-z').on('change', updateZ);
+  return { init: init };
 
-  update();
+})();
 
-});
+TerrainController.init();
