Merge commit 'bikegriffith/master'

Seems to help when there are a very large number of people at once
(to test, try visualizing the Rails repo with 1 frame per day)

run.sh

@@ -49,7 +49,8 @@ fi
 
 # running
 #if java -Xmx1000m -classpath dist/code_swarm.jar:lib/core.jar:lib/xml.jar:lib/vecmath.jar:. code_swarm $params; then
-if java -Xmx1000m -classpath dist/code_swarm.jar:lib/gluegen-rt.jar:lib/jogl.jar:lib/jogl-natives-macosx-universal.jar:lib/core.jar:lib/opengl.jar:lib/xml.jar:lib/vecmath.jar:. code_swarm $params; then
+#if java -Xmx1000m -classpath dist/code_swarm.jar:lib/gluegen-rt.jar:lib/jogl.jar:lib/jogl-natives-macosx-universal.jar:lib/core.jar:lib/opengl.jar:lib/xml.jar:lib/vecmath.jar:. code_swarm $params; then
+if java -Xmx1000m -classpath dist/code_swarm.jar:lib/gluegen-rt.jar:lib/jogl.jar:lib/jogl-natives-macosx-universal.jar:lib/core.jar:lib/opengl.jar:lib/xml.jar:lib/vecmath.jar:. -Djava.library.path=lib/ code_swarm $params; then
 # always on error due to no "exit buton" on rendering window
     echo "bye"
 #    echo -n "error, press a key to exit"

run_projectfocus.sh

@@ -0,0 +1 @@
+./run.sh data/projectfocus.config

src/PhysicsEngineOrderly.java

@@ -52,6 +52,16 @@ public void setup (CodeSwarmConfig p)
   public void onRelax(code_swarm.PersonNode pNode) {
     Vector2f delta = new Vector2f();
 
+    // A gentle force to attract pNodes to the center
+    // NOTE: this should be done prior to attraction/repulsion forces, otherwise
+    // tends to generate a grid-like pattern
+    Vector2f midpoint = new Vector2f(code_swarm.width / 2, code_swarm.height / 2);
+    delta = new Vector2f();
+    delta.sub(midpoint, pNode.mPosition);
+
+    delta.scale(1 / delta.length() * 0.003f);
+    pNode.mPosition.add(delta);
+
     // All person nodes attract each other, but only to a certain point, then they repel with gentle force
     for (code_swarm.PersonNode n : code_swarm.getLivingPeople()) {
       if (pNode != n) {
@@ -76,15 +86,6 @@ public void onRelax(code_swarm.PersonNode pNode) {
       }
     }
 
-
-    // A gentle force to attract pNodes to the center
-    Vector2f midpoint = new Vector2f(code_swarm.width / 2, code_swarm.height / 2);
-    delta = new Vector2f();
-    delta.sub(midpoint, pNode.mPosition);
-
-    delta.scale(1 / delta.length() * 0.003f);
-    pNode.mPosition.add(delta);
-
     // place the edited files around the person
     Iterator<code_swarm.FileNode> editedFiles = pNode.editing.iterator();
     int index = 0;