Merge branch 'master' of github.com:typecode/splash

Lev Kanter · Lev Kanter · commit a4fa565b3f02 · 2010-12-01T12:48:28.000-05:00
diff --git a/index.html b/index.html
@@ -9,7 +9,7 @@
 	<body>
 		<div class='masthead'>
 			<h1><span>Type/Code</span></h1>
-			<div class='particles' id='app'><p id='netenergy'></p></div>
+			<div class='particles' id='app'></div>
 		</div>
 			
 		<div class="vignette">
@@ -45,6 +45,15 @@ <h1><span>Type/Code</span></h1>
 				app.initialize(Y);
 			});
 			
+			var _gaq = _gaq || [];
+			_gaq.push(['_setAccount', 'UA-20012698-1']);
+			_gaq.push(['_trackPageview']);
+		
+			(function() {
+				var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+				ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+				var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+			})();
 		</script>
 	</body>
 </html>
diff --git a/scripts/tc.app.particle.particle.js b/scripts/tc.app.particle.particle.js
@@ -130,6 +130,35 @@ if(!tc){ var tc = {}; }
       }
     }
     
+    _me.bounce_off_walls = function(bounds){
+      var b_did_i_collide;
+      b_did_i_collide = false;
+      
+      if(_me.pos.elements[0] < bounds.min_x + o.radius){
+        _me.pos.elements[0] = o.radius;
+        b_did_i_collide = true;
+        vel.elements[0] = vel.elements[0] * -1.0;
+      }else if(_me.pos.elements[0] > bounds.max_x - o.radius){
+        _me.pos.elements[0] = bounds.max_x - o.radius;
+        b_did_i_collide = true;
+        vel.elements[0] = vel.elements[0] * -1.0;
+      }
+      
+      if(_me.pos.elements[1] < bounds.min_y + o.radius){
+        _me.pos.elements[1] = o.radius;
+        b_did_i_collide = true;
+        vel.elements[1] = vel.elements[1] * -1.0;
+      }else if(_me.pos.elements[1] > bounds.max_y - o.radius){
+        _me.pos.elements[1] = bounds.max_y - o.radius;
+        b_did_i_collide = true;
+        vel.elements[1] = vel.elements[1] * -1.0;
+      }
+      
+      if(b_did_i_collide){
+        vel = vel.multiply(0.3);
+      }
+    }
+    
     _me.handle_anchor = function(){
       if(!_me.anchor){ return; }
       var distance, length, pct, normal_distance;
@@ -171,35 +200,6 @@ if(!tc){ var tc = {}; }
       vel = vel.multiply(damping);
     }
     
-    _me.bounce_off_walls = function(bounds){
-      var b_did_i_collide;
-      b_did_i_collide = false;
-      
-      if(_me.pos.elements[0] < bounds.min_x + o.radius){
-        _me.pos.elements[0] = o.radius;
-        b_did_i_collide = true;
-        vel.elements[0] = vel.elements[0] * -1.0;
-      }else if(_me.pos.elements[0] > bounds.max_x - o.radius){
-        _me.pos.elements[0] = bounds.max_x - o.radius;
-        b_did_i_collide = true;
-        vel.elements[0] = vel.elements[0] * -1.0;
-      }
-      
-      if(_me.pos.elements[1] < bounds.min_y + o.radius){
-        _me.pos.elements[1] = o.radius;
-        b_did_i_collide = true;
-        vel.elements[1] = vel.elements[1] * -1.0;
-      }else if(_me.pos.elements[1] > bounds.max_y - o.radius){
-        _me.pos.elements[1] = bounds.max_y - o.radius;
-        b_did_i_collide = true;
-        vel.elements[1] = vel.elements[1] * -1.0;
-      }
-      
-      if(b_did_i_collide){
-        vel = vel.multiply(0.3);
-      }
-    }
-    
     _me.update = function(){
       vel = vel.add(frc);
       _me.pos = _me.pos.add(vel);
