Relintai/props
1
0
Fork 0
mirror of https://github.com/Relintai/props.git synced 2025-02-04 16:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move job creation from PropInstanceMerger's constructor to a virtual method.

Browse Source
This commit is contained in:
Relintai 2022-02-14 12:56:28 +01:00
parent deb664c781
commit 401666b560
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
prop_instance_merger.cpp
View File

@ -719,23 +719,7 @@ void PropInstanceMerger::collision_mask_changed() {
} }
} }
PropInstanceMerger::PropInstanceMerger() { void PropInstanceMerger::_create_job() {
_build_queued = false;
_auto_lod = true;
_auto_lod_on = false;
_lod_level = 0;
//randomize so even if there is a lot they won't check for this at the same frame
_lod_check_timer = Math::randf() * LOD_CHECK_INTERVAL;
set_building(false);
set_notify_transform(true);
_first_lod_distance_squared = 1000;
_lod_reduction_distance_squared = 600;
//todo this should probably be in a virtual method, like in Terraman or Voxelman
_job = Ref<PropInstancePropJob>(memnew(PropInstancePropJob())); _job = Ref<PropInstancePropJob>(memnew(PropInstancePropJob()));
_job->set_prop_instace(this); _job->set_prop_instace(this);
@ -754,6 +738,23 @@ PropInstanceMerger::PropInstanceMerger() {
_job->add_jobs_step(js); _job->add_jobs_step(js);
} }
PropInstanceMerger::PropInstanceMerger() {
_build_queued = false;
_auto_lod = true;
_auto_lod_on = false;
_lod_level = 0;
//randomize so even if there is a lot they won't check for this at the same frame
_lod_check_timer = Math::randf() * LOD_CHECK_INTERVAL;
set_building(false);
set_notify_transform(true);
_first_lod_distance_squared = 1000;
_lod_reduction_distance_squared = 600;
}
PropInstanceMerger::~PropInstanceMerger() { PropInstanceMerger::~PropInstanceMerger() {
_job.unref(); _job.unref();
@ -764,6 +765,9 @@ PropInstanceMerger::~PropInstanceMerger() {
void PropInstanceMerger::_notification(int p_what) { void PropInstanceMerger::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_POSTINITIALIZE: {
call("_create_job");
} break;
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
if (_job.is_valid()) { if (_job.is_valid()) {
_job->prop_instance_enter_tree(); _job->prop_instance_enter_tree();
@ -918,6 +922,9 @@ void PropInstanceMerger::_notification(int p_what) {
} }
void PropInstanceMerger::_bind_methods() { void PropInstanceMerger::_bind_methods() {
BIND_VMETHOD(MethodInfo("_create_job"));
ClassDB::bind_method(D_METHOD("_create_job"), &PropInstanceMerger::_create_job);
ClassDB::bind_method(D_METHOD("get_job"), &PropInstanceMerger::get_job); ClassDB::bind_method(D_METHOD("get_job"), &PropInstanceMerger::get_job);
ClassDB::bind_method(D_METHOD("set_job", "value"), &PropInstanceMerger::set_job); ClassDB::bind_method(D_METHOD("set_job", "value"), &PropInstanceMerger::set_job);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "job", PROPERTY_HINT_RESOURCE_TYPE, "PropInstanceJob", 0), "set_job", "get_job"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "job", PROPERTY_HINT_RESOURCE_TYPE, "PropInstanceJob", 0), "set_job", "get_job");

2
prop_instance_merger.h
View File

@ -125,6 +125,8 @@ public:
void collision_layer_changed(); void collision_layer_changed();
void collision_mask_changed(); void collision_mask_changed();
virtual void _create_job();
PropInstanceMerger(); PropInstanceMerger();
~PropInstanceMerger(); ~PropInstanceMerger();