Skip to content

MicroBitDisplay::animate - Support negative stride #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MicroBitDisplay::animate - Support negative stride #427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions source/drivers/MicroBitDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,10 @@ void MicroBitDisplay::updateScrollImage()
void MicroBitDisplay::updateAnimateImage()
{
//wait until we have rendered the last position to give a continuous animation.
if (scrollingImagePosition <= -scrollingImage.getWidth() + (MICROBIT_DISPLAY_WIDTH + scrollingImageStride) && scrollingImageRendered)
if ( ( scrollingImageStride <= 0
? scrollingImagePosition <= -scrollingImage.getWidth() + (MICROBIT_DISPLAY_WIDTH + scrollingImageStride)
: scrollingImagePosition >= scrollingImageStride)
&& scrollingImageRendered)
{
if (animationMode == ANIMATION_MODE_ANIMATE_IMAGE_WITH_CLEAR)
this->clear();
Expand All @@ -404,8 +407,16 @@ void MicroBitDisplay::updateAnimateImage()
return;
}

if(scrollingImagePosition > 0)
image.shiftLeft(-scrollingImageStride);
if ( scrollingImageStride <= 0)
{
if(scrollingImagePosition > 0)
image.shiftLeft(-scrollingImageStride);
}
else
{
if ( scrollingImagePosition + scrollingImage.getWidth() < MICROBIT_DISPLAY_WIDTH)
image.shiftRight( scrollingImageStride);
}

image.paste(scrollingImage, scrollingImagePosition, 0, 0);

Expand Down Expand Up @@ -931,7 +942,11 @@ int MicroBitDisplay::animateAsync(MicroBitImage image, int delay, int stride, in
stride = -stride;

//calculate starting position which is offset by the stride
scrollingImagePosition = (startingPosition == MICROBIT_DISPLAY_ANIMATE_DEFAULT_POS) ? MICROBIT_DISPLAY_WIDTH + stride : startingPosition;
if ( stride <= 0)
scrollingImagePosition = (startingPosition == MICROBIT_DISPLAY_ANIMATE_DEFAULT_POS) ? MICROBIT_DISPLAY_WIDTH + stride : startingPosition;
else
scrollingImagePosition = (startingPosition == MICROBIT_DISPLAY_ANIMATE_DEFAULT_POS) ? stride - image.getWidth() : startingPosition - image.getWidth() + 1;

scrollingImageStride = stride;
scrollingImage = image;
scrollingImageRendered = false;
Expand Down