Feature : merge layers

Added feature to merge a layer with the layer below
Done at #jsconfeu2014 :)

New icon in icons : merge-icon.png
TODO : reorder the icons folder, it's waaaaaaay too messy !!
This commit is contained in:
juliandescottes
2014-09-13 20:10:05 +02:00
parent 90845b3a62
commit 4ed7338f25
9 changed files with 65 additions and 6 deletions

View File

@@ -25,6 +25,18 @@
frames.push(frame);
}
return frames;
},
mergeLayers : function (layerA, layerB) {
var framesA = layerA.getFrames();
var framesB = layerB.getFrames();
var mergedFrames = [];
framesA.forEach(function (frame, index) {
var otherFrame = framesB[index];
mergedFrames.push(pskl.utils.FrameUtils.merge([otherFrame, frame]));
});
var mergedLayer = pskl.model.Layer.fromFrames(layerA.getName(), mergedFrames);
return mergedLayer;
}
};