Relintai/props
1
0
Fork 0
mirror of https://github.com/Relintai/props.git synced 2024-11-12 10:15:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed processor_get_node_for's parameter, and now PropInstance will create hidden nodes as preview for using it in the editor.

Browse Source
This commit is contained in:
Relintai 2020-07-05 23:08:24 +02:00
parent 895477ca74
commit fa401ce645
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
prop_instance.cpp
View File

@ -4,6 +4,8 @@
#include "../thread_pool/thread_pool.h" #include "../thread_pool/thread_pool.h"
#include "core/engine.h"
Ref<PropData> PropInstance::get_prop_data() { Ref<PropData> PropInstance::get_prop_data() {
return _prop_data; return _prop_data;
} }
@ -113,7 +115,12 @@ void PropInstance::build() {
} }
for (int i = 0; i < get_child_count(); ++i) { for (int i = 0; i < get_child_count(); ++i) {
get_child(i)->queue_delete(); Node *n = get_child(i);
//this way we won't delete the user's nodes
if (n->get_owner() == NULL) {
n->queue_delete();
}
} }
if (!_prop_data.is_valid()) if (!_prop_data.is_valid())
@ -124,6 +131,15 @@ void PropInstance::build() {
if (!e.is_valid()) if (!e.is_valid())
continue; continue;
Node *n = e->processor_get_node_for(get_transform());
if (n) {
add_child(n);
//if (Engine::get_singleton()->is_editor_hint())
// n->set_owner(get_tree()->get_edited_scene_root());
}
} }
} }
@ -141,7 +157,19 @@ PropInstance::~PropInstance() {
_prop_data.unref(); _prop_data.unref();
} }
void PropInstance::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
build();
}
}
}
void PropInstance::_bind_methods() { void PropInstance::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_prop_data"), &PropInstance::get_prop_data);
ClassDB::bind_method(D_METHOD("set_prop_data", "value"), &PropInstance::set_prop_data);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "prop_data", PROPERTY_HINT_RESOURCE_TYPE, "PropData"), "set_prop_data", "get_prop_data");
ClassDB::bind_method(D_METHOD("get_auto_bake"), &PropInstance::get_auto_bake); ClassDB::bind_method(D_METHOD("get_auto_bake"), &PropInstance::get_auto_bake);
ClassDB::bind_method(D_METHOD("set_auto_bake", "value"), &PropInstance::set_auto_bake); ClassDB::bind_method(D_METHOD("set_auto_bake", "value"), &PropInstance::set_auto_bake);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_bake"), "set_auto_bake", "get_auto_bake"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_bake"), "set_auto_bake", "get_auto_bake");

1
prop_instance.h
View File

@ -70,6 +70,7 @@ public:
~PropInstance(); ~PropInstance();
protected: protected:
void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
private: private:

4
props/prop_data_entry.cpp
View File

@ -45,8 +45,8 @@ bool PropDataEntry::processor_handles(Node *node) {
void PropDataEntry::processor_process(Ref<PropData> prop_data, Node *node, const Transform &transform) { void PropDataEntry::processor_process(Ref<PropData> prop_data, Node *node, const Transform &transform) {
call("_processor_process", prop_data, node, transform); call("_processor_process", prop_data, node, transform);
} }
Node *PropDataEntry::processor_get_node_for(const Ref<PropData> &prop_data) { Node *PropDataEntry::processor_get_node_for(const Transform &transform) {
return call("_processor_get_node_for", prop_data); return call("_processor_get_node_for", transform);
} }
bool PropDataEntry::_processor_handles(Node *node) { bool PropDataEntry::_processor_handles(Node *node) {

2
props/prop_data_entry.h
View File

@ -45,7 +45,7 @@ public:
bool processor_handles(Node *node); bool processor_handles(Node *node);
void processor_process(Ref<PropData> prop_data, Node *node, const Transform &transform); void processor_process(Ref<PropData> prop_data, Node *node, const Transform &transform);
Node *processor_get_node_for(const Ref<PropData> &prop_data); Node *processor_get_node_for(const Transform &transform);
virtual bool _processor_handles(Node *node); virtual bool _processor_handles(Node *node);
virtual void _processor_process(Ref<PropData> prop_data, Node *node, const Transform &transform); virtual void _processor_process(Ref<PropData> prop_data, Node *node, const Transform &transform);