mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 13:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Timeline: Add code to show equal keyframes joined

Browse Source 
This code is disabled at the moment because there isn't a fast way
to compare frames.
This commit is contained in:
David Capello 2013-12-15 14:02:00 -03:00
parent 3c861f1a7e
commit 9806e33876
4 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/skins/default/sheet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

21
data/skins/default/skin.xml
View File

@ -384,6 +384,27 @@
<icon part="timeline_keyframe_active" />
</style>
<style id="timeline_fromleft">
<icon part="timeline_fromleft_normal" />
</style>
<style id="timeline_fromleft:active">
<icon part="timeline_fromleft_active" />
</style>
<style id="timeline_fromright">
<icon part="timeline_fromright_normal" />
</style>
<style id="timeline_fromright:active">
<icon part="timeline_fromright_active" />
</style>
<style id="timeline_fromboth">
<icon part="timeline_fromboth_normal" />
</style>
<style id="timeline_fromboth:active">
<icon part="timeline_fromboth_active" />
</style>
<!-- timeline_gear -->
<style id="timeline_gear" base="timeline_box">
<icon part="timeline_gear" />

44
src/app/ui/timeline.cpp
View File

@ -87,6 +87,9 @@ static const char* kTimelineClosedPadlock = "timeline_closed_padlock";
static const char* kTimelineLayer = "timeline_layer";
static const char* kTimelineEmptyFrame = "timeline_empty_frame";
static const char* kTimelineKeyframe = "timeline_keyframe";
static const char* kTimelineFromLeft = "timeline_fromleft";
static const char* kTimelineFromRight = "timeline_fromright";
static const char* kTimelineFromBoth = "timeline_fromboth";
static const char* kTimelineGear = "timeline_gear";
static const char* kTimelinePadding = "timeline_padding";
static const char* kTimelinePaddingTr = "timeline_padding_tr";
@ -120,6 +123,9 @@ Timeline::Timeline()
, m_timelineLayerStyle(get_style(kTimelineLayer))
, m_timelineEmptyFrameStyle(get_style(kTimelineEmptyFrame))
, m_timelineKeyframeStyle(get_style(kTimelineKeyframe))
, m_timelineFromLeftStyle(get_style(kTimelineFromLeft))
, m_timelineFromRightStyle(get_style(kTimelineFromRight))
, m_timelineFromBothStyle(get_style(kTimelineFromBoth))
, m_timelineGearStyle(get_style(kTimelineGear))
, m_timelinePaddingStyle(get_style(kTimelinePadding))
, m_timelinePaddingTrStyle(get_style(kTimelinePaddingTr))
@ -1021,13 +1027,13 @@ void Timeline::drawLayer(ui::Graphics* g, int layer_index)
void Timeline::drawCel(ui::Graphics* g, int layer_index, FrameNumber frame, Cel* cel)
{
Layer *layer = m_layers[layer_index];
Layer* layer = m_layers[layer_index];
Image* image = (cel ? m_sprite->getStock()->getImage(cel->getImage()): NULL);
bool is_hover = (m_hot_part == A_PART_CEL &&
m_hot_layer == layer_index &&
m_hot_frame == frame);
bool is_active = (isLayerActive(layer) || isFrameActive(frame));
bool is_empty = (cel == NULL ||
m_sprite->getStock()->getImage(cel->getImage()) == NULL);
bool is_empty = (image == NULL);
gfx::Rect bounds = getPartBounds(A_PART_CEL, layer_index, frame);
if (m_range.inRange(layer_index, frame)
@ -1037,9 +1043,35 @@ void Timeline::drawCel(ui::Graphics* g, int layer_index, FrameNumber frame, Cel*
else
drawPart(g, bounds, NULL, m_timelineBoxStyle, is_active, is_hover);
drawPart(g, bounds, NULL,
is_empty ? m_timelineEmptyFrameStyle: m_timelineKeyframeStyle,
is_active, is_hover);
skin::Style* style;
if (is_empty) {
style = m_timelineEmptyFrameStyle;
}
else {
#if 0 // TODO We must find a fast-way to compare keyframes. Cels could
// share images until the user draw over them. Also, we could
// calculate a hash for each image (and recalculate it when the
// user draw over it), so then we can compare hashes. Other
// option is to use a thread to calculate differences, but I
// think it's too much for just UI stuff.
Cel* left = (layer->isImage() ? static_cast<LayerImage*>(layer)->getCel(frame.previous()): NULL);
Cel* right = (layer->isImage() ? static_cast<LayerImage*>(layer)->getCel(frame.next()): NULL);
Image* leftImg = (left ? m_sprite->getStock()->getImage(left->getImage()): NULL);
Image* rightImg = (right ? m_sprite->getStock()->getImage(right->getImage()): NULL);
bool fromLeft = (leftImg && count_diff_between_images(image, leftImg) == 0);
bool fromRight = (rightImg && count_diff_between_images(image, rightImg) == 0);
if (fromLeft && fromRight)
style = m_timelineFromBothStyle;
else if (fromLeft)
style = m_timelineFromLeftStyle;
else if (fromRight)
style = m_timelineFromRightStyle;
else
#endif
style = m_timelineKeyframeStyle;
}
drawPart(g, bounds, NULL, style, is_active, is_hover);
}
void Timeline::drawPaddings(ui::Graphics* g)

3
src/app/ui/timeline.h
View File

@ -154,6 +154,9 @@ namespace app {
skin::Style* m_timelineLayerStyle;
skin::Style* m_timelineEmptyFrameStyle;
skin::Style* m_timelineKeyframeStyle;
skin::Style* m_timelineFromLeftStyle;
skin::Style* m_timelineFromRightStyle;
skin::Style* m_timelineFromBothStyle;
skin::Style* m_timelineGearStyle;
skin::Style* m_timelinePaddingStyle;
skin::Style* m_timelinePaddingTrStyle;