Added object type constants.

Added the calculated energy to the Contact class in prep for implementing
real contact handling.

Author: pspeed42

sigem/src/main/java/sigem/es/ObjectType.java

@@ -46,7 +46,13 @@
  *  @author    Paul Speed
  */
 public class ObjectType implements EntityComponent {
-    
+
+    public static final String TYPE_SHIP = "ship";
+    public static final String TYPE_PLANET = "planet";
+    public static final String TYPE_ASTEROID = "asteroid";
+    public static final String TYPE_THRUST = "thrust";
+    public static final String TYPE_MISSILE = "missile";
+            
     private int type;
 
     protected ObjectType() {

sigem/src/main/java/sigem/sim/CollisionSystem.java

@@ -133,6 +133,7 @@ public void endFrame( SimTime time ) {
                 // and one overtakes the other then the speeds will have the
                 // same signs... and we still need the difference.
                 double energy = Math.abs(speed2 - speed1);
+                contact.energy = energy;
 //log.info("speed1:" + speed1 + "  speed2:" + speed2 + "  energy:" + energy);
 
                 // We want the collisions to be elastic... if we only
@@ -171,16 +172,17 @@ private Contact checkContact( Body b1, Body b2 ) {
             z -= arenaSize.z;
         }
         double dist = Math.sqrt(x * x + z * z);
-        if( dist < b1.radius + b2.radius ) {
-            log.info("contact:" + b1.bodyId + " and:" + b2.bodyId);
-            Contact c = new Contact(b1, b2);
-            c.cn = b2.pos.subtract(b1.pos);
-            c.cn.y = 0; // just in case
-            c.cn.divideLocal(dist);
-            c.pen = dist - b1.radius - b2.radius;
-            return c;
-        }
-        return null; 
+        if( dist >= b1.radius + b2.radius ) {
+            return null;
+        } 
+        log.info("contact:" + b1.bodyId + " and:" + b2.bodyId);
+        Contact c = new Contact(b1, b2);
+        c.cn = b2.pos.subtract(b1.pos);
+        c.cn.y = 0; // just in case
+        c.cn.divideLocal(dist);
+        c.pen = dist - b1.radius - b2.radius;
+        
+        return c;
     }
 }
 

sigem/src/main/java/sigem/sim/Contact.java

@@ -49,6 +49,7 @@ public class Contact {
     public double pen;
     public Vec3d cp;
     public Vec3d cn;
+    public double energy;
 
     public Contact( Body b1, Body b2 ) {
         this.b1 = b1;

sigem/src/main/java/sigem/view/ModelViewState.java

@@ -318,18 +318,24 @@ protected Spatial createModel( Entity entity ) {
         // Else figure out what type to create... 
         ObjectType type = entity.get(ObjectType.class);
         String typeName = type.getTypeName(ed);
-        if( typeName.equals("ship") ) {
-            result = createShip(entity);
-        } else if( typeName.equals("planet") ) {
-            result = createPlanet(entity);
-        } else if( typeName.equals("asteroid") ) {
-            result = createAsteroid(entity);
-        } else if( typeName.equals("thrust") ) {
-            result = createThrust(entity);        
-        } else if( typeName.equals("missile") ) {
-            result = createMissile(entity);        
-        } else {
-            throw new RuntimeException("Unknown spatial type:" + typeName); 
+        switch( typeName ) {
+            case ObjectType.TYPE_SHIP:
+                result = createShip(entity);
+                break;
+            case ObjectType.TYPE_PLANET:
+                result = createPlanet(entity);
+                break;
+            case ObjectType.TYPE_ASTEROID:
+                result = createAsteroid(entity);
+                break;
+            case ObjectType.TYPE_THRUST:
+                result = createThrust(entity);        
+                break;
+            case ObjectType.TYPE_MISSILE:
+                result = createMissile(entity);
+                break;
+            default:        
+                throw new RuntimeException("Unknown spatial type:" + typeName); 
         }
 
         // Add it to the index