Swapping Circles With Fireballs

rhema · Apr 9, 2013 · 6ed3d36 · 6ed3d36
1 parent eedfade
commit 6ed3d36
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 4 deletions.
diff --git a/processing/.DS_Store b/processing/.DS_Store
diff --git a/processing/FireDance/.DS_Store b/processing/FireDance/.DS_Store
diff --git a/processing/FireDance/Fireball.pde b/processing/FireDance/Fireball.pde
@@ -37,7 +37,7 @@ class Fireball {
     fadeout      = 0;
     c            = cc; //bb
     alpha        = 255; //bb
-    img = loadImage("fire.jpeg");
+    img = loadImage("fireBall.png");
 
   }
 
@@ -147,9 +147,10 @@ class Fireball {
     fill(c);
     stroke(0);
     pushMatrix();
-    //image(img, location.x, location.y);
-    translate(location.x, location.y);
-    ellipse(0, 0, r, r);
+    image(img, location.x, location.y);
+    //blend(img, 0, 0, 40, 40, 67, 0, 40, 40, ADD);
+    //translate(location.x, location.y);
+    //ellipse(0, 0, r, r);
     popMatrix();
   }
 

diff --git a/processing/FireDance/GimpFiles/Untitled.xcf b/processing/FireDance/GimpFiles/Untitled.xcf
diff --git a/processing/FireDance/data/.DS_Store b/processing/FireDance/data/.DS_Store
diff --git a/processing/FireDance/data/fireBall.png b/processing/FireDance/data/fireBall.png
diff --git a/processing/FireDance/data/fire.jpeg → processing/FireDance/data/fireTest.jpeg b/processing/FireDance/data/fire.jpeg → processing/FireDance/data/fireTest.jpeg