find animation sprites

thomasballinger · Mar 31, 2016 · 30fb3e8 · 30fb3e8
1 parent db428aa
commit 30fb3e8
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 47 deletions.
diff --git a/data/ships.txt b/data/ships.txt
@@ -21,6 +21,11 @@ ship "Triangle"
 		"maxDH" 200
 	engine -16 82
 	engine 16 82
+	explode "tiny explosion"
+
+effect "tiny explosion"
+	sprite "effect/explosion/tiny"
+	"frame rate" 15
 
 ship "Shuttle"
 	sprite "ship/shuttle"

diff --git a/sprite-loader.js b/sprite-loader.js
@@ -42,11 +42,27 @@ module.exports = function(source) {
   var sprites = findSprites(data);
   sprites.push.apply(sprites, engineSprites);
 
-  // uniquify
-  var unique = {};
-  for (var sprite of sprites){ unique[sprite] = true; }
-  sprites = Object.keys(unique);
+  spriteFiles = {};
+  var path = './esimages/';
+  var images = sprites.map(function(x){
+    filename = path + x + '.png';
+    if (fs.existsSync(filename)){
+      spriteFiles[x] = filename;
+    } else if (fs.existsSync(path+x+'~0.png')){
+      var frames = [];
+      var i = 0;
+      while (fs.existsSync(path+x+'~'+i+'.png')){
+        frames.push(path+x+'~'+i+'.png');
+        i++;
+      }
+      spriteFiles[x] = frames;
+    } else {
+      throw Error("referenced image does not exist: "+filename);
+    }
+    return filename;
+  });
 
-  return sprites;
+  console.log(spriteFiles);
+  return spriteFiles;
 };
 
diff --git a/sprite-outline-loader.js b/sprite-outline-loader.js
@@ -6,31 +6,28 @@ var imageprocess = require('./imageprocess');
 module.exports = function(source) {
   var callback = this.async();
   this.cacheable();
-  var sprites = source;
+  var spriteFiles = source;
 
-  var images = sprites.map(function(x){
-    filename = './esimages/' + x + '.png';
-    if (!fs.existsSync(filename)){
-      throw Error("referenced image does not exist: "+filename);
-    }
-    return filename;
+  var outlines = {};
+
+  // skip animations with multiple frames
+  var spritesThatNeedOutlines = Object.keys(spriteFiles).filter(function(sprite){
+    return !Array.isArray(spriteFiles[sprite]);
   });
 
-  var outlines = {};
-  for (var i=0; i < images.length; i++){
-    var sprite = sprites[i];
-    var filename = images[i];
+  for (var sprite of spritesThatNeedOutlines){
+    var filename = spriteFiles[sprite];
 
-    var thisCB = function(spriteName){
+    var thisCB = function(spriteName, filename){
       return function(path){
         outlines[spriteName] = path;
-        if (Object.keys(outlines).length === sprites.length){
+        if (Object.keys(outlines).length === spritesThatNeedOutlines.length){
           callback(null, outlines);
         } else {
-          console.log(Object.keys(outlines).length+'/'+sprites.length+' outlines complete');
+          console.log(Object.keys(outlines).length+'/'+spritesThatNeedOutlines.length+' outlines complete');
         }
       };
-    }(sprite);
+    }(sprite, spriteFiles[sprite]);
 
     imageprocess.findOutline(filename, thisCB);
   }

diff --git a/sprite-size-loader.js b/sprite-size-loader.js
@@ -4,20 +4,15 @@ var fs = require('fs');
 /** source should be a list of sprites */
 module.exports = function(source) {
   this.cacheable();
-  var sprites = source;
-
-  var images = sprites.map(function(x){
-    filename = './esimages/' + x + '.png';
-    if (!fs.existsSync(filename)){
-      throw Error("referenced image does not exist: "+filename);
-    }
-    return filename;
-  });
+  var spriteFiles = source;
 
   var dimensions = {};
-  for (var i=0; i < images.length; i++){
-    var sprite = sprites[i];
-    var filename = images[i];
+  for (var sprite of Object.keys(spriteFiles)){
+    var filename = spriteFiles[sprite];
+    // skip multiple frame animations
+    if (Array.isArray(filename)){
+      continue;
+    }
     dimensions[sprite] = getDimsPNG(filename);
   }
 

diff --git a/sprite-src-loader.js b/sprite-src-loader.js
@@ -4,26 +4,18 @@ var fs = require('fs');
 /** source should be a list of sprites */
 module.exports = function(source) {
   this.cacheable();
-  var sprites = source;
+  var spriteFiles = source;
 
-  var images = sprites.map(function(x){
-    filename = '/esimages/' + x + '.png';
-    if (!fs.existsSync('.'+filename)){
-      throw Error("referenced image does not exist: "+filename);
-    }
-    return filename;
-  });
-
-  var ids = sprites.map(function(sprite){
+  function id(sprite){
     return sprite.replace(/ /g, '_');
-  });
+  }
 
   var output = '';
 
-  for (var i = 0; i<sprites.length; i++){
-    output += '<img src="'+images[i]+'" ' +
-              'id="'+ids[i]+'" '+
-              'alt="sprite for '+sprites[i]+'" >\n';
+  for (var sprite of Object.keys(spriteFiles)){
+    output += '<img src="'+spriteFiles[sprite]+'" ' +
+              'id="'+id(sprite)+'" '+
+              'alt="sprite for '+sprite+'" >\n';
   }
   return output;
 };