adding highlightColor

subprotocol · subprotocol · commit 4ca0bb19965c · 2013-04-10T01:01:09.000-06:00
diff --git a/experiments/03-cloth.html b/experiments/03-cloth.html
@@ -29,6 +29,7 @@
 
 		// simulation
 		var sim = new VerletSimulation(width, height, canvas);
+		sim.highlightColor = "#fff";
 		
 		// entities
 		var min = Math.min(width,height)*0.5;
@@ -65,20 +66,9 @@
 					
 					ctx.fillStyle = "rgba(" + coef + ",0," + (255-coef)+ ",1)";
 					
-					
-			
 					ctx.fill();
 				}
 			}
-			
-			/*var i;
-			for (i in composite.particles) {
-				var point = composite.particles[i];
-				ctx.beginPath();
-				ctx.arc(point.pos.x, point.pos.y, 1.2, 0, 2*Math.PI);
-				ctx.fillStyle = "#ff6000";
-				ctx.fill();
-			}*/
 		}
 		
 		// animation loop
diff --git a/js/common/simulation.js b/js/common/simulation.js
@@ -30,6 +30,7 @@ var VerletSimulation = function(width, height, canvas) {
 	this.mouseDown = false;
 	this.draggedEntity = null;
 	this.selectionRadius = 20;
+	this.highlightColor = "#4f545c";
 	var _this = this;
 	
 	// prevent context menu
@@ -223,15 +224,6 @@ VerletSimulation.prototype.draw = function() {
 	
 	this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);	
 	
-	// highlight nearest / dragged entity
-	var nearest = this.draggedEntity || this.nearestEntity();
-	if (nearest) {
-		this.ctx.beginPath();
-		this.ctx.arc(nearest.pos.x, nearest.pos.y, 8, 0, 2*Math.PI);
-		this.ctx.strokeStyle = "#4f545c";
-		this.ctx.stroke();
-	}
-
 	// draw constraints
 	for (c in this.composites) {
 		if (this.composites[c].drawConstraints) {
@@ -255,6 +247,16 @@ VerletSimulation.prototype.draw = function() {
 		for (i in particles)
 			particles[i].draw(this.ctx);
 	}
+	
+	
+	// highlight nearest / dragged entity
+	var nearest = this.draggedEntity || this.nearestEntity();
+	if (nearest) {
+		this.ctx.beginPath();
+		this.ctx.arc(nearest.pos.x, nearest.pos.y, 8, 0, 2*Math.PI);
+		this.ctx.strokeStyle = this.highlightColor;
+		this.ctx.stroke();
+	}
 }
 
 VerletSimulation.prototype.nearestEntity = function() {
