diff --git a/src/examples/ImageScaleDown.cpp b/src/examples/ImageScaleDown.cpp index e448621b..8c98a779 100644 --- a/src/examples/ImageScaleDown.cpp +++ b/src/examples/ImageScaleDown.cpp @@ -36,7 +36,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) //Original auto picture = tvg::Picture::gen(); - if (picture->load(EXAMPLE_DIR"/scaledown.png") != tvg::Result::Success) { + if (picture->load(EXAMPLE_DIR"/scaledown.jpg") != tvg::Result::Success) { cout << "The PNG file is not loaded correctly. Did you enable PNG Loader?" << endl; return; } @@ -50,18 +50,7 @@ void tvgUpdateCmds(tvg::Canvas* canvas, float progress) { if (!canvas || !pPicture) return; - auto scale = 1.0f; - - if (progress > 0.875f) scale = 0.125f; - else if (progress > 0.75f) scale = 0.25f; - else if (progress > 0.625f) scale = 0.375f; - else if (progress > 0.5f) scale = 0.5f; - else if (progress > 0.375f) scale = 0.625f; - else if (progress > 0.25f) scale = 0.75f; - else if (progress > 0.125f) scale = 0.875f; - else scale = 1.0f; - - pPicture->scale(scale); + pPicture->scale(1.0f - progress); canvas->update(pPicture); } diff --git a/src/examples/ImageScaleUp.cpp b/src/examples/ImageScaleUp.cpp index ad69330f..468d0480 100644 --- a/src/examples/ImageScaleUp.cpp +++ b/src/examples/ImageScaleUp.cpp @@ -36,7 +36,7 @@ void tvgDrawCmds(tvg::Canvas* canvas) //Original auto picture = tvg::Picture::gen(); - if (picture->load(EXAMPLE_DIR"/scaleup.png") != tvg::Result::Success) { + if (picture->load(EXAMPLE_DIR"/scaleup.jpg") != tvg::Result::Success) { cout << "The PNG file is not loaded correctly. Did you enable PNG Loader?" << endl; return; } @@ -50,18 +50,7 @@ void tvgUpdateCmds(tvg::Canvas* canvas, float progress) { if (!canvas || !pPicture) return; - auto scale = 1.0f; - - if (progress > 0.875f) scale = 4.0f; - else if (progress > 0.75f) scale = 3.0f; - else if (progress > 0.625f) scale = 2.5f; - else if (progress > 0.5f) scale = 2.0f; - else if (progress > 0.375f) scale = 1.75f; - else if (progress > 0.25f) scale = 1.5f; - else if (progress > 0.125f) scale = 1.25f; - else scale = 1.0f; - - pPicture->scale(scale); + pPicture->scale(progress * 4.0f); canvas->update(pPicture); } diff --git a/src/examples/resources/scaledown.jpg b/src/examples/resources/scaledown.jpg new file mode 100644 index 00000000..dfdbe3ca Binary files /dev/null and b/src/examples/resources/scaledown.jpg differ diff --git a/src/examples/resources/scaledown.png b/src/examples/resources/scaledown.png deleted file mode 100644 index f4ac3ee2..00000000 Binary files a/src/examples/resources/scaledown.png and /dev/null differ diff --git a/src/examples/resources/scaleup.jpg b/src/examples/resources/scaleup.jpg new file mode 100644 index 00000000..a473d8f6 Binary files /dev/null and b/src/examples/resources/scaleup.jpg differ diff --git a/src/examples/resources/scaleup.png b/src/examples/resources/scaleup.png deleted file mode 100644 index 345fbdae..00000000 Binary files a/src/examples/resources/scaleup.png and /dev/null differ