mirror of
https://github.com/thorvg/thorvg.git
synced 2025-06-08 05:33:36 +00:00
0ebbc614be
- Enhanced Scene management to provide users with more control. - Scenes now support adding specific scenes at defined positions and removing them as needed. - Ensure safe access to Canvas, Scene paints() by adding const specifiers. - Removed virtual specifier for the canvas primitive apis. - Introduced a nested scene in the canvas to remove logic duplication. C++ API Modification: - Result Scene::push(Paint* paint) -> Result Scene::push(Paint* target, Paint* at = nullptr) - Result Scene::clear(bool free = true) -> Result Scene::remove(Paint* paint = nullptr) - Result Canvas::push(Paint* paint) -> Result Canvas::push(Paint* target, Paint* at = nullptr) - list<Paint*>& Scene::paints() -> const list<Paint*>& Scene::paints() const - list<Paint*>& Canvas::paints() -> const list<Paint*>& Canvas::paints() const C++ API Addition: - Result Canvas::remove(Paint* paint = nullptr); C API Modifications: - Tvg_Result tvg_scene_clear(Tvg_Paint* scene, bool free) -> Tvg_Result tvg_scene_remove(Tvg_Paint* scene, Tvg_Paint* paint) C API Addition: - Tvg_Result tvg_scene_push_at(Tvg_Paint* scene, Tvg_Paint* target, Tvg_Paint* at) - Tvg_Result tvg_canvas_push_at(Tvg_Canvas* canvas, Tvg_Paint* target, Tvg_Paint* at) - Tvg_Result tvg_canvas_remove(Tvg_Canvas* canvas, Tvg_Paint* paint) issue: https://github.com/thorvg/thorvg/issues/2957 issue: https://github.com/thorvg/thorvg/issues/1372
97 lines
2.9 KiB
C++
97 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2021 - 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 <thorvg.h>
|
|
#include "config.h"
|
|
#include "catch.hpp"
|
|
|
|
using namespace tvg;
|
|
using namespace std;
|
|
|
|
TEST_CASE("Scene Creation", "[tvgScene]")
|
|
{
|
|
auto scene = unique_ptr<Scene>(Scene::gen());
|
|
REQUIRE(scene);
|
|
|
|
REQUIRE(scene->type() == Type::Scene);
|
|
}
|
|
|
|
TEST_CASE("Pushing Paints Into Scene", "[tvgScene]")
|
|
{
|
|
auto scene = unique_ptr<Scene>(Scene::gen());
|
|
REQUIRE(scene);
|
|
|
|
Paint* paints[3];
|
|
|
|
//Pushing Paints
|
|
paints[0] = Shape::gen();
|
|
REQUIRE(scene->push(paints[0]) == Result::Success);
|
|
|
|
paints[1] = Picture::gen();
|
|
REQUIRE(scene->push(paints[1]) == Result::Success);
|
|
|
|
paints[2] = Picture::gen();
|
|
REQUIRE(scene->push(paints[2]) == Result::Success);
|
|
|
|
//Pushing Null Pointer
|
|
REQUIRE(scene->push(nullptr) == Result::InvalidArguments);
|
|
|
|
//Pushing Invalid Paint
|
|
REQUIRE(scene->push(nullptr) == Result::InvalidArguments);
|
|
}
|
|
|
|
TEST_CASE("Scene Clear", "[tvgScene]")
|
|
{
|
|
auto scene = unique_ptr<Scene>(Scene::gen());
|
|
REQUIRE(scene);
|
|
|
|
REQUIRE(scene->push(Shape::gen()) == Result::Success);
|
|
REQUIRE(scene->remove() == Result::Success);
|
|
}
|
|
|
|
TEST_CASE("Scene Clear And Reuse Shape", "[tvgScene]")
|
|
{
|
|
REQUIRE(Initializer::init(0) == Result::Success);
|
|
|
|
auto canvas = unique_ptr<SwCanvas>(SwCanvas::gen());
|
|
REQUIRE(canvas);
|
|
|
|
auto scene = Scene::gen();
|
|
REQUIRE(scene);
|
|
|
|
auto shape = Shape::gen();
|
|
REQUIRE(shape);
|
|
REQUIRE(shape->ref() == 1);
|
|
|
|
REQUIRE(scene->push(shape) == Result::Success);
|
|
REQUIRE(canvas->push(scene) == Result::Success);
|
|
REQUIRE(canvas->update() == Result::Success);
|
|
|
|
//No deallocate shape.
|
|
REQUIRE(scene->remove() == Result::Success);
|
|
|
|
//Reuse shape.
|
|
REQUIRE(scene->push(shape) == Result::Success);
|
|
REQUIRE(shape->unref() == 1); //The scene still holds 1.
|
|
|
|
REQUIRE(Initializer::term() == Result::Success);
|
|
}
|