BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 08:15:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

node: it has entity now. remove scene node.

Browse Source
This commit is contained in:
Matvey Cherevko
2019-02-10 04:53:33 +07:00
parent 6a28226604
commit 97b183c24c
17 changed files with 194 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headers/enduro2d/high/_all.hpp
View File

@@ -9,19 +9,15 @@
#include "_high.hpp" #include "_high.hpp"
#include "components/camera.hpp" #include "components/camera.hpp"
#include "components/drawable.hpp"
#include "components/sprite.hpp" #include "components/sprite.hpp"
#include "scene/actor.hpp"
#include "scene/node.hpp"
#include "scene/node.inl"
#include "scene/scene.hpp"
#include "systems/render_system.hpp" #include "systems/render_system.hpp"
#include "systems/sprite_system.hpp" #include "systems/sprite_system.hpp"
#include "assets.hpp" #include "assets.hpp"
#include "library.hpp" #include "library.hpp"
#include "library.inl" #include "library.inl"
#include "node.hpp"
#include "node.inl"
#include "starter.hpp" #include "starter.hpp"
#include "world.hpp" #include "world.hpp"

24
headers/enduro2d/high/_high.hpp
View File

@@ -18,34 +18,11 @@ namespace e2d
} }
} }
namespace e2d
{
class node;
using node_iptr = intrusive_ptr<node>;
using const_node_iptr = intrusive_ptr<const node>;
class scene;
using scene_iptr = intrusive_ptr<scene>;
using const_scene_iptr = intrusive_ptr<const scene>;
class actor;
using actor_iptr = intrusive_ptr<actor>;
using const_actor_iptr = intrusive_ptr<const actor>;
class node_children_ilist_tag {};
using node_children = intrusive_list<node, node_children_ilist_tag>;
}
namespace e2d namespace e2d
{ {
class camera; class camera;
class drawable;
class sprite; class sprite;
class actor;
class node;
class scene;
class render_system; class render_system;
class sprite_system; class sprite_system;
@@ -67,6 +44,7 @@ namespace e2d
class asset_cache; class asset_cache;
class asset_cache_base; class asset_cache_base;
class node;
class starter; class starter;
class world; class world;
} }

24
headers/enduro2d/high/components/drawable.hpp
View File

@@ -1,24 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#pragma once
#include "../_high.hpp"
#include "../scene/node.hpp"
namespace e2d
{
class drawable final {
public:
drawable();
drawable(const node_iptr& node);
node_iptr node() noexcept;
const_node_iptr node() const noexcept;
private:
node_iptr node_ = node::create();
};
}

22
headers/enduro2d/high/scene/node.hpp → headers/enduro2d/high/node.hpp
View File

@@ -8,7 +8,17 @@
#define E2D_INCLUDE_GUARD_8703CE4A74D94C3CA27ED91AFF906936 #define E2D_INCLUDE_GUARD_8703CE4A74D94C3CA27ED91AFF906936
#pragma once #pragma once
#include "../_high.hpp" #include "_high.hpp"
namespace e2d
{
class node;
using node_iptr = intrusive_ptr<node>;
using const_node_iptr = intrusive_ptr<const node>;
class node_children_ilist_tag {};
using node_children = intrusive_list<node, node_children_ilist_tag>;
}
namespace e2d namespace e2d
{ {
@@ -19,8 +29,11 @@ namespace e2d
public: public:
virtual ~node() noexcept; virtual ~node() noexcept;
static node_iptr create(); static node_iptr create(world& world);
static node_iptr create(const node_iptr& parent); static node_iptr create(world& world, const node_iptr& parent);
ecs::entity entity() noexcept;
ecs::const_entity entity() const noexcept;
void transform(const t3f& transform) noexcept; void transform(const t3f& transform) noexcept;
const t3f& transform() const noexcept; const t3f& transform() const noexcept;
@@ -99,7 +112,7 @@ namespace e2d
template < typename F > template < typename F >
void for_each_child(F&& f) const; void for_each_child(F&& f) const;
protected: protected:
node(); node(world& world);
protected: protected:
virtual void on_change_parent_() noexcept; virtual void on_change_parent_() noexcept;
virtual void on_change_children_() noexcept; virtual void on_change_children_() noexcept;
@@ -114,6 +127,7 @@ namespace e2d
void update_world_matrix_() const noexcept; void update_world_matrix_() const noexcept;
private: private:
t3f transform_; t3f transform_;
ecs::entity entity_;
node* parent_{nullptr}; node* parent_{nullptr};
node_children children_; node_children children_;
private: private:

0
headers/enduro2d/high/scene/node.inl → headers/enduro2d/high/node.inl
View File

26
headers/enduro2d/high/scene/actor.hpp
View File

@@ -1,26 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#pragma once
#include "../_high.hpp"
#include "node.hpp"
namespace e2d
{
class actor final : public node {
public:
~actor() noexcept final;
static actor_iptr create(const ecs::entity& entity);
ecs::entity entity() noexcept;
ecs::const_entity entity() const noexcept;
private:
actor(const ecs::entity& entity);
private:
ecs::entity entity_;
};
}

28
headers/enduro2d/high/scene/scene.hpp
View File

@@ -1,28 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#pragma once
#include "../_high.hpp"
#include "node.hpp"
namespace e2d
{
class scene
: private noncopyable
, public ref_counter<scene> {
public:
virtual ~scene() noexcept;
static scene_iptr create();
node_iptr root() noexcept;
const_node_iptr root() const noexcept;
protected:
scene();
private:
node_iptr root_ = node::create();
};
}

5
headers/enduro2d/high/world.hpp
View File

@@ -7,7 +7,6 @@
#pragma once #pragma once
#include "_high.hpp" #include "_high.hpp"
#include "scene/scene.hpp"
namespace e2d namespace e2d
{ {
@@ -16,13 +15,9 @@ namespace e2d
world(); world();
~world() noexcept final; ~world() noexcept final;
scene_iptr scene() noexcept;
const_scene_iptr scene() const noexcept;
ecs::registry& registry() noexcept; ecs::registry& registry() noexcept;
const ecs::registry& registry() const noexcept; const ecs::registry& registry() const noexcept;
private: private:
scene_iptr scene_ = scene::create();
ecs::registry registry_; ecs::registry registry_;
}; };
} }

