Much better batch operation

n1ckfg · Dec 15, 2012 · e77c3e2 · e77c3e2
1 parent 5c7f370
commit e77c3e2
Show file tree

Hide file tree

Showing 269 changed files with 30 additions and 94 deletions.
diff --git a/Pointcloud_Render.pde b/Pointcloud_Render.pde
@@ -3,32 +3,17 @@ import superCAD.*;
 //import processing.opengl.*;
 
 //**************************************
-boolean record3D = true; // records 3D rendering or just time-corrects original depth map
 int sW = 640;
-int sH = 480;
-float recordedFps = 30; //fps you shot at
-int numberOfFolders = 1;  //right now you must set this manually!
-String readFilePath = "data";
-String readFileName = "shot";
-String readFileType = "tga"; // record with tga for speed
-String writeFilePath = "render";
-String writeFileName = "shot";
-String writeFileType = "tga";  // render with png to save space
+int sH = 360;
+ArrayList photoArrayNames;
+int counter = 0;
+String fileName = "frame";
+String filePath = "render";
+String fileType = "obj";
 float zscale = 3; //orig 3, 1 looks better in 2D image but 3 looks better for OBJ
 float zskew = 10;
 //**************************************
 
-String readString = "";
-String writeString = "";
-int shotNumOrig = 1;
-int shotNum = shotNumOrig;
-int readFrameNumOrig = 1;
-int readFrameNum = readFrameNumOrig;
-int readFrameNumMax;
-int writeFrameNum = readFrameNum;
-int addFrameCounter = 0;
-int subtractFrameCounter = 0;
-
 PeasyCam cam;
 float[][] gray = new float[sH][sW];
 
@@ -37,87 +22,29 @@ String[] numFiles;
 
 PImage img, buffer;
 
-
 void setup() {
-  reInit();
-  if (record3D) {
+  countFrames();
     size(sW, sH, P3D);
     cam = new PeasyCam(this, sW);
-  }
-  else {
-    size(sW, sH, P2D);
-  }
-  //smooth();
-  stroke(255);
-}
 
-void reInit() {
-  readFrameNum = readFrameNumOrig;
-  writeFrameNum = readFrameNum;
-  addFrameCounter = 0;
-  subtractFrameCounter = 0;
-  countFolder();
+  stroke(255);
 }
 
 void draw() {
   background(0);
-  if (shotNum<=numberOfFolders) {
-    if (readFrameNum<readFrameNumMax) {
-      readString = readFilePath + "/" + readFileName + shotNum + "/" + readFileName + shotNum + "_frame" + readFrameNum + "." + readFileType;
-      img = loadImage(readString);
-      if (record3D) {
-        objGenerate();
-      }
-      else {
-        image(img, 0, 0);
-      }
-      writeFile(1);
-      readFrameNum++;
-    } else {
-    if (shotNum==numberOfFolders) {
-      exit();
-    }
-    else {
-      shotNum++;
-      reInit();
-    }
-    }
-  }else {
-  exit();
-}
-
-}
-
-void countFolder() {
-  dataFolder = new File(sketchPath, readFilePath + "/" + readFileName + shotNum+"/");
-  numFiles = dataFolder.list();
-  readFrameNumMax = numFiles.length+1;
+  img = loadImage((String) photoArrayNames.get(counter));
+  objGenerate();
+  if(counter<photoArrayNames.size()) counter++;
+  if(counter==photoArrayNames.size()) exit();
 }
 
