mouse drag bugfix

Author: diwi

src/com/thomasdiewald/liquidfun/java/DwUtils.java

@@ -205,6 +205,7 @@ static public PImage createSprite(PApplet papplet, int size, int PARTICLE_SHAPE_
           dd = dd*dd; dd = dd*dd; dd = dd*dd;
 
           dd = 1.0f - dd;
+          dd = DwUtils.clamp(dd, 0, 1);
           int a = (int)(dd*255);
           pimg.pixels[pid] = a << 24 | 0x00FFFFFF;
         }
@@ -213,6 +214,7 @@ else if(PARTICLE_SHAPE_IDX == 1){
           if(dd<0) dd=0; else if(dd>1) dd=1;
           dd = 1-dd;
 //          dd = dd*dd;
+          dd = DwUtils.clamp(dd, 0, 1);
           int a = (int)(dd*255);
           pimg.pixels[pid] = a << 24 | 0x00FFFFFF;
         }
@@ -222,7 +224,7 @@ else if(PARTICLE_SHAPE_IDX == 2){
           dd *= 1.8f;
           dd = 1-dd;
           dd = dd*dd*dd;
-          if(dd<0) dd=0; else if(dd>1) dd=1;
+          dd = DwUtils.clamp(dd, 0, 1);
           int a = (int)(dd*255);
           pimg.pixels[pid] = a << 24 | 0x00FFFFFF;
         }
@@ -258,11 +260,12 @@ static public PImage createSprite(PApplet papplet, int size, float exp1, float e
         float yn = (y / (float)size) * 2f - 1f;
         float dd = (float) Math.sqrt(xn*xn + yn*yn);
 
-        if(dd < 0) dd = 0; else if(dd > 1) dd = 1;
+        dd = DwUtils.clamp(dd, 0, 1);
         dd = (float) Math.pow(dd, exp1);
         dd = 1.0f - dd;
         dd = (float) Math.pow(dd, exp2);
         dd *= mult;
+        dd = DwUtils.clamp(dd, 0, 1);
         pimg.pixels[pid] = ((int)(dd * 255)) << 24 | 0x00FFFFFF;
       }
     }

src/com/thomasdiewald/liquidfun/java/interaction/DwMouseDragBodies.java

@@ -154,20 +154,17 @@ public boolean reportFixture(Fixture argFixture) {
     Body body = argFixture.getBody();
 
     // static bodies can be moved too, but need to set to dynamic for the
-    // mousejoint to work.
-    body_type_cpy = body.getType();
-    if(enable_static_drag){
-      body.setType(BodyType.DYNAMIC);
-    }
-    
-    if (body.getType() == BodyType.DYNAMIC) 
-    {
+    // mouse-joint to work.
+    BodyType type = body.getType();
+    if (BodyType.DYNAMIC == type || enable_static_drag) {
       if (argFixture.testPoint(point)) {
+        body_type_cpy = type;
         fixture = argFixture;
+        body.setType(BodyType.DYNAMIC);
         return false;
       }
     }
-    return true;
+    return true; 
   }