23
sources/enduro2d/high/components/drawable.cpp
View File

@@ -1,23 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#include <enduro2d/high/components/drawable.hpp>
namespace e2d
{
drawable::drawable() = default;
drawable::drawable(const node_iptr& node)
: node_(node) {}
node_iptr drawable::node() noexcept {
return node_;
}
const_node_iptr drawable::node() const noexcept {
return node_;
}
}

22
sources/enduro2d/high/scene/node.cpp → sources/enduro2d/high/node.cpp
View File

@@ -4,7 +4,8 @@
* Copyright (C) 2018 Matvey Cherevko * Copyright (C) 2018 Matvey Cherevko
******************************************************************************/ ******************************************************************************/
#include <enduro2d/high/scene/node.hpp> #include <enduro2d/high/node.hpp>
#include <enduro2d/high/world.hpp>
namespace namespace
{ {
@@ -19,7 +20,8 @@ namespace
namespace e2d namespace e2d
{ {
node::node() = default; node::node(world& world)
: entity_(world.registry().create_entity()) {}
node::~node() noexcept { node::~node() noexcept {
E2D_ASSERT(!parent_); E2D_ASSERT(!parent_);
@@ -31,18 +33,26 @@ namespace e2d
} }
} }
node_iptr node::create() { node_iptr node::create(world& world) {
return node_iptr(new node()); return node_iptr(new node(world));
} }
node_iptr node::create(const node_iptr& parent) { node_iptr node::create(world& world, const node_iptr& parent) {
node_iptr child = create(); node_iptr child = create(world);
if ( parent ) { if ( parent ) {
parent->add_child(child); parent->add_child(child);
} }
return child; return child;
} }
ecs::entity node::entity() noexcept {
return entity_;
}
ecs::const_entity node::entity() const noexcept {
return entity_;
}
void node::transform(const t3f& transform) noexcept { void node::transform(const t3f& transform) noexcept {
transform_ = transform; transform_ = transform;
mark_dirty_local_matrix_(); mark_dirty_local_matrix_();

27
sources/enduro2d/high/scene/actor.cpp
View File

@@ -1,27 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#include <enduro2d/high/scene/actor.hpp>
namespace e2d
{
actor::actor(const ecs::entity& entity)
: entity_(entity) {}
actor::~actor() noexcept = default;
actor_iptr actor::create(const ecs::entity& entity) {
return actor_iptr(new actor(entity));
}
ecs::entity actor::entity() noexcept {
return entity_;
}
ecs::const_entity actor::entity() const noexcept {
return entity_;
}
}

25
sources/enduro2d/high/scene/scene.cpp
View File

@@ -1,25 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#include <enduro2d/high/scene/scene.hpp>
namespace e2d
{
scene::scene() = default;
scene::~scene() noexcept = default;
scene_iptr scene::create() {
return scene_iptr(new scene());
}
node_iptr scene::root() noexcept {
return root_;
}
const_node_iptr scene::root() const noexcept {
return root_;
}
}

13
sources/enduro2d/high/world.cpp
View File

@@ -6,24 +6,11 @@
#include <enduro2d/high/world.hpp> #include <enduro2d/high/world.hpp>
namespace
{
using namespace e2d;
}
namespace e2d namespace e2d
{ {
world::world() = default; world::world() = default;
world::~world() noexcept = default; world::~world() noexcept = default;
scene_iptr world::scene() noexcept {
return scene_;
}
const_scene_iptr world::scene() const noexcept {
return scene_;
}
ecs::registry& world::registry() noexcept { ecs::registry& world::registry() noexcept {
return registry_; return registry_;
} }

42
untests/sources/untests_high/actor.cpp
View File

@@ -1,42 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#include "_high.hpp"
using namespace e2d;
namespace
{
class safe_starter_initializer final : private noncopyable {
public:
safe_starter_initializer() {
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("world_untests", "enduro2d")
.without_graphics(true)));
}
~safe_starter_initializer() noexcept {
modules::shutdown<starter>();
}
};
}
TEST_CASE("actor") {
safe_starter_initializer initializer;
world& w = the<world>();
SECTION("ctor") {
auto a = actor::create(w.registry().create_entity());
REQUIRE(w.registry().alive_entity(a->entity()));
{
const_actor_iptr ca = a;
REQUIRE(w.registry().alive_entity(ca->entity()));
}
}
SECTION("as_node") {
auto a = actor::create(w.registry().create_entity());
w.scene()->root()->add_child(a);
}
}

298
untests/sources/untests_high/node.cpp
View File

@@ -9,9 +9,23 @@ using namespace e2d;
namespace namespace
{ {
class safe_starter_initializer final : private noncopyable {
public:
safe_starter_initializer() {
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("world_untests", "enduro2d")
.without_graphics(true)));
}
~safe_starter_initializer() noexcept {
modules::shutdown<starter>();
}
};
class fake_node final : public node { class fake_node final : public node {
protected: protected:
fake_node() { fake_node(world& world) : node(world) {
++s_ctor_count; ++s_ctor_count;
} }
@@ -42,12 +56,12 @@ namespace
static std::size_t s_parent_changes; static std::size_t s_parent_changes;
static std::size_t s_children_changes; static std::size_t s_children_changes;
public: public:
static intrusive_ptr<fake_node> create() { static intrusive_ptr<fake_node> create(world& world) {
return intrusive_ptr<fake_node>(new fake_node()); return intrusive_ptr<fake_node>(new fake_node(world));
} }
static intrusive_ptr<fake_node> create(const node_iptr& parent) { static intrusive_ptr<fake_node> create(world& world, const node_iptr& parent) {
auto child = create(); auto child = create(world);
if ( parent ) { if ( parent ) {
parent->add_child(child); parent->add_child(child);
} }
@@ -62,8 +76,10 @@ namespace
} }
TEST_CASE("node") { TEST_CASE("node") {
safe_starter_initializer initializer;
world& w = the<world>();
SECTION("empty_node") { SECTION("empty_node") {
auto n = node::create(); auto n = node::create(w);
REQUIRE(n); REQUIRE(n);
REQUIRE(n->root() == n); REQUIRE(n->root() == n);
REQUIRE_FALSE(n->parent()); REQUIRE_FALSE(n->parent());
@@ -82,8 +98,8 @@ TEST_CASE("node") {
} }
SECTION("parent/root") { SECTION("parent/root") {
{ {
auto p = node::create(); auto p = node::create(w);
auto n = node::create(); auto n = node::create(w);
REQUIRE(p->add_child(n)); REQUIRE(p->add_child(n));
REQUIRE(n->parent() == p); REQUIRE(n->parent() == p);
@@ -98,21 +114,21 @@ TEST_CASE("node") {
REQUIRE(p->child_count() == 1); REQUIRE(p->child_count() == 1);
} }
{ {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(p); auto n1 = node::create(w, p);
REQUIRE(n1->parent() == p); REQUIRE(n1->parent() == p);
REQUIRE(p->child_count() == 1); REQUIRE(p->child_count() == 1);
auto n2 = node::create(nullptr); auto n2 = node::create(w, nullptr);
REQUIRE_FALSE(n2->parent()); REQUIRE_FALSE(n2->parent());
REQUIRE(p->child_count() == 1); REQUIRE(p->child_count() == 1);
} }
{ {
auto p1 = node::create(); auto p1 = node::create(w);
auto p2 = node::create(); auto p2 = node::create(w);
auto n = node::create(p1); auto n = node::create(w, p1);
REQUIRE(n->parent() == p1); REQUIRE(n->parent() == p1);
REQUIRE(p1->child_count() == 1); REQUIRE(p1->child_count() == 1);
REQUIRE(p2->child_count() == 0); REQUIRE(p2->child_count() == 0);
@@ -123,11 +139,11 @@ TEST_CASE("node") {
REQUIRE(p2->child_count() == 1); REQUIRE(p2->child_count() == 1);
} }
{ {
auto p1 = node::create(); auto p1 = node::create(w);
auto p2 = node::create(p1); auto p2 = node::create(w, p1);
auto n1 = node::create(p1); auto n1 = node::create(w, p1);
auto n2 = node::create(p2); auto n2 = node::create(w, p2);
REQUIRE(n1->parent() == p1); REQUIRE(n1->parent() == p1);
REQUIRE(n2->parent() == p2); REQUIRE(n2->parent() == p2);
@@ -135,7 +151,7 @@ TEST_CASE("node") {
REQUIRE(n1->root() == p1); REQUIRE(n1->root() == p1);
REQUIRE(n2->root() == p1); REQUIRE(n2->root() == p1);
auto n3 = node::create(); auto n3 = node::create(w);
REQUIRE_FALSE(n3->parent()); REQUIRE_FALSE(n3->parent());
REQUIRE(n3->root() == n3); REQUIRE(n3->root() == n3);
@@ -149,23 +165,23 @@ TEST_CASE("node") {
REQUIRE(cn1->root() == p1); REQUIRE(cn1->root() == p1);
REQUIRE(cn2->root() == p1); REQUIRE(cn2->root() == p1);
const_node_iptr cn3 = node::create(); const_node_iptr cn3 = node::create(w);
REQUIRE_FALSE(cn3->parent()); REQUIRE_FALSE(cn3->parent());
REQUIRE(cn3->root() == cn3); REQUIRE(cn3->root() == cn3);
} }
} }
} }
SECTION("has_parent") { SECTION("has_parent") {
auto p = node::create(); auto p = node::create(w);
REQUIRE_FALSE(p->has_parent()); REQUIRE_FALSE(p->has_parent());
REQUIRE_FALSE(p->has_parent(nullptr)); REQUIRE_FALSE(p->has_parent(nullptr));
auto n = node::create(p); auto n = node::create(w, p);
REQUIRE(n->has_parent()); REQUIRE(n->has_parent());
REQUIRE(n->has_parent(p)); REQUIRE(n->has_parent(p));
REQUIRE(n->has_parent(nullptr)); REQUIRE(n->has_parent(nullptr));
auto pp = node::create(); auto pp = node::create(w);
REQUIRE_FALSE(n->has_parent(pp)); REQUIRE_FALSE(n->has_parent(pp));
REQUIRE_FALSE(pp->has_parent(pp)); REQUIRE_FALSE(pp->has_parent(pp));
@@ -178,21 +194,21 @@ TEST_CASE("node") {
} }
SECTION("auto_remove/remove_all_children") { SECTION("auto_remove/remove_all_children") {
{ {
auto p = node::create(); auto p = node::create(w);
auto n = node::create(p); auto n = node::create(w, p);
n->remove_from_parent(); n->remove_from_parent();
REQUIRE(p->child_count() == 0); REQUIRE(p->child_count() == 0);
} }
{ {
auto p = node::create(); auto p = node::create(w);
auto n = node::create(p); auto n = node::create(w, p);
p.reset(); p.reset();
REQUIRE_FALSE(n->parent()); REQUIRE_FALSE(n->parent());
} }
{ {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(p); auto n1 = node::create(w, p);
auto n2 = node::create(p); auto n2 = node::create(w, p);
REQUIRE(p->child_count() == 2); REQUIRE(p->child_count() == 2);
REQUIRE(p->remove_all_children() == 2); REQUIRE(p->remove_all_children() == 2);
REQUIRE_FALSE(n1->parent()); REQUIRE_FALSE(n1->parent());
@@ -204,25 +220,25 @@ TEST_CASE("node") {
SECTION("auto_remove/remove_all_children/events") { SECTION("auto_remove/remove_all_children/events") {
{ {
fake_node::reset_counters(); fake_node::reset_counters();
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n = fake_node::create(p); auto n = fake_node::create(w, p);
n->remove_from_parent(); n->remove_from_parent();
REQUIRE(p->children_changes == 2); REQUIRE(p->children_changes == 2);
REQUIRE(fake_node::s_parent_changes == 2); REQUIRE(fake_node::s_parent_changes == 2);
} }
{ {
fake_node::reset_counters(); fake_node::reset_counters();
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n = fake_node::create(p); auto n = fake_node::create(w, p);
p.reset(); p.reset();
REQUIRE(fake_node::s_children_changes == 1); REQUIRE(fake_node::s_children_changes == 1);
REQUIRE(n->parent_changes == 2); REQUIRE(n->parent_changes == 2);
} }
{ {
fake_node::reset_counters(); fake_node::reset_counters();
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(p); auto n1 = fake_node::create(w, p);
auto n2 = fake_node::create(p); auto n2 = fake_node::create(w, p);
REQUIRE(p->remove_all_children() == 2); REQUIRE(p->remove_all_children() == 2);
REQUIRE(p->remove_all_children() == 0); REQUIRE(p->remove_all_children() == 0);
REQUIRE(p->children_changes == 3); REQUIRE(p->children_changes == 3);
@@ -230,11 +246,11 @@ TEST_CASE("node") {
} }
} }
SECTION("remove_from_parent") { SECTION("remove_from_parent") {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(p); auto n1 = node::create(w, p);
auto n2 = node::create(p); auto n2 = node::create(w, p);
auto np = node::create(); auto np = node::create(w);
np->remove_from_parent(); np->remove_from_parent();
REQUIRE(np->root() == np); REQUIRE(np->root() == np);
REQUIRE_FALSE(np->parent()); REQUIRE_FALSE(np->parent());
@@ -254,11 +270,11 @@ TEST_CASE("node") {
SECTION("remove_from_parent/events") { SECTION("remove_from_parent/events") {
fake_node::reset_counters(); fake_node::reset_counters();
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(p); auto n1 = fake_node::create(w, p);
auto n2 = fake_node::create(p); auto n2 = fake_node::create(w, p);
auto np = fake_node::create(); auto np = fake_node::create(w);
np->remove_from_parent(); np->remove_from_parent();
REQUIRE(fake_node::s_parent_changes == 2); REQUIRE(fake_node::s_parent_changes == 2);
REQUIRE(fake_node::s_children_changes == 2); REQUIRE(fake_node::s_children_changes == 2);
@@ -272,18 +288,18 @@ TEST_CASE("node") {
REQUIRE(fake_node::s_children_changes == 4); REQUIRE(fake_node::s_children_changes == 4);
} }
SECTION("child_count/child_count_recursive") { SECTION("child_count/child_count_recursive") {
auto p1 = node::create(); auto p1 = node::create(w);
REQUIRE(p1->child_count() == 0); REQUIRE(p1->child_count() == 0);
REQUIRE(p1->child_count_recursive() == 0); REQUIRE(p1->child_count_recursive() == 0);
auto p2 = node::create(p1); auto p2 = node::create(w, p1);
REQUIRE(p1->child_count() == 1); REQUIRE(p1->child_count() == 1);
REQUIRE(p1->child_count_recursive() == 1); REQUIRE(p1->child_count_recursive() == 1);
REQUIRE(p2->child_count() == 0); REQUIRE(p2->child_count() == 0);
REQUIRE(p2->child_count_recursive() == 0); REQUIRE(p2->child_count_recursive() == 0);
auto n1 = node::create(p2); auto n1 = node::create(w, p2);
auto n2 = node::create(p2); auto n2 = node::create(w, p2);
REQUIRE(p1->child_count() == 1); REQUIRE(p1->child_count() == 1);
REQUIRE(p1->child_count_recursive() == 3); REQUIRE(p1->child_count_recursive() == 3);
REQUIRE(p2->child_count() == 2); REQUIRE(p2->child_count() == 2);
@@ -291,10 +307,10 @@ TEST_CASE("node") {
} }
SECTION("send_backward/bring_to_back") { SECTION("send_backward/bring_to_back") {
{ {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(p); auto n1 = node::create(w, p);
auto n2 = node::create(p); auto n2 = node::create(w, p);
auto n3 = node::create(p); auto n3 = node::create(w, p);
REQUIRE(n3->send_backward()); // n1 n3 n2 REQUIRE(n3->send_backward()); // n1 n3 n2
REQUIRE(n1->next_sibling() == n3); REQUIRE(n1->next_sibling() == n3);
@@ -312,17 +328,17 @@ TEST_CASE("node") {
REQUIRE(n2->next_sibling() == n3); REQUIRE(n2->next_sibling() == n3);
} }
{ {
auto n = node::create(); auto n = node::create(w);
REQUIRE_FALSE(n->send_backward()); REQUIRE_FALSE(n->send_backward());
REQUIRE_FALSE(n->bring_to_back()); REQUIRE_FALSE(n->bring_to_back());
} }
} }
SECTION("send_backward/bring_to_back/events") { SECTION("send_backward/bring_to_back/events") {
{ {
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(p); auto n1 = fake_node::create(w, p);
auto n2 = fake_node::create(p); auto n2 = fake_node::create(w, p);
auto n3 = fake_node::create(p); auto n3 = fake_node::create(w, p);
REQUIRE(n3->send_backward()); // n1 n3 n2 REQUIRE(n3->send_backward()); // n1 n3 n2
REQUIRE(n3->send_backward()); // n3 n1 n2 REQUIRE(n3->send_backward()); // n3 n1 n2
@@ -333,7 +349,7 @@ TEST_CASE("node") {
REQUIRE(p->children_changes == 6); REQUIRE(p->children_changes == 6);
} }
{ {
auto n = fake_node::create(); auto n = fake_node::create(w);
REQUIRE_FALSE(n->send_backward()); REQUIRE_FALSE(n->send_backward());
REQUIRE_FALSE(n->bring_to_back()); REQUIRE_FALSE(n->bring_to_back());
REQUIRE(n->children_changes == 0); REQUIRE(n->children_changes == 0);
@@ -341,10 +357,10 @@ TEST_CASE("node") {
} }
SECTION("send_forward/bring_to_front") { SECTION("send_forward/bring_to_front") {
{ {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(p); auto n1 = node::create(w, p);
auto n2 = node::create(p); auto n2 = node::create(w, p);
auto n3 = node::create(p); auto n3 = node::create(w, p);
REQUIRE(n1->send_forward()); // n2 n1 n3 REQUIRE(n1->send_forward()); // n2 n1 n3
REQUIRE(n2->next_sibling() == n1); REQUIRE(n2->next_sibling() == n1);
@@ -362,17 +378,17 @@ TEST_CASE("node") {
REQUIRE(n1->next_sibling() == n2); REQUIRE(n1->next_sibling() == n2);
} }
{ {
auto n = node::create(); auto n = node::create(w);
REQUIRE_FALSE(n->send_forward()); REQUIRE_FALSE(n->send_forward());
REQUIRE_FALSE(n->bring_to_back()); REQUIRE_FALSE(n->bring_to_back());
} }
} }
SECTION("send_forward/bring_to_front/events") { SECTION("send_forward/bring_to_front/events") {
{ {
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(p); auto n1 = fake_node::create(w, p);
auto n2 = fake_node::create(p); auto n2 = fake_node::create(w, p);
auto n3 = fake_node::create(p); auto n3 = fake_node::create(w, p);
REQUIRE(n1->send_forward()); // n2 n1 n3 REQUIRE(n1->send_forward()); // n2 n1 n3
REQUIRE(n1->send_forward()); // n2 n3 n1 REQUIRE(n1->send_forward()); // n2 n3 n1
@@ -383,14 +399,14 @@ TEST_CASE("node") {
REQUIRE(p->children_changes == 6); REQUIRE(p->children_changes == 6);
} }
{ {
auto n = fake_node::create(); auto n = fake_node::create(w);
REQUIRE_FALSE(n->send_forward()); REQUIRE_FALSE(n->send_forward());
REQUIRE_FALSE(n->bring_to_back()); REQUIRE_FALSE(n->bring_to_back());
REQUIRE(n->children_changes == 0); REQUIRE(n->children_changes == 0);
} }
} }
SECTION("last_child/first_child") { SECTION("last_child/first_child") {
auto p = node::create(); auto p = node::create(w);
REQUIRE_FALSE(p->last_child()); REQUIRE_FALSE(p->last_child());
REQUIRE_FALSE(p->first_child()); REQUIRE_FALSE(p->first_child());
@@ -401,9 +417,9 @@ TEST_CASE("node") {
REQUIRE_FALSE(cp->first_child()); REQUIRE_FALSE(cp->first_child());
} }
auto n1 = node::create(p); auto n1 = node::create(w, p);
auto n2 = node::create(p); auto n2 = node::create(w, p);
auto n3 = node::create(p); auto n3 = node::create(w, p);
REQUIRE(p->last_child() == n3); REQUIRE(p->last_child() == n3);
REQUIRE(p->first_child() == n1); REQUIRE(p->first_child() == n1);
@@ -416,11 +432,11 @@ TEST_CASE("node") {
} }
} }
SECTION("prev_sibling/next_sibling") { SECTION("prev_sibling/next_sibling") {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(p); auto n1 = node::create(w, p);
auto n2 = node::create(p); auto n2 = node::create(w, p);
auto n3 = node::create(p); auto n3 = node::create(w, p);
REQUIRE_FALSE(n1->prev_sibling()); REQUIRE_FALSE(n1->prev_sibling());
REQUIRE(n1->next_sibling() == n2); REQUIRE(n1->next_sibling() == n2);
@@ -431,7 +447,7 @@ TEST_CASE("node") {
REQUIRE(n3->prev_sibling() == n2); REQUIRE(n3->prev_sibling() == n2);
REQUIRE_FALSE(n3->next_sibling()); REQUIRE_FALSE(n3->next_sibling());
auto n4 = node::create(); auto n4 = node::create(w);
REQUIRE_FALSE(n4->prev_sibling()); REQUIRE_FALSE(n4->prev_sibling());
REQUIRE_FALSE(n4->next_sibling()); REQUIRE_FALSE(n4->next_sibling());
@@ -455,10 +471,10 @@ TEST_CASE("node") {
} }
} }
SECTION("add_child_to_back/add_child_to_front") { SECTION("add_child_to_back/add_child_to_front") {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(); auto n1 = node::create(w);
auto n2 = node::create(); auto n2 = node::create(w);
auto n3 = node::create(); auto n3 = node::create(w);
{ {
p->remove_all_children(); p->remove_all_children();
REQUIRE(p->add_child_to_back(n1)); REQUIRE(p->add_child_to_back(n1));
@@ -483,7 +499,7 @@ TEST_CASE("node") {
REQUIRE_FALSE(n1->prev_sibling()); REQUIRE_FALSE(n1->prev_sibling());
// add to another parent // add to another parent
auto p2 = node::create(); auto p2 = node::create(w);
REQUIRE(p2->add_child_to_back(n1)); REQUIRE(p2->add_child_to_back(n1));
REQUIRE(n1->parent() == p2); REQUIRE(n1->parent() == p2);
REQUIRE_FALSE(n1->prev_sibling()); REQUIRE_FALSE(n1->prev_sibling());
@@ -518,7 +534,7 @@ TEST_CASE("node") {
REQUIRE_FALSE(n1->next_sibling()); REQUIRE_FALSE(n1->next_sibling());
// add to another parent // add to another parent
auto p2 = node::create(); auto p2 = node::create(w);
REQUIRE(p2->add_child_to_front(n1)); REQUIRE(p2->add_child_to_front(n1));
REQUIRE(n1->parent() == p2); REQUIRE(n1->parent() == p2);
REQUIRE_FALSE(n1->prev_sibling()); REQUIRE_FALSE(n1->prev_sibling());
@@ -532,10 +548,10 @@ TEST_CASE("node") {
} }
SECTION("add_child_to_back/add_child_to_front/events") { SECTION("add_child_to_back/add_child_to_front/events") {
{ {
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(); auto n1 = fake_node::create(w);
auto n2 = fake_node::create(); auto n2 = fake_node::create(w);
auto n3 = fake_node::create(); auto n3 = fake_node::create(w);
REQUIRE(p->add_child_to_back(n1)); REQUIRE(p->add_child_to_back(n1));
REQUIRE(p->add_child_to_back(n2)); REQUIRE(p->add_child_to_back(n2));
@@ -561,7 +577,7 @@ TEST_CASE("node") {
REQUIRE(n1->children_changes == 0); REQUIRE(n1->children_changes == 0);
// add to another parent // add to another parent
auto p2 = node::create(); auto p2 = node::create(w);
REQUIRE(p2->add_child_to_back(n1)); REQUIRE(p2->add_child_to_back(n1));
REQUIRE(p->parent_changes == 0); REQUIRE(p->parent_changes == 0);
REQUIRE(p->children_changes == 5); REQUIRE(p->children_changes == 5);
@@ -572,10 +588,10 @@ TEST_CASE("node") {
REQUIRE(n2->children_changes == 0); REQUIRE(n2->children_changes == 0);
} }
{ {
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(); auto n1 = fake_node::create(w);
auto n2 = fake_node::create(); auto n2 = fake_node::create(w);
auto n3 = fake_node::create(); auto n3 = fake_node::create(w);
REQUIRE(p->add_child_to_front(n1)); REQUIRE(p->add_child_to_front(n1));
REQUIRE(p->add_child_to_front(n2)); REQUIRE(p->add_child_to_front(n2));
@@ -601,7 +617,7 @@ TEST_CASE("node") {
REQUIRE(n1->children_changes == 0); REQUIRE(n1->children_changes == 0);
// add to another parent // add to another parent
auto p2 = node::create(); auto p2 = node::create(w);
REQUIRE(p2->add_child_to_front(n1)); REQUIRE(p2->add_child_to_front(n1));
REQUIRE(p->parent_changes == 0); REQUIRE(p->parent_changes == 0);
REQUIRE(p->children_changes == 5); REQUIRE(p->children_changes == 5);
@@ -613,10 +629,10 @@ TEST_CASE("node") {
} }
} }
SECTION("add_child_after/add_child_before") { SECTION("add_child_after/add_child_before") {
auto p = node::create(); auto p = node::create(w);
auto n1 = node::create(); auto n1 = node::create(w);
auto n2 = node::create(); auto n2 = node::create(w);
auto n3 = node::create(); auto n3 = node::create(w);
{ {
p->remove_all_children(); p->remove_all_children();
REQUIRE(p->add_child(n1)); // n1 REQUIRE(p->add_child(n1)); // n1
@@ -642,8 +658,8 @@ TEST_CASE("node") {
REQUIRE(n2->next_sibling() == n1); REQUIRE(n2->next_sibling() == n1);
// to another parent // to another parent
auto p2 = node::create(); auto p2 = node::create(w);
auto n4 = node::create(p2); // n4 auto n4 = node::create(w, p2); // n4
REQUIRE(n4->add_sibling_before(n2)); // n2 n4 REQUIRE(n4->add_sibling_before(n2)); // n2 n4
REQUIRE(n2->parent() == p2); REQUIRE(n2->parent() == p2);
@@ -680,8 +696,8 @@ TEST_CASE("node") {
REQUIRE(n2->next_sibling() == n3); REQUIRE(n2->next_sibling() == n3);
// to another parent // to another parent
auto p2 = node::create(); auto p2 = node::create(w);
auto n4 = node::create(p2); // n4 auto n4 = node::create(w, p2); // n4
REQUIRE(n4->add_sibling_after(n2)); // n4 n2 REQUIRE(n4->add_sibling_after(n2)); // n4 n2
REQUIRE(n2->parent() == p2); REQUIRE(n2->parent() == p2);
@@ -696,10 +712,10 @@ TEST_CASE("node") {
} }
SECTION("add_child_after/add_child_before/events") { SECTION("add_child_after/add_child_before/events") {
{ {
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(); auto n1 = fake_node::create(w);
auto n2 = fake_node::create(); auto n2 = fake_node::create(w);
auto n3 = fake_node::create(); auto n3 = fake_node::create(w);
REQUIRE(p->add_child(n1)); // n1 REQUIRE(p->add_child(n1)); // n1
REQUIRE(p->add_child_before(n1, n2)); // n2 n1 REQUIRE(p->add_child_before(n1, n2)); // n2 n1
@@ -720,8 +736,8 @@ TEST_CASE("node") {
REQUIRE(p->children_changes == 5); REQUIRE(p->children_changes == 5);
// to another parent // to another parent
auto p2 = node::create(); auto p2 = node::create(w);
auto n4 = node::create(p2); // n4 auto n4 = node::create(w, p2); // n4
REQUIRE(p2->add_child_before(n4, n2)); // n2 n4 REQUIRE(p2->add_child_before(n4, n2)); // n2 n4
REQUIRE(p->parent_changes == 0); REQUIRE(p->parent_changes == 0);
@@ -731,10 +747,10 @@ TEST_CASE("node") {
REQUIRE(n2->parent_changes == 2); REQUIRE(n2->parent_changes == 2);
} }
{ {
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n1 = fake_node::create(); auto n1 = fake_node::create(w);
auto n2 = fake_node::create(); auto n2 = fake_node::create(w);
auto n3 = fake_node::create(); auto n3 = fake_node::create(w);
REQUIRE(p->add_child(n1)); // n1 REQUIRE(p->add_child(n1)); // n1
REQUIRE(p->add_child_after(n1, n2)); // n1 n2 REQUIRE(p->add_child_after(n1, n2)); // n1 n2
@@ -755,8 +771,8 @@ TEST_CASE("node") {
REQUIRE(p->children_changes == 5); REQUIRE(p->children_changes == 5);
// to another parent // to another parent
auto p2 = node::create(); auto p2 = node::create(w);
auto n4 = node::create(p2); // n4 auto n4 = node::create(w, p2); // n4
REQUIRE(p2->add_child_after(n4, n2)); // n4 n2 REQUIRE(p2->add_child_after(n4, n2)); // n4 n2
REQUIRE(p->parent_changes == 0); REQUIRE(p->parent_changes == 0);
@@ -767,11 +783,11 @@ TEST_CASE("node") {
} }
} }
SECTION("for_each_child") { SECTION("for_each_child") {
auto p = node::create(); auto p = node::create(w);
array<node_iptr, 3> ns{ array<node_iptr, 3> ns{
node::create(p), node::create(w, p),
node::create(p), node::create(w, p),
node::create(p)}; node::create(w, p)};
{ {
std::size_t count = 0; std::size_t count = 0;
p->for_each_child([&ns, &count](const node_iptr& n){ p->for_each_child([&ns, &count](const node_iptr& n){
@@ -789,10 +805,10 @@ TEST_CASE("node") {
} }
} }
SECTION("destroy_node") { SECTION("destroy_node") {
auto p1 = node::create(); auto p1 = node::create(w);
auto p2 = node::create(p1); auto p2 = node::create(w, p1);
auto n1 = node::create(p2); auto n1 = node::create(w, p2);
auto n2 = node::create(p2); auto n2 = node::create(w, p2);
p2->remove_from_parent(); p2->remove_from_parent();
p2.reset(); p2.reset();
@@ -813,10 +829,10 @@ TEST_CASE("node") {
SECTION("destroy_node/events") { SECTION("destroy_node/events") {
fake_node::reset_counters(); fake_node::reset_counters();
auto p1 = fake_node::create(); auto p1 = fake_node::create(w);
auto p2 = fake_node::create(p1); auto p2 = fake_node::create(w, p1);
auto n1 = fake_node::create(p2); auto n1 = fake_node::create(w, p2);
auto n2 = fake_node::create(p2); auto n2 = fake_node::create(w, p2);
REQUIRE(fake_node::s_parent_changes == 3); REQUIRE(fake_node::s_parent_changes == 3);
REQUIRE(fake_node::s_children_changes == 3); REQUIRE(fake_node::s_children_changes == 3);
@@ -828,7 +844,7 @@ TEST_CASE("node") {
REQUIRE(fake_node::s_children_changes == 4); REQUIRE(fake_node::s_children_changes == 4);
} }
SECTION("transform") { SECTION("transform") {
auto p = node::create(); auto p = node::create(w);
REQUIRE(p->transform() == t3f::identity()); REQUIRE(p->transform() == t3f::identity());
REQUIRE(p->translation() == v3f::zero()); REQUIRE(p->translation() == v3f::zero());
@@ -846,10 +862,10 @@ TEST_CASE("node") {
} }
SECTION("local_matrix") { SECTION("local_matrix") {
{ {
auto p = node::create(); auto p = node::create(w);
p->transform(math::make_translation_trs3(v3f{10.f,0.f,0.f})); p->transform(math::make_translation_trs3(v3f{10.f,0.f,0.f}));
auto n = node::create(p); auto n = node::create(w, p);
n->transform(math::make_translation_trs3(v3f{20.f,0.f,0.f})); n->transform(math::make_translation_trs3(v3f{20.f,0.f,0.f}));
REQUIRE(n->local_matrix() == math::make_translation_matrix4(20.f,0.f,0.f)); REQUIRE(n->local_matrix() == math::make_translation_matrix4(20.f,0.f,0.f));
@@ -862,10 +878,10 @@ TEST_CASE("node") {
} }
SECTION("world_matrix") { SECTION("world_matrix") {
{ {
auto p = node::create(); auto p = node::create(w);
p->translation({10.f,0.f,0.f}); p->translation({10.f,0.f,0.f});
auto n = node::create(p); auto n = node::create(w, p);
n->translation({20.f,0.f,0.f}); n->translation({20.f,0.f,0.f});
auto v = v4f(5.f,0.f,0.f,1.f); auto v = v4f(5.f,0.f,0.f,1.f);
@@ -877,12 +893,12 @@ TEST_CASE("node") {
math::make_translation_matrix4(10.f,0.f,0.f)); math::make_translation_matrix4(10.f,0.f,0.f));
} }
{ {
auto n = node::create(); auto n = node::create(w);
n->translation({20.f,0.f,0.f}); n->translation({20.f,0.f,0.f});
REQUIRE(n->world_matrix() == REQUIRE(n->world_matrix() ==
math::make_translation_matrix4(20.f,0.f,0.f)); math::make_translation_matrix4(20.f,0.f,0.f));
auto p = node::create(); auto p = node::create(w);
p->transform(math::make_translation_trs3(v3f{10.f,0.f,0.f})); p->transform(math::make_translation_trs3(v3f{10.f,0.f,0.f}));
p->add_child(n); p->add_child(n);
@@ -890,13 +906,13 @@ TEST_CASE("node") {
math::make_translation_matrix4(30.f,0.f,0.f)); math::make_translation_matrix4(30.f,0.f,0.f));
} }
{ {
auto p1 = node::create(); auto p1 = node::create(w);
p1->translation({10.f,0.f,0.f}); p1->translation({10.f,0.f,0.f});
auto p2 = node::create(); auto p2 = node::create(w);
p2->transform(math::make_translation_trs3(v3f{20.f,0.f,0.f})); p2->transform(math::make_translation_trs3(v3f{20.f,0.f,0.f}));
auto n = node::create(p2); auto n = node::create(w, p2);
n->transform(math::make_translation_trs3(v3f{30.f,0.f,0.f})); n->transform(math::make_translation_trs3(v3f{30.f,0.f,0.f}));
REQUIRE(n->world_matrix() == REQUIRE(n->world_matrix() ==
@@ -911,9 +927,9 @@ TEST_CASE("node") {
SECTION("lifetime") { SECTION("lifetime") {
{ {
fake_node::reset_counters(); fake_node::reset_counters();
auto p = fake_node::create(); auto p = fake_node::create(w);
auto n = fake_node::create(); auto n = fake_node::create(w);
p->add_child(n); p->add_child(n);
REQUIRE(fake_node::s_ctor_count == 2); REQUIRE(fake_node::s_ctor_count == 2);
REQUIRE(fake_node::s_dtor_count == 0); REQUIRE(fake_node::s_dtor_count == 0);
@@ -929,10 +945,10 @@ TEST_CASE("node") {
} }
{ {
fake_node::reset_counters(); fake_node::reset_counters();
auto p = fake_node::create(); auto p = fake_node::create(w);
{ {
auto n1 = fake_node::create(p); auto n1 = fake_node::create(w, p);
auto n2 = fake_node::create(p); auto n2 = fake_node::create(w, p);
} }
REQUIRE(fake_node::s_ctor_count == 3); REQUIRE(fake_node::s_ctor_count == 3);
REQUIRE(fake_node::s_dtor_count == 0); REQUIRE(fake_node::s_dtor_count == 0);

21
untests/sources/untests_high/scene.cpp
View File

@@ -1,21 +0,0 @@
/*******************************************************************************
* This file is part of the "Enduro2D"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2018 Matvey Cherevko
******************************************************************************/
#include "_high.hpp"
using namespace e2d;
TEST_CASE("scene") {
SECTION("ctor") {
auto s = scene::create();
REQUIRE(s);
REQUIRE(s->root());
{
const_scene_iptr cs = s;
REQUIRE(cs->root());
}
}
}

5
untests/sources/untests_high/world.cpp
View File

@@ -29,11 +29,6 @@ TEST_CASE("world") {
world& w = the<world>(); world& w = the<world>();
const world& cw = w; const world& cw = w;
SECTION("scene") {
REQUIRE(w.scene());
REQUIRE(cw.scene());
}
SECTION("registry") { SECTION("registry") {
auto e = w.registry().create_entity(); auto e = w.registry().create_entity();
REQUIRE(cw.registry().alive_entity(e)); REQUIRE(cw.registry().alive_entity(e));