mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "Duplicate Cels" command (fix #746)

Browse Source
This commit is contained in:
David Capello 2015-08-19 15:59:30 -03:00
parent 3e71647308
commit 73c725827e
4 changed files with 84 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/gui.xml
View File

@ -70,6 +70,12 @@
<key command="NewFrame" shortcut="Alt+M">
<param name="content" value="cel" />
</key>
<key command="NewFrame" shortcut="Alt+D">
<param name="content" value="celblock" />
</key>
<key command="NewFrame" shortcut="Alt+Shift+D">
<param name="content" value="cel" />
</key>
<key command="RemoveFrame" shortcut="Alt+C" />
<key command="FrameProperties" shortcut="P">
<param name="frame" value="current" />
@ -598,7 +604,10 @@
<item command="NewFrame" text="New &amp;Empty Frame">
<param name="content" value="empty" />
</item>
<item command="NewFrame" text="Copy &amp;Cel in Next Frame">
<item command="NewFrame" text="&amp;Duplicate Cel(s)">
<param name="content" value="celblock" />
</item>
<item command="NewFrame" text="Duplicate &amp;Linked Cel(s)">
<param name="content" value="cel" />
</item>
<item command="RemoveFrame" text="&amp;Remove Frame" />
@ -752,6 +761,13 @@
<item command="ClearCel" text="&amp;Clear" />
<item command="UnlinkCel" text="&amp;Unlink" />
<item command="LinkCels" text="&amp;Link Cels" />
<separator />
<item command="NewFrame" text="&amp;Duplicate Cel(s)">
<param name="content" value="celblock" />
</item>
<item command="NewFrame" text="Duplicate L&amp;inked Cel(s)">
<param name="content" value="cel" />
</item>
</menu>
<menu id="cel_movement_popup">

60
src/app/commands/cmd_new_frame.cpp
View File

@ -39,7 +39,8 @@ public:
enum class Content {
DUPLICATE_FRAME,
NEW_EMPTY_FRAME,
DUPLICATE_CEL
DUPLICATE_CELS,
DUPLICATE_CELS_BLOCK,
};
NewFrameCommand();
@ -73,7 +74,9 @@ void NewFrameCommand::onLoadParams(const Params& params)
else if (content == "empty")
m_content = Content::NEW_EMPTY_FRAME;
else if (content == "cel")
m_content = Content::DUPLICATE_CEL;
m_content = Content::DUPLICATE_CELS;
else if (content == "celblock")
m_content = Content::DUPLICATE_CELS_BLOCK;
}
bool NewFrameCommand::onEnabled(Context* context)
@ -92,26 +95,64 @@ void NewFrameCommand::onExecute(Context* context)
DocumentApi api = document->getApi(transaction);
switch (m_content) {
case Content::DUPLICATE_FRAME:
api.addFrame(sprite, writer.frame()+1);
break;
case Content::NEW_EMPTY_FRAME:
api.addEmptyFrame(sprite, writer.frame()+1);
break;
case Content::DUPLICATE_CEL: {
case Content::DUPLICATE_CELS:
case Content::DUPLICATE_CELS_BLOCK: {
// TODO the range of selected frames should be in doc::Site.
Timeline* timeline = App::instance()->getMainWindow()->getTimeline();
Timeline::Range range = timeline->range();
if (range.enabled()) {
std::map<CelData*, Cel*> relatedCels;
timeline->prepareToMoveRange();
for (LayerIndex layer = range.layerBegin(); layer <= range.layerEnd(); ++layer) {
LayerIndex layerBegin = range.layerBegin();
LayerIndex layerEnd = range.layerEnd();
if (range.type() == DocumentRange::kFrames) {
layerBegin = writer.sprite()->firstLayer();
layerEnd = writer.sprite()->lastLayer();
}
for (LayerIndex layer = layerBegin; layer <= layerEnd; ++layer) {
Layer* layerPtr = writer.sprite()->indexToLayer(layer);
if (layerPtr->isImage()) {
for (frame_t frame = range.frameEnd(); frame >= range.frameBegin(); --frame) {
frame_t srcFrame = frame;
frame_t dstFrame = frame+range.frames();
bool continuous;
CelData* srcCelData = nullptr;
if (m_content == Content::DUPLICATE_CELS_BLOCK) {
continuous = false;
Cel* srcCel = static_cast<LayerImage*>(layerPtr)->cel(srcFrame);
if (srcCel) {
srcCelData = srcCel->data();
auto it = relatedCels.find(srcCelData);
if (it != relatedCels.end()) {
srcFrame = it->second->frame();
continuous = true;
}
}
}
else
continuous = layerPtr->isContinuous();
api.copyCel(
static_cast<LayerImage*>(layerPtr), frame,
static_cast<LayerImage*>(layerPtr), frame+range.frames());
static_cast<LayerImage*>(layerPtr), srcFrame,
static_cast<LayerImage*>(layerPtr), dstFrame, continuous);
if (srcCelData && !relatedCels[srcCelData])
relatedCels[srcCelData] = layerPtr->cel(dstFrame);
}
}
}
@ -157,8 +198,11 @@ std::string NewFrameCommand::onGetFriendlyName() const
case Content::NEW_EMPTY_FRAME:
text = "New Empty Frame";
break;
case Content::DUPLICATE_CEL:
text = "Copy Cel into Next Frame";
case Content::DUPLICATE_CELS:
text = "Duplicate Linked Cels";
break;
case Content::DUPLICATE_CELS_BLOCK:
text = "Duplicate Cels";
break;
}

14
src/app/document_api.cpp
View File

@ -357,11 +357,21 @@ void DocumentApi::moveCel(
void DocumentApi::copyCel(
LayerImage* srcLayer, frame_t srcFrame,
LayerImage* dstLayer, frame_t dstFrame)
{
copyCel(
srcLayer, srcFrame,
dstLayer, dstFrame, dstLayer->isContinuous());
}
void DocumentApi::copyCel(
LayerImage* srcLayer, frame_t srcFrame,
LayerImage* dstLayer, frame_t dstFrame, bool continuous)
{
ASSERT(srcLayer != dstLayer || srcFrame != dstFrame);
m_transaction.execute(new cmd::CopyCel(
m_transaction.execute(
new cmd::CopyCel(
srcLayer, srcFrame,
dstLayer, dstFrame, dstLayer->isContinuous()));
dstLayer, dstFrame, continuous));
}
void DocumentApi::swapCel(

3
src/app/document_api.h
View File

@ -73,6 +73,9 @@ namespace app {
void copyCel(
LayerImage* srcLayer, frame_t srcFrame,
LayerImage* dstLayer, frame_t dstFrame);
void copyCel(
LayerImage* srcLayer, frame_t srcFrame,
LayerImage* dstLayer, frame_t dstFrame, bool continuous);
void swapCel(
LayerImage* layer, frame_t frame1, frame_t frame2);