-void writeFile(int reps) {
-  for (int i=0;i<reps;i++) {
-    writeString = writeFilePath + "/" + writeFileName + shotNum + "/" + writeFileName + shotNum + "_frame"+writeFrameNum+"."+writeFileType;
-
-    saveFrame(writeString);
-
-    if (record3D&&reps>1) {
-      objGenerate();
-    }
-    //println("written: " + writeString + diffReport);
-    writeFrameNum++;
-  }
-}
-
-
 static final int gray(color value) { 
   return max((value >> 16) & 0xff, (value >> 8 ) & 0xff, value & 0xff);
 }
 
 void objGenerate() {
   background(0);
-  if (record3D) {
-    objBegin();
-  }
+  beginRaw("superCAD.ObjFile", filePath + "/" + fileName + zeroPadding(counter+1,photoArrayNames.size()) + "." + fileType); // Start recording to the file
   buffer = img;
   for (int y = 0; y < sH; y++) {
     for (int x = 0; x < sW; x++) {
@@ -142,17 +69,26 @@ void objGenerate() {
     }
   }
   popMatrix();
-  if (record3D) {
-    objEnd();
-  }
+  endRaw();
 }
 
-void objBegin() {
-  beginRaw("superCAD.ObjFile", writeFilePath + "/" + writeFileName + shotNum + "/" + writeFileName + shotNum + "_frame"+writeFrameNum+"."+ "obj"); // Start recording to the file
-}
+void countFrames() {
+  photoArrayNames = new ArrayList();
+    try {
+        //loads a sequence of frames from a folder
+        File dataFolder = new File(sketchPath, "data/"); 
+        String[] allFiles = dataFolder.list();
+        for (int j=0;j<allFiles.length;j++) {
+          if (allFiles[j].toLowerCase().endsWith("png")||allFiles[j].toLowerCase().endsWith("jpg")||allFiles[j].toLowerCase().endsWith("jpeg")||allFiles[j].toLowerCase().endsWith("gif")||allFiles[j].toLowerCase().endsWith("tga")) {
+            photoArrayNames.add(allFiles[j]);
+          }
+        }
+    }catch(Exception e){ }
+  }
 
-void objEnd() {
-  endRaw();
+String zeroPadding(int _val, int _maxVal){
+  String q = ""+_maxVal;
+  return nf(_val,q.length());
 }
 
 //~~~   END   ~~~

diff --git a/data/shot1/shot1_frame1.tga b/data/shot1/shot1_frame1.tga
diff --git a/data/shot1/shot1_frame10.tga b/data/shot1/shot1_frame10.tga
diff --git a/data/shot1/shot1_frame100.tga b/data/shot1/shot1_frame100.tga
diff --git a/data/shot1/shot1_frame101.tga b/data/shot1/shot1_frame101.tga
diff --git a/data/shot1/shot1_frame102.tga b/data/shot1/shot1_frame102.tga
diff --git a/data/shot1/shot1_frame103.tga b/data/shot1/shot1_frame103.tga
diff --git a/data/shot1/shot1_frame104.tga b/data/shot1/shot1_frame104.tga
diff --git a/data/shot1/shot1_frame105.tga b/data/shot1/shot1_frame105.tga
diff --git a/data/shot1/shot1_frame106.tga b/data/shot1/shot1_frame106.tga
diff --git a/data/shot1/shot1_frame107.tga b/data/shot1/shot1_frame107.tga
diff --git a/data/shot1/shot1_frame108.tga b/data/shot1/shot1_frame108.tga
diff --git a/data/shot1/shot1_frame109.tga b/data/shot1/shot1_frame109.tga
diff --git a/data/shot1/shot1_frame11.tga b/data/shot1/shot1_frame11.tga
diff --git a/data/shot1/shot1_frame110.tga b/data/shot1/shot1_frame110.tga
diff --git a/data/shot1/shot1_frame111.tga b/data/shot1/shot1_frame111.tga
diff --git a/data/shot1/shot1_frame112.tga b/data/shot1/shot1_frame112.tga
diff --git a/data/shot1/shot1_frame113.tga b/data/shot1/shot1_frame113.tga
diff --git a/data/shot1/shot1_frame114.tga b/data/shot1/shot1_frame114.tga
diff --git a/data/shot1/shot1_frame115.tga b/data/shot1/shot1_frame115.tga
diff --git a/data/shot1/shot1_frame116.tga b/data/shot1/shot1_frame116.tga
diff --git a/data/shot1/shot1_frame117.tga b/data/shot1/shot1_frame117.tga
diff --git a/data/shot1/shot1_frame118.tga b/data/shot1/shot1_frame118.tga
diff --git a/data/shot1/shot1_frame119.tga b/data/shot1/shot1_frame119.tga
diff --git a/data/shot1/shot1_frame12.tga b/data/shot1/shot1_frame12.tga
diff --git a/data/shot1/shot1_frame120.tga b/data/shot1/shot1_frame120.tga
diff --git a/data/shot1/shot1_frame121.tga b/data/shot1/shot1_frame121.tga
diff --git a/data/shot1/shot1_frame122.tga b/data/shot1/shot1_frame122.tga
diff --git a/data/shot1/shot1_frame123.tga b/data/shot1/shot1_frame123.tga
diff --git a/data/shot1/shot1_frame124.tga b/data/shot1/shot1_frame124.tga
diff --git a/data/shot1/shot1_frame125.tga b/data/shot1/shot1_frame125.tga
diff --git a/data/shot1/shot1_frame126.tga b/data/shot1/shot1_frame126.tga
diff --git a/data/shot1/shot1_frame127.tga b/data/shot1/shot1_frame127.tga
diff --git a/data/shot1/shot1_frame128.tga b/data/shot1/shot1_frame128.tga
diff --git a/data/shot1/shot1_frame129.tga b/data/shot1/shot1_frame129.tga
diff --git a/data/shot1/shot1_frame13.tga b/data/shot1/shot1_frame13.tga
diff --git a/data/shot1/shot1_frame130.tga b/data/shot1/shot1_frame130.tga
diff --git a/data/shot1/shot1_frame131.tga b/data/shot1/shot1_frame131.tga
diff --git a/data/shot1/shot1_frame132.tga b/data/shot1/shot1_frame132.tga
diff --git a/data/shot1/shot1_frame133.tga b/data/shot1/shot1_frame133.tga
diff --git a/data/shot1/shot1_frame134.tga b/data/shot1/shot1_frame134.tga
diff --git a/data/shot1/shot1_frame135.tga b/data/shot1/shot1_frame135.tga
diff --git a/data/shot1/shot1_frame136.tga b/data/shot1/shot1_frame136.tga
diff --git a/data/shot1/shot1_frame137.tga b/data/shot1/shot1_frame137.tga
diff --git a/data/shot1/shot1_frame138.tga b/data/shot1/shot1_frame138.tga
diff --git a/data/shot1/shot1_frame139.tga b/data/shot1/shot1_frame139.tga
diff --git a/data/shot1/shot1_frame14.tga b/data/shot1/shot1_frame14.tga
diff --git a/data/shot1/shot1_frame140.tga b/data/shot1/shot1_frame140.tga
diff --git a/data/shot1/shot1_frame141.tga b/data/shot1/shot1_frame141.tga
diff --git a/data/shot1/shot1_frame142.tga b/data/shot1/shot1_frame142.tga
diff --git a/data/shot1/shot1_frame143.tga b/data/shot1/shot1_frame143.tga
diff --git a/data/shot1/shot1_frame144.tga b/data/shot1/shot1_frame144.tga
diff --git a/data/shot1/shot1_frame145.tga b/data/shot1/shot1_frame145.tga
diff --git a/data/shot1/shot1_frame146.tga b/data/shot1/shot1_frame146.tga
diff --git a/data/shot1/shot1_frame147.tga b/data/shot1/shot1_frame147.tga
diff --git a/data/shot1/shot1_frame148.tga b/data/shot1/shot1_frame148.tga
diff --git a/data/shot1/shot1_frame149.tga b/data/shot1/shot1_frame149.tga
diff --git a/data/shot1/shot1_frame15.tga b/data/shot1/shot1_frame15.tga
diff --git a/data/shot1/shot1_frame150.tga b/data/shot1/shot1_frame150.tga
diff --git a/data/shot1/shot1_frame151.tga b/data/shot1/shot1_frame151.tga
diff --git a/data/shot1/shot1_frame152.tga b/data/shot1/shot1_frame152.tga
diff --git a/data/shot1/shot1_frame153.tga b/data/shot1/shot1_frame153.tga
diff --git a/data/shot1/shot1_frame154.tga b/data/shot1/shot1_frame154.tga
diff --git a/data/shot1/shot1_frame155.tga b/data/shot1/shot1_frame155.tga
diff --git a/data/shot1/shot1_frame156.tga b/data/shot1/shot1_frame156.tga
diff --git a/data/shot1/shot1_frame157.tga b/data/shot1/shot1_frame157.tga
diff --git a/data/shot1/shot1_frame158.tga b/data/shot1/shot1_frame158.tga
diff --git a/data/shot1/shot1_frame159.tga b/data/shot1/shot1_frame159.tga
diff --git a/data/shot1/shot1_frame16.tga b/data/shot1/shot1_frame16.tga
diff --git a/data/shot1/shot1_frame160.tga b/data/shot1/shot1_frame160.tga
diff --git a/data/shot1/shot1_frame161.tga b/data/shot1/shot1_frame161.tga
diff --git a/data/shot1/shot1_frame162.tga b/data/shot1/shot1_frame162.tga
diff --git a/data/shot1/shot1_frame163.tga b/data/shot1/shot1_frame163.tga
diff --git a/data/shot1/shot1_frame164.tga b/data/shot1/shot1_frame164.tga
diff --git a/data/shot1/shot1_frame165.tga b/data/shot1/shot1_frame165.tga
diff --git a/data/shot1/shot1_frame166.tga b/data/shot1/shot1_frame166.tga
diff --git a/data/shot1/shot1_frame167.tga b/data/shot1/shot1_frame167.tga
diff --git a/data/shot1/shot1_frame168.tga b/data/shot1/shot1_frame168.tga
diff --git a/data/shot1/shot1_frame169.tga b/data/shot1/shot1_frame169.tga
diff --git a/data/shot1/shot1_frame17.tga b/data/shot1/shot1_frame17.tga
diff --git a/data/shot1/shot1_frame170.tga b/data/shot1/shot1_frame170.tga
diff --git a/data/shot1/shot1_frame171.tga b/data/shot1/shot1_frame171.tga
diff --git a/data/shot1/shot1_frame172.tga b/data/shot1/shot1_frame172.tga
diff --git a/data/shot1/shot1_frame173.tga b/data/shot1/shot1_frame173.tga
diff --git a/data/shot1/shot1_frame174.tga b/data/shot1/shot1_frame174.tga
diff --git a/data/shot1/shot1_frame175.tga b/data/shot1/shot1_frame175.tga
diff --git a/data/shot1/shot1_frame176.tga b/data/shot1/shot1_frame176.tga
diff --git a/data/shot1/shot1_frame177.tga b/data/shot1/shot1_frame177.tga
diff --git a/data/shot1/shot1_frame178.tga b/data/shot1/shot1_frame178.tga
diff --git a/data/shot1/shot1_frame179.tga b/data/shot1/shot1_frame179.tga
diff --git a/data/shot1/shot1_frame18.tga b/data/shot1/shot1_frame18.tga
diff --git a/data/shot1/shot1_frame180.tga b/data/shot1/shot1_frame180.tga
diff --git a/data/shot1/shot1_frame181.tga b/data/shot1/shot1_frame181.tga
diff --git a/data/shot1/shot1_frame182.tga b/data/shot1/shot1_frame182.tga
diff --git a/data/shot1/shot1_frame183.tga b/data/shot1/shot1_frame183.tga
diff --git a/data/shot1/shot1_frame184.tga b/data/shot1/shot1_frame184.tga
diff --git a/data/shot1/shot1_frame185.tga b/data/shot1/shot1_frame185.tga
diff --git a/data/shot1/shot1_frame186.tga b/data/shot1/shot1_frame186.tga
diff --git a/data/shot1/shot1_frame187.tga b/data/shot1/shot1_frame187.tga
diff --git a/data/shot1/shot1_frame188.tga b/data/shot1/shot1_frame188.tga
diff --git a/data/shot1/shot1_frame189.tga b/data/shot1/shot1_frame189.tga
diff --git a/data/shot1/shot1_frame19.tga b/data/shot1/shot1_frame19.tga
diff --git a/data/shot1/shot1_frame190.tga b/data/shot1/shot1_frame190.tga
diff --git a/data/shot1/shot1_frame191.tga b/data/shot1/shot1_frame191.tga
diff --git a/data/shot1/shot1_frame192.tga b/data/shot1/shot1_frame192.tga
diff --git a/data/shot1/shot1_frame193.tga b/data/shot1/shot1_frame193.tga
diff --git a/data/shot1/shot1_frame194.tga b/data/shot1/shot1_frame194.tga
diff --git a/data/shot1/shot1_frame195.tga b/data/shot1/shot1_frame195.tga
diff --git a/data/shot1/shot1_frame196.tga b/data/shot1/shot1_frame196.tga
diff --git a/data/shot1/shot1_frame197.tga b/data/shot1/shot1_frame197.tga
diff --git a/data/shot1/shot1_frame198.tga b/data/shot1/shot1_frame198.tga
diff --git a/data/shot1/shot1_frame199.tga b/data/shot1/shot1_frame199.tga
diff --git a/data/shot1/shot1_frame2.tga b/data/shot1/shot1_frame2.tga
diff --git a/data/shot1/shot1_frame20.tga b/data/shot1/shot1_frame20.tga
diff --git a/data/shot1/shot1_frame200.tga b/data/shot1/shot1_frame200.tga
diff --git a/data/shot1/shot1_frame201.tga b/data/shot1/shot1_frame201.tga
diff --git a/data/shot1/shot1_frame202.tga b/data/shot1/shot1_frame202.tga
diff --git a/data/shot1/shot1_frame203.tga b/data/shot1/shot1_frame203.tga
diff --git a/data/shot1/shot1_frame204.tga b/data/shot1/shot1_frame204.tga
diff --git a/data/shot1/shot1_frame205.tga b/data/shot1/shot1_frame205.tga
diff --git a/data/shot1/shot1_frame206.tga b/data/shot1/shot1_frame206.tga
diff --git a/data/shot1/shot1_frame207.tga b/data/shot1/shot1_frame207.tga
diff --git a/data/shot1/shot1_frame208.tga b/data/shot1/shot1_frame208.tga
diff --git a/data/shot1/shot1_frame209.tga b/data/shot1/shot1_frame209.tga
diff --git a/data/shot1/shot1_frame21.tga b/data/shot1/shot1_frame21.tga
diff --git a/data/shot1/shot1_frame210.tga b/data/shot1/shot1_frame210.tga
diff --git a/data/shot1/shot1_frame211.tga b/data/shot1/shot1_frame211.tga
diff --git a/data/shot1/shot1_frame212.tga b/data/shot1/shot1_frame212.tga
diff --git a/data/shot1/shot1_frame213.tga b/data/shot1/shot1_frame213.tga
diff --git a/data/shot1/shot1_frame214.tga b/data/shot1/shot1_frame214.tga
diff --git a/data/shot1/shot1_frame215.tga b/data/shot1/shot1_frame215.tga
diff --git a/data/shot1/shot1_frame216.tga b/data/shot1/shot1_frame216.tga
diff --git a/data/shot1/shot1_frame217.tga b/data/shot1/shot1_frame217.tga
diff --git a/data/shot1/shot1_frame218.tga b/data/shot1/shot1_frame218.tga
diff --git a/data/shot1/shot1_frame219.tga b/data/shot1/shot1_frame219.tga
diff --git a/data/shot1/shot1_frame22.tga b/data/shot1/shot1_frame22.tga
diff --git a/data/shot1/shot1_frame220.tga b/data/shot1/shot1_frame220.tga
diff --git a/data/shot1/shot1_frame221.tga b/data/shot1/shot1_frame221.tga
diff --git a/data/shot1/shot1_frame222.tga b/data/shot1/shot1_frame222.tga
diff --git a/data/shot1/shot1_frame223.tga b/data/shot1/shot1_frame223.tga
diff --git a/data/shot1/shot1_frame224.tga b/data/shot1/shot1_frame224.tga
diff --git a/data/shot1/shot1_frame225.tga b/data/shot1/shot1_frame225.tga
diff --git a/data/shot1/shot1_frame226.tga b/data/shot1/shot1_frame226.tga
diff --git a/data/shot1/shot1_frame227.tga b/data/shot1/shot1_frame227.tga
diff --git a/data/shot1/shot1_frame228.tga b/data/shot1/shot1_frame228.tga
diff --git a/data/shot1/shot1_frame229.tga b/data/shot1/shot1_frame229.tga
diff --git a/data/shot1/shot1_frame23.tga b/data/shot1/shot1_frame23.tga
diff --git a/data/shot1/shot1_frame230.tga b/data/shot1/shot1_frame230.tga
diff --git a/data/shot1/shot1_frame231.tga b/data/shot1/shot1_frame231.tga
diff --git a/data/shot1/shot1_frame232.tga b/data/shot1/shot1_frame232.tga
diff --git a/data/shot1/shot1_frame233.tga b/data/shot1/shot1_frame233.tga
diff --git a/data/shot1/shot1_frame234.tga b/data/shot1/shot1_frame234.tga
diff --git a/data/shot1/shot1_frame235.tga b/data/shot1/shot1_frame235.tga
diff --git a/data/shot1/shot1_frame236.tga b/data/shot1/shot1_frame236.tga
diff --git a/data/shot1/shot1_frame237.tga b/data/shot1/shot1_frame237.tga
diff --git a/data/shot1/shot1_frame238.tga b/data/shot1/shot1_frame238.tga
diff --git a/data/shot1/shot1_frame239.tga b/data/shot1/shot1_frame239.tga
diff --git a/data/shot1/shot1_frame24.tga b/data/shot1/shot1_frame24.tga
diff --git a/data/shot1/shot1_frame240.tga b/data/shot1/shot1_frame240.tga
diff --git a/data/shot1/shot1_frame241.tga b/data/shot1/shot1_frame241.tga
diff --git a/data/shot1/shot1_frame242.tga b/data/shot1/shot1_frame242.tga
diff --git a/data/shot1/shot1_frame243.tga b/data/shot1/shot1_frame243.tga
diff --git a/data/shot1/shot1_frame244.tga b/data/shot1/shot1_frame244.tga
diff --git a/data/shot1/shot1_frame245.tga b/data/shot1/shot1_frame245.tga
diff --git a/data/shot1/shot1_frame246.tga b/data/shot1/shot1_frame246.tga
diff --git a/data/shot1/shot1_frame247.tga b/data/shot1/shot1_frame247.tga
diff --git a/data/shot1/shot1_frame248.tga b/data/shot1/shot1_frame248.tga
diff --git a/data/shot1/shot1_frame249.tga b/data/shot1/shot1_frame249.tga
diff --git a/data/shot1/shot1_frame25.tga b/data/shot1/shot1_frame25.tga
diff --git a/data/shot1/shot1_frame250.tga b/data/shot1/shot1_frame250.tga
diff --git a/data/shot1/shot1_frame251.tga b/data/shot1/shot1_frame251.tga
diff --git a/data/shot1/shot1_frame252.tga b/data/shot1/shot1_frame252.tga
diff --git a/data/shot1/shot1_frame253.tga b/data/shot1/shot1_frame253.tga
diff --git a/data/shot1/shot1_frame254.tga b/data/shot1/shot1_frame254.tga
diff --git a/data/shot1/shot1_frame255.tga b/data/shot1/shot1_frame255.tga
diff --git a/data/shot1/shot1_frame256.tga b/data/shot1/shot1_frame256.tga
diff --git a/data/shot1/shot1_frame257.tga b/data/shot1/shot1_frame257.tga
diff --git a/data/shot1/shot1_frame258.tga b/data/shot1/shot1_frame258.tga
diff --git a/data/shot1/shot1_frame259.tga b/data/shot1/shot1_frame259.tga
diff --git a/data/shot1/shot1_frame26.tga b/data/shot1/shot1_frame26.tga
diff --git a/data/shot1/shot1_frame260.tga b/data/shot1/shot1_frame260.tga
diff --git a/data/shot1/shot1_frame261.tga b/data/shot1/shot1_frame261.tga
diff --git a/data/shot1/shot1_frame262.tga b/data/shot1/shot1_frame262.tga
diff --git a/data/shot1/shot1_frame263.tga b/data/shot1/shot1_frame263.tga
diff --git a/data/shot1/shot1_frame264.tga b/data/shot1/shot1_frame264.tga
diff --git a/data/shot1/shot1_frame265.tga b/data/shot1/shot1_frame265.tga
diff --git a/data/shot1/shot1_frame27.tga b/data/shot1/shot1_frame27.tga
diff --git a/data/shot1/shot1_frame28.tga b/data/shot1/shot1_frame28.tga
diff --git a/data/shot1/shot1_frame29.tga b/data/shot1/shot1_frame29.tga
diff --git a/data/shot1/shot1_frame3.tga b/data/shot1/shot1_frame3.tga
diff --git a/data/shot1/shot1_frame30.tga b/data/shot1/shot1_frame30.tga
diff --git a/data/shot1/shot1_frame31.tga b/data/shot1/shot1_frame31.tga
diff --git a/data/shot1/shot1_frame32.tga b/data/shot1/shot1_frame32.tga
diff --git a/data/shot1/shot1_frame33.tga b/data/shot1/shot1_frame33.tga
diff --git a/data/shot1/shot1_frame34.tga b/data/shot1/shot1_frame34.tga
diff --git a/data/shot1/shot1_frame35.tga b/data/shot1/shot1_frame35.tga
diff --git a/data/shot1/shot1_frame36.tga b/data/shot1/shot1_frame36.tga
diff --git a/data/shot1/shot1_frame37.tga b/data/shot1/shot1_frame37.tga
diff --git a/data/shot1/shot1_frame38.tga b/data/shot1/shot1_frame38.tga
diff --git a/data/shot1/shot1_frame39.tga b/data/shot1/shot1_frame39.tga
diff --git a/data/shot1/shot1_frame4.tga b/data/shot1/shot1_frame4.tga
diff --git a/data/shot1/shot1_frame40.tga b/data/shot1/shot1_frame40.tga
diff --git a/data/shot1/shot1_frame41.tga b/data/shot1/shot1_frame41.tga
diff --git a/data/shot1/shot1_frame42.tga b/data/shot1/shot1_frame42.tga
diff --git a/data/shot1/shot1_frame43.tga b/data/shot1/shot1_frame43.tga
diff --git a/data/shot1/shot1_frame44.tga b/data/shot1/shot1_frame44.tga
diff --git a/data/shot1/shot1_frame45.tga b/data/shot1/shot1_frame45.tga
diff --git a/data/shot1/shot1_frame46.tga b/data/shot1/shot1_frame46.tga
diff --git a/data/shot1/shot1_frame47.tga b/data/shot1/shot1_frame47.tga
diff --git a/data/shot1/shot1_frame48.tga b/data/shot1/shot1_frame48.tga
diff --git a/data/shot1/shot1_frame49.tga b/data/shot1/shot1_frame49.tga
diff --git a/data/shot1/shot1_frame5.tga b/data/shot1/shot1_frame5.tga
diff --git a/data/shot1/shot1_frame50.tga b/data/shot1/shot1_frame50.tga
diff --git a/data/shot1/shot1_frame51.tga b/data/shot1/shot1_frame51.tga
diff --git a/data/shot1/shot1_frame52.tga b/data/shot1/shot1_frame52.tga
diff --git a/data/shot1/shot1_frame53.tga b/data/shot1/shot1_frame53.tga
diff --git a/data/shot1/shot1_frame54.tga b/data/shot1/shot1_frame54.tga
diff --git a/data/shot1/shot1_frame55.tga b/data/shot1/shot1_frame55.tga
diff --git a/data/shot1/shot1_frame56.tga b/data/shot1/shot1_frame56.tga
diff --git a/data/shot1/shot1_frame57.tga b/data/shot1/shot1_frame57.tga
diff --git a/data/shot1/shot1_frame58.tga b/data/shot1/shot1_frame58.tga
diff --git a/data/shot1/shot1_frame59.tga b/data/shot1/shot1_frame59.tga
diff --git a/data/shot1/shot1_frame6.tga b/data/shot1/shot1_frame6.tga
diff --git a/data/shot1/shot1_frame60.tga b/data/shot1/shot1_frame60.tga
diff --git a/data/shot1/shot1_frame61.tga b/data/shot1/shot1_frame61.tga
diff --git a/data/shot1/shot1_frame62.tga b/data/shot1/shot1_frame62.tga
diff --git a/data/shot1/shot1_frame63.tga b/data/shot1/shot1_frame63.tga
diff --git a/data/shot1/shot1_frame64.tga b/data/shot1/shot1_frame64.tga
diff --git a/data/shot1/shot1_frame65.tga b/data/shot1/shot1_frame65.tga
diff --git a/data/shot1/shot1_frame66.tga b/data/shot1/shot1_frame66.tga
diff --git a/data/shot1/shot1_frame67.tga b/data/shot1/shot1_frame67.tga
diff --git a/data/shot1/shot1_frame68.tga b/data/shot1/shot1_frame68.tga
diff --git a/data/shot1/shot1_frame69.tga b/data/shot1/shot1_frame69.tga
diff --git a/data/shot1/shot1_frame7.tga b/data/shot1/shot1_frame7.tga
diff --git a/data/shot1/shot1_frame70.tga b/data/shot1/shot1_frame70.tga
diff --git a/data/shot1/shot1_frame71.tga b/data/shot1/shot1_frame71.tga
diff --git a/data/shot1/shot1_frame72.tga b/data/shot1/shot1_frame72.tga
diff --git a/data/shot1/shot1_frame73.tga b/data/shot1/shot1_frame73.tga
diff --git a/data/shot1/shot1_frame74.tga b/data/shot1/shot1_frame74.tga
diff --git a/data/shot1/shot1_frame75.tga b/data/shot1/shot1_frame75.tga
diff --git a/data/shot1/shot1_frame76.tga b/data/shot1/shot1_frame76.tga
diff --git a/data/shot1/shot1_frame77.tga b/data/shot1/shot1_frame77.tga
diff --git a/data/shot1/shot1_frame78.tga b/data/shot1/shot1_frame78.tga
diff --git a/data/shot1/shot1_frame79.tga b/data/shot1/shot1_frame79.tga
diff --git a/data/shot1/shot1_frame8.tga b/data/shot1/shot1_frame8.tga
diff --git a/data/shot1/shot1_frame80.tga b/data/shot1/shot1_frame80.tga
diff --git a/data/shot1/shot1_frame81.tga b/data/shot1/shot1_frame81.tga
diff --git a/data/shot1/shot1_frame82.tga b/data/shot1/shot1_frame82.tga
diff --git a/data/shot1/shot1_frame83.tga b/data/shot1/shot1_frame83.tga
diff --git a/data/shot1/shot1_frame84.tga b/data/shot1/shot1_frame84.tga
diff --git a/data/shot1/shot1_frame85.tga b/data/shot1/shot1_frame85.tga
diff --git a/data/shot1/shot1_frame86.tga b/data/shot1/shot1_frame86.tga
diff --git a/data/shot1/shot1_frame87.tga b/data/shot1/shot1_frame87.tga
diff --git a/data/shot1/shot1_frame88.tga b/data/shot1/shot1_frame88.tga
diff --git a/data/shot1/shot1_frame89.tga b/data/shot1/shot1_frame89.tga
diff --git a/data/shot1/shot1_frame9.tga b/data/shot1/shot1_frame9.tga
diff --git a/data/shot1/shot1_frame90.tga b/data/shot1/shot1_frame90.tga
diff --git a/data/shot1/shot1_frame91.tga b/data/shot1/shot1_frame91.tga
diff --git a/data/shot1/shot1_frame92.tga b/data/shot1/shot1_frame92.tga
diff --git a/data/shot1/shot1_frame93.tga b/data/shot1/shot1_frame93.tga
diff --git a/data/shot1/shot1_frame94.tga b/data/shot1/shot1_frame94.tga
diff --git a/data/shot1/shot1_frame95.tga b/data/shot1/shot1_frame95.tga
diff --git a/data/shot1/shot1_frame96.tga b/data/shot1/shot1_frame96.tga
diff --git a/data/shot1/shot1_frame97.tga b/data/shot1/shot1_frame97.tga
diff --git a/data/shot1/shot1_frame98.tga b/data/shot1/shot1_frame98.tga
diff --git a/data/shot1/shot1_frame99.tga b/data/shot1/shot1_frame99.tga
diff --git a/data/shot1_frame0.png b/data/shot1_frame0.png
diff --git a/data/shot1_frame1.png b/data/shot1_frame1.png
diff --git a/data/shot1_frame2.png b/data/shot1_frame2.png