feat: started using _underscore prefixes for functions that (might) have a signal by the same name
parent
a61f1efb88
commit
5392fd0540
|
@ -53,9 +53,9 @@ bool Node::requests_deletion() const {
|
||||||
void Node::propagate_tick(double const &delta_time) {
|
void Node::propagate_tick(double const &delta_time) {
|
||||||
if(!this->has_ticked) {
|
if(!this->has_ticked) {
|
||||||
this->has_ticked = true;
|
this->has_ticked = true;
|
||||||
this->first_tick();
|
this->_first_tick();
|
||||||
}
|
}
|
||||||
this->tick(delta_time);
|
this->_tick(delta_time);
|
||||||
std::vector<std::string> destroy_list{};
|
std::vector<std::string> destroy_list{};
|
||||||
for(std::pair<std::string const, Node::OwnedPtr> &pair : this->children)
|
for(std::pair<std::string const, Node::OwnedPtr> &pair : this->children)
|
||||||
pair.second->propagate_tick(delta_time);
|
pair.second->propagate_tick(delta_time);
|
||||||
|
@ -75,11 +75,11 @@ void Node::propagate_post_tick() {
|
||||||
void Node::propagate_removed() {
|
void Node::propagate_removed() {
|
||||||
for(std::pair<std::string const, Node::OwnedPtr> &pair : this->children)
|
for(std::pair<std::string const, Node::OwnedPtr> &pair : this->children)
|
||||||
pair.second->propagate_removed();
|
pair.second->propagate_removed();
|
||||||
this->removed();
|
this->_removed();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Node::propagate_draw(SDL_Renderer *render) {
|
void Node::propagate_draw(SDL_Renderer *render) {
|
||||||
this->draw(render);
|
this->_draw(render);
|
||||||
for(std::pair<std::string const, Node::OwnedPtr> &pair : this->children)
|
for(std::pair<std::string const, Node::OwnedPtr> &pair : this->children)
|
||||||
pair.second->propagate_draw(render);
|
pair.second->propagate_draw(render);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef CANVAS_NODE_HPP
|
#ifndef CANVAS_NODE_HPP
|
||||||
#define CANVAS_NODE_HPP
|
#define CANVAS_NODE_HPP
|
||||||
|
|
||||||
|
#include "core/signal.hpp"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
@ -17,14 +18,16 @@ typedef std::map<std::string, Node::OwnedPtr> ChildrenMap;
|
||||||
std::string name{};
|
std::string name{};
|
||||||
ChildrenMap children{};
|
ChildrenMap children{};
|
||||||
Node *parent{nullptr};
|
Node *parent{nullptr};
|
||||||
|
public:
|
||||||
|
Signal<> removed{};
|
||||||
public:
|
public:
|
||||||
Node() = default;
|
Node() = default;
|
||||||
virtual ~Node() = default;
|
virtual ~Node() = default;
|
||||||
virtual void added(Node *parent [[maybe_unused]]) {} //!< called the moment after the object is added as a child to another node
|
virtual void _added(Node *parent [[maybe_unused]]) {} //!< called the moment after the object is added as a child to another node
|
||||||
virtual void first_tick() {} //!< called the first frame this object is active
|
virtual void _first_tick() {} //!< called the first frame this object is active
|
||||||
virtual void tick(double const &delta_time [[maybe_unused]]) {} //!< called every frame
|
virtual void _tick(double const &delta_time [[maybe_unused]]) {} //!< called every frame
|
||||||
virtual void removed() {} //!< called the moment before the object is removed as a child to another node
|
virtual void _removed() {} //!< called the moment before the object is removed as a child to another node
|
||||||
virtual void draw(SDL_Renderer *render [[maybe_unused]]) {}
|
virtual void _draw(SDL_Renderer *render [[maybe_unused]]) {}
|
||||||
|
|
||||||
void add_child(Node::OwnedPtr &child); //!< add a child, the caller must own the pointer
|
void add_child(Node::OwnedPtr &child); //!< add a child, the caller must own the pointer
|
||||||
std::optional<Node::OwnedPtr> remove_child(Node *child); //!< remove a child, the caller now owns the pointer
|
std::optional<Node::OwnedPtr> remove_child(Node *child); //!< remove a child, the caller now owns the pointer
|
||||||
|
|
Loading…
Reference in New Issue