mirror of
https://github.com/thorvg/thorvg.git
synced 2025-06-08 05:33:36 +00:00
ed01ef717e
Remove the requirement for unique_ptr in the function prototypes. This change will simplify the API usage, making it more streamlined and user-friendly. However, memory management will now be the responsibility of the user. C++ API Modification: - Result Paint::mask(std::unique_ptr<Paint> target, MaskMethod method) -> Result Paint::mask(Paint* target, MaskMethod method) - Result Paint::clip(std::unique_ptr<Paint> clipper) -> Result Paint::clip(Paint* clipper) - virtual Result Canvas::push(std::unique_ptr<Paint> paint) -> virtual Result Canvas::push(Paint* paint) - std::unique_ptr<LinearGradient> LinearGradient::gen() -> LinearGradient* LinearGradient::gen() - std::unique_ptr<RadialGradient> RadialGradient::gen() -> RadialGradient* RadialGradient::gen() - Result Shape::strokeFill(std::unique_ptr<Fill> f) -> Result Shape::strokeFill(Fill* f) - Result Shape::fill(std::unique_ptr<Fill> f) -> Result Shape::fill(Fill* f) - std::unique_ptr<Shape> Shape::gen() -> Shape* Shape::gen() - std::unique_ptr<Picture> Picture::gen() -> Result Picture::push(Paint* paint) - std::unique_ptr<Scene> Scene::gen() -> Scene* Scene::gen() - Result Text::fill(std::unique_ptr<Fill> f) -> Result Text::fill(Fill* f) - std::unique_ptr<Text> Text::gen() -> Text* Text::gen() - std::unique_ptr<SwCanvas> SwCanvas::gen() -> SwCanvas* SwCanvas::gen() - std::unique_ptr<GlCanvas> GlCanvas::gen() -> GlCanvas* GlCanvas::gen() - std::unique_ptr<Animation> Animation::gen() -> Animation* Animation::gen() - Result Saver::background(std::unique_ptr<Paint> paint) -> Result Saver::background(Paint* paint) - Result Saver::save(std::unique_ptr<Paint> paint, const char* filename, uint32_t quality = 100) -> Result Saver::save(Paint* paint, const char* filename, uint32_t quality = 100) - std::unique_ptr<Saver> Saver::gen() -> Saver* Saver::gen() - std::unique_ptr<Accessor> Accessor::gen() -> Accessor* Accessor::gen() C++ API removal: - template<typename T = tvg::Paint> std::unique_ptr<T> cast(Paint* paint) - template<typename T = tvg::Paint> std::unique_ptr<T> cast(Paint* paint) issue: https://github.com/thorvg/thorvg/issues
132 lines
No EOL
4.2 KiB
C++
132 lines
No EOL
4.2 KiB
C++
/*
|
|
* Copyright (c) 2024 the ThorVG project. All rights reserved.
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
* The above copyright notice and this permission notice shall be included in all
|
|
* copies or substantial portions of the Software.
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include <thorvg.h>
|
|
#ifdef THORVG_LOTTIE_LOADER_SUPPORT
|
|
#include <thorvg_lottie.h>
|
|
#endif
|
|
#include <fstream>
|
|
#include <cstring>
|
|
#include "catch.hpp"
|
|
|
|
using namespace tvg;
|
|
using namespace std;
|
|
|
|
#ifdef THORVG_LOTTIE_LOADER_SUPPORT
|
|
|
|
TEST_CASE("Lottie Slot", "[tvgLottie]")
|
|
{
|
|
REQUIRE(Initializer::init(0) == Result::Success);
|
|
|
|
auto animation = unique_ptr<LottieAnimation>(LottieAnimation::gen());
|
|
REQUIRE(animation);
|
|
|
|
auto picture = animation->picture();
|
|
REQUIRE(picture->type() == Type::Picture);
|
|
|
|
const char* slotJson = R"({"gradient_fill":{"p":{"p":2,"k":{"a":0,"k":[0,0.1,0.1,0.2,1,1,0.1,0.2,0.1,1]}}}})";
|
|
|
|
//Slot override before loaded
|
|
REQUIRE(animation->override(slotJson) == Result::InsufficientCondition);
|
|
|
|
//Animation load
|
|
REQUIRE(picture->load(TEST_DIR"/lottieslot.json") == Result::Success);
|
|
|
|
//Slot revert before overriding
|
|
REQUIRE(animation->override(nullptr) == Result::Success);
|
|
|
|
//Slot override
|
|
REQUIRE(animation->override(slotJson) == Result::Success);
|
|
|
|
//Slot revert
|
|
REQUIRE(animation->override(nullptr) == Result::Success);
|
|
|
|
//Slot override after reverting
|
|
REQUIRE(animation->override(slotJson) == Result::Success);
|
|
|
|
//Slot override with invalid JSON
|
|
REQUIRE(animation->override("") == Result::InvalidArguments);
|
|
|
|
REQUIRE(Initializer::term() == Result::Success);
|
|
}
|
|
|
|
TEST_CASE("Lottie Slot 2", "[tvgLottie]")
|
|
{
|
|
REQUIRE(Initializer::init(0) == Result::Success);
|
|
|
|
auto animation = unique_ptr<LottieAnimation>(LottieAnimation::gen());
|
|
REQUIRE(animation);
|
|
|
|
auto picture = animation->picture();
|
|
|
|
const char* slotJson = R"({"lottie-icon-outline":{"p":{"a":0,"k":[1,1,0]}},"lottie-icon-solid":{"p":{"a":0,"k":[0,0,1]}}})";
|
|
|
|
//Animation load
|
|
REQUIRE(picture->load(TEST_DIR"/lottieslotkeyframe.json") == Result::Success);
|
|
|
|
//Slot override
|
|
REQUIRE(animation->override(slotJson) == Result::Success);
|
|
|
|
//Slot revert
|
|
REQUIRE(animation->override(nullptr) == Result::Success);
|
|
|
|
//Slot override after reverting
|
|
REQUIRE(animation->override(slotJson) == Result::Success);
|
|
|
|
REQUIRE(Initializer::term() == Result::Success);
|
|
}
|
|
|
|
TEST_CASE("Lottie Marker", "[tvgLottie]")
|
|
{
|
|
REQUIRE(Initializer::init(0) == Result::Success);
|
|
|
|
auto animation = unique_ptr<LottieAnimation>(LottieAnimation::gen());
|
|
REQUIRE(animation);
|
|
|
|
auto picture = animation->picture();
|
|
|
|
//Set marker name before loaded
|
|
REQUIRE(animation->segment("sectionC") == Result::InsufficientCondition);
|
|
|
|
//Animation load
|
|
REQUIRE(picture->load(TEST_DIR"/lottiemarker.json") == Result::Success);
|
|
|
|
//Set marker
|
|
REQUIRE(animation->segment("sectionA") == Result::Success);
|
|
|
|
//Set marker by invalid name
|
|
REQUIRE(animation->segment("") == Result::InvalidArguments);
|
|
|
|
//Get marker count
|
|
REQUIRE(animation->markersCnt() == 3);
|
|
|
|
//Get marker name by index
|
|
REQUIRE(!strcmp(animation->marker(1), "sectionB"));
|
|
|
|
//Get marker name by invalid index
|
|
REQUIRE(animation->marker(-1) == nullptr);
|
|
|
|
REQUIRE(Initializer::term() == Result::Success);
|
|
}
|
|
|
|
#endif |