diff options
| -rw-r--r-- | src/tesseract/World.java | 4 | ||||
| -rw-r--r-- | src/tesseract/generators/SphereField.java | 10 | ||||
| -rw-r--r-- | src/tesseract/objects/Sphere.java | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java index 2063aba..deb907c 100644 --- a/src/tesseract/World.java +++ b/src/tesseract/World.java @@ -215,8 +215,8 @@ public class World implements Observer { List<PhysicalObject> children = new LinkedList<PhysicalObject>(); - while (itr.hasNext()) { - CollidableObject obj = itr.next(); + for (int i = 0; i < myObjects.size(); i++) { + CollidableObject obj = myObjects.get(i); // Apply forces for (Force force : myForces) { diff --git a/src/tesseract/generators/SphereField.java b/src/tesseract/generators/SphereField.java index 1bc57ae..75c56e0 100644 --- a/src/tesseract/generators/SphereField.java +++ b/src/tesseract/generators/SphereField.java @@ -15,7 +15,7 @@ public class SphereField extends MenuItem { private static final int FIELD_SIZE = 4; - private static final float SPHERE_SIZE = 0.15f; + private static final float SPHERE_SIZE = 0.025f; public SphereField(World theWorld) { super("Sphere Field", theWorld); @@ -27,11 +27,11 @@ public class SphereField extends MenuItem { * @param theWorld Where to put them */ public void generate(final World theWorld) { - final float start = 1.1f * 0.5f * FIELD_SIZE * SPHERE_SIZE; + final float start = 2.5f * 0.5f * FIELD_SIZE * SPHERE_SIZE; - for (float x = -start; x <= +start; x += SPHERE_SIZE * 1.1f) { - for (float y = -start; y <= +start; y += SPHERE_SIZE * 1.1f) { - for (float z = -start; z <= +start; z += SPHERE_SIZE * 1.1f) { + for (float x = -start; x <= +start; x += SPHERE_SIZE * 2.5f) { + for (float y = -start; y <= +start; y += SPHERE_SIZE * 2.5f) { + for (float z = -start; z <= +start; z += SPHERE_SIZE * 2.5f) { PhysicalObject s = new Sphere(SPHERE_SIZE, new Vector3f(x, y, z)); theWorld.addObject(s); diff --git a/src/tesseract/objects/Sphere.java b/src/tesseract/objects/Sphere.java index 3605fb0..ddf962a 100644 --- a/src/tesseract/objects/Sphere.java +++ b/src/tesseract/objects/Sphere.java @@ -58,8 +58,8 @@ public class Sphere extends PhysicalObject { final Vector3f position, final Color theColor) {
super(position, mass);
myColor = new Color3f(theColor);
- setShape(createShape(DEFAULT_DIVISIONS));
radius = theRadius;
+ setShape(createShape(DEFAULT_DIVISIONS));
if (inverseMass != 0) {
inverseInertiaTensor.m00 = 2f / 5 / inverseMass
|