some small changes to particle code

Andrew Mahon (Type/Code) · Andrew Mahon (Type/Code) · commit 64fcb67bc6d6 · 2012-02-09T15:42:29.000-05:00
diff --git a/lib/particle/tc.particle.context.js b/lib/particle/tc.particle.context.js
@@ -29,29 +29,28 @@ if(!tc){ var tc = {}; }
 (function(tc) {
 
 
-	(function() {
-	    var lastTime = 0;
-	    var vendors = ['ms', 'moz', 'webkit', 'o'];
-	    for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
-	        window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
-	        window.cancelAnimationFrame = 
-	          window[vendors[x]+'CancelAnimationFrame'] || window[vendors[x]+'CancelRequestAnimationFrame'];
-	    }
-	 
-	    if (!window.requestAnimationFrame)
-	        window.requestAnimationFrame = function(callback, element) {
-	            var currTime = new Date().getTime();
-	            var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-	            var id = window.setTimeout(function() { callback(currTime + timeToCall); }, 
-	              timeToCall);
-	            lastTime = currTime + timeToCall;
-	            return id;
-	        };
-	 
-	    if (!window.cancelAnimationFrame)
-	        window.cancelAnimationFrame = function(id) {
-	            clearTimeout(id);
-	        };
+	(function requestAnimationFrame() {
+		var lastTime = 0;
+		var vendors = ['ms', 'moz', 'webkit', 'o'];
+		for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+			window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
+			window.cancelAnimationFrame = 
+			window[vendors[x]+'CancelAnimationFrame'] || window[vendors[x]+'CancelRequestAnimationFrame'];
+		}
+	
+		if(!window.requestAnimationFrame)
+			window.requestAnimationFrame = function(callback, element) {
+				var currTime = new Date().getTime();
+				var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+				var id = window.setTimeout(function() { callback(currTime + timeToCall); }, timeToCall);
+				lastTime = currTime + timeToCall;
+				return id;
+			};
+
+		if(!window.cancelAnimationFrame)
+			window.cancelAnimationFrame = function(id) {
+				clearTimeout(id);
+			};
 	}());
 
 	if(!tc.particle){ tc.particle = {}; }
@@ -77,7 +76,6 @@ if(!tc){ var tc = {}; }
 			_me.particles = [];
 			_me.frame = 0;
 			_me.stopped = true;
-			_me.paused = false;
 			_me.timer = null;
 			_me.mouse_pos = null;
 			_me.mouse_down_pos = null;
@@ -153,12 +151,7 @@ if(!tc){ var tc = {}; }
 			
 		}
 		
-		_me.isPaused = function(){
-			return _paused;
-		}
-		
 		_me.start = function(){
-			_me.paused = false;
 			_me.mouse_pos = null;
 			_me.mouse_down_pos = null;
 			if(_me.stopped){
@@ -167,15 +160,11 @@ if(!tc){ var tc = {}; }
 			}
 		}
 		
-		_me.pause = function(){
-			_me.paused = true;
-		}
-		
 		_me.stop = function(){
 			_me.stopped = true;
 		}
 		
-		function _draw(){
+		function _draw(drawing_context){
 			var opacity, i, alpha;
 			
 			_me.context.globalAlpha = 1.0;
@@ -205,10 +194,15 @@ if(!tc){ var tc = {}; }
 			
 			_me.context.globalAlpha = alpha;
 			
+			_me.context.fillStyle = '#000000';
 			for(i = 0; i < _me.particles.length; i++){
 				_me.particles[i].draw(_me.context);
 			}
 		}
+
+		function _render(){
+			
+		}
 		
 		return this.initialize();
 	}
diff --git a/lib/particle/tc.particle.particle.js b/lib/particle/tc.particle.particle.js
@@ -74,6 +74,7 @@ if(!tc){ var tc = {}; }
 				(0+o.anchor.y+o.anchor_offset.y)
 			]);
 			_me.radius = o.radius;
+			_me.diameter = o.radius*2;
 			if(_me.options.opacity < 1.0){
 				_me.fill = "rgba("+color.getRGBFromHex('r',o.color)+","+color.getRGBFromHex('g',o.color)+","+color.getRGBFromHex('b',o.color)+","+o.opacity+")";
 			} else {
