made all classes use prototype methods, should be easier on the mem

pamela.js

@@ -1,42 +1,53 @@
+var context;
+
+// Class Vector 
 function Vector(x, y, z) {
 	this.x = x;
 	this.y = y;
 	this.z = z;
 	this.w = 1;
-	this.add = function(v) {
+}
+
+Vector.prototype.add = function(v) {
 	this.x += v.x;
 	this.y += v.y;
 	this.z += v.z;
 };
-	this.subtract = function(v) {
+
+Vector.prototype.subtract = function(v) {
 	this.x -= v.x;
 	this.y -= v.y;
 	this.z -= v.z;
 };
-	this.scale = function(s) {
+
+Vector.prototype.scale = function(s) {
 	this.x *= s;
 	this.y *= s;
 	this.z *= s;
 };
-	this.rotateX = function(a) {
-		var c = p.cos(a);
-		var s = p.sin(a);
+
+Vector.prototype.rotateX = function(a) {
+	var c = Math.cos(a);
+	var s = Math.sin(a);
 	this.y = this.y * c + this.z * s;
 	this.z = this.z * c - this.y * s;
 };
-	this.rotateY = function(a) {
+
+Vector.prototype.rotateY = function(a) {
 	var c = p.cos(a);
 	var s = p.sin(a);
 	this.x = this.x * c + this.z * s;
 	this.z = this.z * c - this.x * s;
 };
-	this.rotateZ = function(a) {
+
+Vector.prototype.rotateZ = function(a) {
 	var c = p.cos(a);
 	var s = p.sin(a);
 	this.x = this.x * c + this.y * s;
 	this.y = this.y * c - this.x * s;
 };
-	this.distance = function(v) {
+
+Vector.prototype.distance = function(v) {
 	if (typeof v == "undefined") {
 		return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
 	}
@@ -45,23 +56,27 @@ function Vector(x, y, z) {
 	var zd = this.z - v.z;
 	return Math.sqrt(xd * xd + yd * yd + zd * zd);
 };
-	this.clone = function() {
+
+Vector.prototype.clone = function() {
 	return new Vector(this.x, this.y, this.z);
 };
-	this.project = function(cam) {
+
+Vector.prototype.project = function(cam) {
 	var d = this.clone();
 	d.subtract(cam);
 	if (d.z < 0) return false;
 	var s = (p.width / 2) / d.distance();
 	return { x: d.x * s, y: d.y * s, scale: s };
 };
-}
 
+// Class Matrix
 function Matrix(m) {
 	if (typeof m == "undefined")
 		m = [[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]];
 	this.m = m;
-	this.multiplyVector = function(v) {
+}
+
+Matrix.prototype.multiplyVector = function(v) {
 
 	// Initialize the result vector.
 	var result = new Vector();
@@ -75,47 +90,56 @@ function Matrix(m) {
 	
 	return result;
 };
-	this.multiplyMatrix = function(m) {
+
+Matrix.prototype.multiplyMatrix = function(m) {
 	this.m = this._mult(m);
 	return this;
 };
-	this.resetMatrix = function() {
+
+Matrix.prototype.resetMatrix = function() {
 	// identity and translate the axes to the center of the canvas.
 	this.m = [[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]];
 };
-	this.rotateX = function(angle) {
+
+Matrix.prototype.rotateX = function(angle) {
 	var c = Math.cos(angle);
 	var s = Math.sin(angle);
 	this.m = this._mult([[1, 0, 0, 0],[0, c, -s, 0],[0, s, c, 0],[0, 0, 0, 1]]);
 	return this;
 };
-	this.rotateY = function(angle) {
+
+Matrix.prototype.rotateY = function(angle) {
 	var c = Math.cos(angle);
 	var s = Math.sin(angle);
 	this.m = this._mult([[c, 0, s, 0],[0, 1, 0, 0],[-s, 0, c, 0],[0, 0, 0, 1]]);
 	return this;
 };
-	this.rotateZ = function(angle) {
+
+Matrix.prototype.rotateZ = function(angle) {
 	var c = Math.cos(angle);
 	var s = Math.sin(angle);
 	this.m = this._mult([[c, -s, 0, 0],[s, c, 0, 0],[0, 0, 1, 0],[0, 0, 0, 1]]);
 	return this;
 };
-	this.scale = function(scaleX, scaleY, scaleZ) {
+
+Matrix.prototype.scale = function(scaleX, scaleY, scaleZ) {
 	this.m = this._mult([[scaleX,0,0,0],[0,scaleY,0,0],[0,0,scaleZ,0],[0,0,0,1]]);
 	return this;
 };
-	this.translate = function(dX, dY, dZ) {
+
+Matrix.prototype.translate = function(dX, dY, dZ) {
 	this.m = this._mult([[1,0,0,dX],[0,1,0,dY],[0,0,1,dZ],[0,0,0,1]]);
 	return this;
 };
-	this.project = function(v) {
+
+Matrix.prototype.project = function(v) {
 	var pj = this.multiplyVector(v);
 	pj.x /= pj.z / (p.width / 2);
 	pj.y /= pj.z / (p.width / 2);
 	return pj;
 };
-	this._mult = function(m) {
+
+Matrix.prototype._mult = function(m) {
 	var m1 = this.m;
 	var m2 = m;
 	var result = [[],[],[],[]]; 
@@ -127,13 +151,9 @@ function Matrix(m) {
 	}
 	return result;
 };
-}
 
-function alphaForDepth(d, start, cutoff) {
-	d = d < cutoff ? cutoff : d > start ? start : d;
-	return 1 - (d - start) / (cutoff - start);
-}
 
+// Class Node 
 function Node(name) {
 	this.name = name;
 	var size = Math.min(p.width, p.height);	
@@ -142,11 +162,19 @@ function Node(name) {
 		p.random(size) - (size / 2), 
 		p.random(size) - (size / 2));
 	this.position.scale(0.5);
-	this.project = function(m) {
-		this.projection = m.project(this.position);
-		this.alpha = 255 * alphaForDepth(this.projection.z, 0, -200);
+}
+
+Node.prototype.alphaForDepth = function(d, start, cutoff) {
+	d = d < cutoff ? cutoff : d > start ? start : d;
+	return 1 - (d - start) / (cutoff - start);
 };
-	this.draw = function() {
+
+Node.prototype.project = function(m) {
+	this.projection = m.project(this.position);
+	this.alpha = 255 * this.alphaForDepth(this.projection.z, 0, -200);
+};
+
+Node.prototype.draw = function() {
 	var s = 5000 / -this.projection.z;
 	p.fill(p.color(164 + this.alpha  * 0.25));
 	p.ellipse(this.projection.x, this.projection.y, s, s);
@@ -154,29 +182,26 @@ function Node(name) {
 	p.fill(p.color(164, 192 + this.alpha  * 0.25, 164));
 	p.context.fillText(this.name, this.projection.x + s, this.projection.y + s / 2);
 };
-	this.update = function() {
-	};
-} 
 
+Node.prototype.update = function() {
+};
+
+
+// Class NorbertNode 
+jQuery.extend(NorbertNode.prototype, Node.prototype);
 function NorbertNode() {
 	this.norbert = p.loadImage("norbert.png");
 	this.position = new Vector(0, 0, 0);
-	this.project = function(m) {
-		this.projection = m.project(this.position);
-		this.alpha = 255 * alphaForDepth(this.projection.z, -200, -400);
-	};
-	this.draw = function() {
+}
+
+NorbertNode.prototype.draw = function() {
 	var s = this.projection.z / (p.width / 2);
 	s *= 3;
 	var x = this.projection.x - (186 / s);
 	var y = this.projection.y - (150 / s);
-		//var xx = this.projection.x + (186 * s);
-		//var yy = this.projection.y + (240 * s);
-		//var x = Math.floor(this.projection.x - 186); 
-		//var y = Math.floor(this.projection.y - 60); 
 	p.image(this.norbert, x, y, 372 / s, 300 / s);
 };	
-}
+
 
 var p;
 
@@ -187,6 +212,7 @@ $(document).ready(function() {
 function goPamela() {
 	
 	p = Processing("pamela");
+	context = p.context;
 
 	var entities = ["sandb", "fs111", "tazo", "wouter", "unknown", "unknown", "unknown", "unknown"];
 	var m = new Matrix();
@@ -200,7 +226,6 @@ function goPamela() {
 		var count = 0;
 		this.nodes = [];
 		this.nodes[count++] = new NorbertNode();
-		//for (var j = 0; j < 10; j++)
 		for (var i = 0; i < entities.length; i++) {
 			this.nodes[count++] = new Node(entities[i]);
 		}