entityjs 0.2.2 → 0.3.0

data/src/{entityjs/pattern → pattern}/flicker.js

@@ -1,214 +1,207 @@
-/*
-The flicker component calls the implemented method and sends the given information over a period of time.
-
-This is most popular for sprite animation.
-
-It can also be used for graduatly writing text or flashing a drawing object.
-*/
-re.c('flicker')
-.require('update timestep')
-.implement('flick')
-.init(function(){
-	
-	this.flicker_reels = {};
-	this.flicker_old = {};
-	this.flicker_reel = {};
-	
-	this.flicker_flickering = '';
-	
-})
-.extend({
-	
-	flicker_stop:function(){
-		if(this.flickering()){
-		
-			this.signal('animated', this.flicker_flickering);
-			
-			this.flicker_flickering = '';
-			
-			this.stepProgress = 0;
-			this.frameX = this.flicker_oldX;
-			this.frameY = this.flicker_oldY;
-			
-			this.removeSignal('update', this.flicker_update);
-		}
-		return this;
-	},
-	
-	flicker_update:function(t){
-		
-		this.timestep(t, function(){
-			var c = this.flicker_reel;
-			
-			//check if over
-			if(this.flicker_frame == this.flicker_reel.frames.length){
-				
-				if(c.loops == -1 || --this.flicker_loops >= 1){
-					//loop again
-					
-					this.flicker_frame = 0;
-					
-				} else {
-					//done flickering
-					
-					this.flicker_stop();
-					
-					return;
-				}
-			}
-			
-			//flick
-			this.flick(c.frames[this.flicker_frame]);
-			
-			this.flicker_frame++;
-			
-		});
-		
-	},
-	
-	addFlicker:function(id, loops, duration, frames){
-	
-		if(typeof id == 'object'){
-			
-			for(var i in id){
-				if(!id.hasOwnProperty(i)) continue;
-					
-					//copy formed array and insert
-					var c = id[i].slice();
-					//add key into array
-					c.unshift(i);
-					
-					this.addFlicker.apply(this, c);
-					
-			}
-			
-			return this;
-		}
-		
-		if(typeof frames == 'string') frames = frames.split(' ');
-		
-		//add
-		this.flicker_reels[id] = 
-		{
-			frames:frames,
-			duration:duration,
-			loops:loops
-		};
-		
-		return this;
-	},
-	
-	removeFlicker:function(id){
-		
-		if(typeof id == 'object'){
-			
-			for(var i in id){
-				if(!id.hasOwnProperty(i)) continue;
-				
-				this.removeFlicker.call(this, id[i]);
-			}
-			
-			return this;
-		}
-		
-		//assuming this flicker isn't running
-		delete this.flicker_reels[id];
-		
-		return this;
-	},
-	
-	/*
-	The animate method either creates or plays an animation.
-	Time is in milliseconds.
-	
-	//create sequence animation
-	re('#player').flicker('die', 1, 200, [0, 1, 3, 3, 4, 3, 2, 1]);
-	
-	//play animation
-	//can customize the animation for this call.
-	re('#player').flicker('die', 0, 200);
-	
-	//stop flickering
-	re('#player').flicker();
-	
-	//add multiple animations
-	flicker({
-	idle:[loops, duration, frames],
-	..
-	
-	
-	});
-	
-	FUTURE: 
-	-allow backward animations
-	-allow entry of an array of frames. So each counter will go to the next frame in the array
-	*/
-	flicker:function(id, loops, duration, frames){
-		
-		if(arguments.length == 0){
-			//stop flickering
-			return this.flicker_stop();
-		}
-		
-		if(id == this.flicker_flickering) return;
-		
-		if(!this.flicker_reels[id]){
-			return this;	
-		}
-		
-		//defaults
-		
-		//startX = loops, endX = duration in seconds
-		//if startX equals 0, animation loops forever
-		
-		var r = this.flicker_reels[id];
-		
-		//create new reel based on custom attributes
-		var c = this.flicker_reel;
-		//copy from saved animation or newly given
-		c.loops = (isNaN(loops))? r.loops : loops;
-		c.duration = (isNaN(duration))? r.duration : duration;
-		c.frames = (typeof frames == 'object')? frames : r.frames;
-		
-		//setup counter for loops
-		this.flicker_loops = c.loops;
-		
-		this.stepProgress = 0;
-		this.stepSize = c.duration / c.frames.length;
-		
-		//save old frames for upon completion
-		
-		this.flicker_oldX = this.frameX;
-		this.flicker_oldY = this.frameY;
-		
-		this.flicker_frame = 0;
-		
-		//update frame then run
-		this.flick(c.frames[this.flicker_frame++]);
-		
-		if(!this.flickering()){
-			this.addSignal('update', this.flicker_update);
-		}
-		
-		this.flicker_flickering = id;
-			
-		
-		
-		return this;
-	},
-	
-	/*
-	Check if flicker is running / compare current.
-	
-	this.flickering(); // false
-	this.flickering('idle'); // false
-	*/
-	flickering:function(id){
-		if(id){
-			return this.flicker_flickering == id;	
-		}
-		
-		return this.flicker_flickering != '';	
-	}
-	
+/*
+The flicker component calls the implemented method and sends the given information over a period of time.
+
+This is most popular for sprite animation.
+
+It can also be used for graduatly writing text or flashing a drawing object.
+*/
+re.c('flicker')
+.requires('update timestep')
+.interfaces('flick')
+.init(function(){
+	
+	this.flicker_reels = {};
+	this.flicker_old = {};
+	this.flicker_reel = {};
+	
+	this.flicker_flickering = '';
+	
+})
+.defines({
+	
+	flicker_stop:function(){
+		var o = this.flicker_flickering;
+		this.flicker_flickering = '';
+			
+		this.stepProgress = 0;
+			
+		this.off('update', this.flicker_update);
+    
+		return this.trigger('flicker:end', o);
+	},
+	
+	flicker_update:function(t){
+		
+		this.timestep(t, function(){
+			var c = this.flicker_reel;
+      
+			//check if over
+			if(this.flicker_frame == this.flicker_reel.frames.length){
+				
+				if(c.loops == -1 || --this.flicker_loops >= 1){
+					//loop again
+					
+					this.flicker_frame = 0;
+					
+				} else {
+					//done flickering
+					
+					this.flicker_stop();
+					
+					return;
+				}
+			}
+			
+			//flick
+			if(this.flick(c.frames[this.flicker_frame], this.flicker_flickering, this.flicker_loops) === false){
+        //stop
+        this.flicker();
+      }
+			
+			this.flicker_frame++;
+			
+		});
+		
+	},
+	
+	addFlicker:function(id, loops, duration, frames){
+	
+		if(re.is(id, 'object')){
+			
+			for(var i in id){
+				if(!id.hasOwnProperty(i)) continue;
+					
+					//copy formed array and insert
+					var c = id[i].slice();
+					//add key into array
+					c.unshift(i);
+					
+					this.addFlicker.apply(this, c);
+					
+			}
+			
+			return this;
+		}
+		
+		if(re.is(frames, 'string')) frames = frames.split(' ');
+		
+		//add
+		this.flicker_reels[id] = 
+		{
+			frames:frames,
+			duration:duration,
+			loops:loops
+		};
+		
+		return this;
+	},
+	
+	removeFlicker:function(id){
+		
+		if(re.is(id,'object')){
+			
+			for(var i in id){
+				if(!id.hasOwnProperty(i)) continue;
+				
+				this.removeFlicker.call(this, id[i]);
+			}
+			
+			return this;
+		}
+		
+		//assuming this flicker isn't running
+		delete this.flicker_reels[id];
+		
+		return this;
+	},
+	
+	/*
+	The animate method either creates or plays an animation.
+	Time is in milliseconds.
+	
+	//create sequence animation
+	re('#player').flicker('die', 1, 200, [0, 1, 3, 3, 4, 3, 2, 1]);
+	
+	//play animation
+	//can customize the animation for this call.
+	re('#player').flicker('die', 0, 200);
+	
+	//stop flickering
+	re('#player').flicker();
+	
+	//add multiple animations
+	flicker({
+	idle:[loops, duration, frames],
+	..
+	
+	
+	});
+	
+	FUTURE: 
+	-allow backward animations
+	-allow entry of an array of frames. So each counter will go to the next frame in the array
+	*/
+	flicker:function(id, loops, duration, frames){
+		
+		if(!re.is(id) && this.flickering()){
+			//stop flickering
+			return this.flicker_stop();
+		}
+		
+		if(id == this.flicker_flickering) return;
+		
+		if(!this.flicker_reels[id]){
+			return this;	
+		}
+		
+		//defaults
+		
+		//startX = loops, endX = duration in seconds
+		//if startX equals 0, animation loops forever
+		
+		var r = this.flicker_reels[id];
+		
+		//create new reel based on custom attributes
+		var c = this.flicker_reel;
+		//copy from saved animation or newly given
+		c.loops = (isNaN(loops))? r.loops : loops;
+		c.duration = (isNaN(duration))? r.duration : duration;
+		c.frames = (re.is(frames,'object'))? frames : r.frames;
+		
+		//setup counter for loops
+		this.flicker_loops = c.loops;
+		
+		this.stepProgress = 0;
+		this.stepSize = c.duration / c.frames.length / 1000;
+		
+		//save old frames for upon completion
+		
+		this.flicker_frame = 0;
+		
+		//update frame then run
+		this.flick(c.frames[this.flicker_frame++]);
+		
+		if(!this.flickering()){
+			this.on('update', this.flicker_update);
+		}
+		
+		this.flicker_flickering = id;
+		
+		return this.trigger('flicker:start');
+	},
+	
+	/*
+	Check if flicker is running / compare current.
+	
+	this.flickering(); // returns current flicker name
+	this.flickering('idle'); // false
+	*/
+	flickering:function(id){
+		if(id){
+			return this.flicker_flickering == id;	
+		}
+		
+		return this.flicker_flickering;
+	}
+	
 });

data/src/pattern/timestep.js

@@ -0,0 +1,31 @@
+/*
+The timestep component gathers steps over time and once the maximum steps
+are achieved it will dispatch the callback method. This method is also delta time
+safe, so you don't need to worry about alternate values over time.
+
+  
+*/
+
+re.c('timestep')
+.defaults({
+    
+    stepProgress:0,
+    stepSize:100
+    
+})
+.defines({
+    
+    timestep:function(progress, callback, context){
+        
+        this.stepProgress += progress;
+        
+        while(this.stepProgress >= this.stepSize){
+            
+            callback.call((context)?context:this);
+            
+            this.stepProgress -= this.stepSize;
+        }
+        
+    }
+    
+})

data/src/{entityjs/save → save}/database.js

@@ -1,7 +1,7 @@
-/*
-The database component adds functions for creating and dealing with databases.
-This will reference only one database.
-
-Because of the current stance of firefox. I'm not sure if its safe implementing this yet.
-*//*
+/*
+The database component adds functions for creating and dealing with databases.
+This will reference only one database.
+
+Because of the current stance of firefox. I'm not sure if its safe implementing this yet.
+*//*
 re.c('database');*/

data/src/{entityjs/save → save}/storage.js

@@ -1,57 +1,48 @@
-/*
-The storage component contains methods for storing locally or session values.
-This utilizes the new HTML5 localstorage and sessionstorage.
-
-//create new local storage
-re.e('storage:local');
-
-//create new session storage
-re.e('storage:session');
-
-*/
-re.c('storage')
-.init(function(c, type){
-	this.storage = (type == 'session')? sessionStorage : localStorage;
-})
-.extend({
-	
-	length:function(){
-		return this.storage.length;
-	},
-	
-	key:function(index){
-		return this.storage.key(index);
-	},
-	
-	getItem:function(key){
-		return this.storage.getItem(key);
-	},
-	
-	getJson:function(key){
-		return JSON.parse(this.getItem(key));
-	},
-	
-	setItem:function(key, data){
-		
-		if(typeof data != 'number' || typeof data != 'string'){
-			data = JSON.stringify(data);
-		}
-		
-		this.storage.setItem(key, data);
-		
-		return this;
-	},
-	
-	removeItem:function(key){
-		this.storage.removeItem(key);
-		
-		return this;
-	},
-	
-	clear:function(){
-		this.storage.clear();
-		
-		return this;
-	}
-	
+/*
+The storage component contains methods for storing locally or session values.
+This utilizes the new HTML5 localstorage and sessionstorage.
+
+//create new local storage
+re.e('storage:local');
+
+//create new session storage
+re.e('storage:session');
+
+*/
+re.c('storage')
+.init(function(c, type){
+	this.storage = window[type+'Storage'];
+})
+.defines({
+	
+	length:function(){
+		return this.storage.length;
+	},
+	
+	key:function(index){
+		return this.storage.key(index);
+	},
+	
+	item:function(key, data){
+		
+    if(!re.is(data)){
+      return JSON.parse(this.storage.getItem(key));
+    }
+    
+		this.storage.setItem(key, JSON.stringify(data));
+		
+		return this;
+	},
+	
+	removeItem:function(key){
+		this.storage.removeItem(key);
+    return this;
+	},
+	
+	clear:function(){
+		this.storage.clear();
+		
+		return this;
+	}
+	
 })

data/src/{entityjs/util → util}/log.js

@@ -1,25 +1,17 @@
-/*
-The log component extends a cross browser console.log command.
-
-//example usage
-re.e('log')
-.log('example log');
-
-//global usage
-re.log('example log');
-
-*/
-re.log = function(){
-	try{
-		console.log.apply(console, arguments);
-	} catch(e){
-		try {
-			opera.postError.apply(opera, arguments);
-		} catch(e){
-			alert(Array.prototype.join.call(arguments, " "));
-		}
-	}
-};
-
-re.c('log')
-.extend('log', re.log);
+/*
+The log component definess a cross browser console.log command.
+
+re.log('example log');
+
+*/
+re.log = function(){
+	try{
+		console.log.apply(console, arguments);
+	} catch(e){
+		try {
+			opera.postError.apply(opera, arguments);
+		} catch(e){
+			alert(Array.prototype.join.call(arguments, " "));
+		}
+	}
+};

data/src/{entityjs/util → util}/polyfill.js

@@ -1,25 +1,25 @@
-/*
-The polyfill component polyfills unsupported HTML5 functions when possible.
-*/
-re.c('polyfill')
-.extend({
-	
-	requestAnimationFrame:function(callback, canvas){
-		return requestAnimFrame(callback, canvas);
-	}
-	
-})
-.run(function(){
-	
-	//setup requestanimationframe on support
-	window.requestAnimFrame = 
-	window.requestAnimationFrame ||
-	window.webkitRequestAnimationFrame ||
-	window.mozRequestAnimationFrame ||
-	window.oRequestAnimationFrame ||
-	window.msRequestAnimationFrame ||
-	function(callback){
-		window.setTimeout(callback, 1000 / 60);
-	};
-	
+/*
+The polyfill component polyfills unsupported HTML5 functions when possible.
+*/
+re.c('polyfill')
+.defines({
+	
+	requestAnimationFrame:function(callback, canvas){
+		return requestAnimFrame(callback, canvas);
+	}
+	
+})
+.run(function(){
+	
+	//setup requestanimationframe on support
+	window.requestAnimFrame = 
+	window.requestAnimationFrame ||
+	window.webkitRequestAnimationFrame ||
+	window.mozRequestAnimationFrame ||
+	window.oRequestAnimationFrame ||
+	window.msRequestAnimationFrame ||
+	function(callback){
+		window.setTimeout(callback, 1000 / 60);
+	};
+	
 });