From cb3229876b218e85c249a28488acab12436a3cde Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 9 Jan 2023 01:15:58 +0100 Subject: [PATCH] Work on fixing compile. --- library/terrain_library_merger.cpp | 6 +++--- library/terrain_library_merger_pcm.cpp | 12 +++++------ library/terrain_material_cache_pcm.cpp | 2 +- world/blocky/terrain_world_blocky.cpp | 28 ++++++++++++------------- world/default/terrain_world_default.cpp | 16 +++++++------- world/jobs/terrain_job.cpp | 2 +- world/jobs/terrain_job.h | 2 +- world/jobs/terrain_prop_job.cpp | 2 +- world/terrain_world_editor.cpp | 4 ++-- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/library/terrain_library_merger.cpp b/library/terrain_library_merger.cpp index 9062959..dc7b345 100644 --- a/library/terrain_library_merger.cpp +++ b/library/terrain_library_merger.cpp @@ -171,7 +171,7 @@ void TerrainLibraryMerger::set_prop(const int index, const Ref &value) void TerrainLibraryMerger::remove_prop(const int index) { ERR_FAIL_INDEX(index, _props.size()); - _props.remove(index); + _props.remove_at(index); } int TerrainLibraryMerger::get_num_props() const { return _props.size(); @@ -365,7 +365,7 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons } TerrainLibraryMerger::TerrainLibraryMerger() { - _packer.instance(); + _packer.instantiate(); #if GODOT4 #warning implement @@ -377,7 +377,7 @@ TerrainLibraryMerger::TerrainLibraryMerger() { _packer->set_keep_original_atlases(false); _packer->set_margin(0); - _prop_packer.instance(); + _prop_packer.instantiate(); #if GODOT4 #warning implement diff --git a/library/terrain_library_merger_pcm.cpp b/library/terrain_library_merger_pcm.cpp index e7b5734..6cd4f5b 100644 --- a/library/terrain_library_merger_pcm.cpp +++ b/library/terrain_library_merger_pcm.cpp @@ -118,7 +118,7 @@ void TerrainLibraryMergerPCM::_material_cache_get_key(Ref chunk) { //print_error("New cache: " + hstr); Ref cache; - cache.instance(); + cache.instantiate(); cache->inc_ref_count(); cache->set_texture_flags(get_texture_flags()); @@ -287,7 +287,7 @@ void TerrainLibraryMergerPCM::_liquid_material_cache_get_key(Ref c //print_error("New cache: " + hstr); Ref cache; - cache.instance(); + cache.instantiate(); cache->inc_ref_count(); cache->set_texture_flags(get_texture_flags()); @@ -475,7 +475,7 @@ void TerrainLibraryMergerPCM::_prop_material_cache_get_key(Ref chu //print_error("New prop cache: " + hstr); Ref cache; - cache.instance(); + cache.instantiate(); cache->inc_ref_count(); cache->set_texture_flags(get_texture_flags()); @@ -706,7 +706,7 @@ void TerrainLibraryMergerPCM::set_prop(const int index, const Ref &val void TerrainLibraryMergerPCM::remove_prop(const int index) { ERR_FAIL_INDEX(index, _props.size()); - _props.remove(index); + _props.remove_at(index); } int TerrainLibraryMergerPCM::get_num_props() const { return _props.size(); @@ -903,7 +903,7 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c } TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() { - _packer.instance(); + _packer.instantiate(); #if GODOT4 #warning implement @@ -915,7 +915,7 @@ TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() { _packer->set_keep_original_atlases(false); _packer->set_margin(0); - _prop_packer.instance(); + _prop_packer.instantiate(); #if GODOT4 #warning implement diff --git a/library/terrain_material_cache_pcm.cpp b/library/terrain_material_cache_pcm.cpp index 320f578..bf64efe 100644 --- a/library/terrain_material_cache_pcm.cpp +++ b/library/terrain_material_cache_pcm.cpp @@ -179,7 +179,7 @@ void TerrainMaterialCachePCM::_setup_material_albedo(Ref texture) { } TerrainMaterialCachePCM::TerrainMaterialCachePCM() { - _packer.instance(); + _packer.instantiate(); #if GODOT4 #warning implement diff --git a/world/blocky/terrain_world_blocky.cpp b/world/blocky/terrain_world_blocky.cpp index 3839d4a..ce37a10 100644 --- a/world/blocky/terrain_world_blocky.cpp +++ b/world/blocky/terrain_world_blocky.cpp @@ -36,63 +36,63 @@ Ref TerrainWorldBlocky::_create_chunk(int x, int z, Refjob_get_count() == 0) { Ref tj; - tj.instance(); + tj.instantiate(); Ref lj; - lj.instance(); + lj.instantiate(); Ref s; - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_lod_index(1); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_lod_index(2); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE); tj->add_jobs_step(s); tj->set_mesher(Ref(memnew(TerrainMesherBlocky()))); Ref liquid_mesher; - liquid_mesher.instance(); + liquid_mesher.instantiate(); liquid_mesher->set_channel_index_type(TerrainChunkDefault::DEFAULT_CHANNEL_LIQUID_TYPE); liquid_mesher->set_channel_index_isolevel(TerrainChunkDefault::DEFAULT_CHANNEL_LIQUID_ISOLEVEL); tj->set_liquid_mesher(liquid_mesher); Ref pj; - pj.instance(); + pj.instantiate(); pj->set_prop_mesher(Ref(memnew(TerrainMesherBlocky))); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL); pj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS); pj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE); pj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_SIMPLIFY_MESH); #ifdef MESH_UTILS_PRESENT Ref fqms; - fqms.instance(); + fqms.instantiate(); s->set_fqms(fqms); s->set_simplification_steps(2); #endif diff --git a/world/default/terrain_world_default.cpp b/world/default/terrain_world_default.cpp index 30189ce..fc311cc 100644 --- a/world/default/terrain_world_default.cpp +++ b/world/default/terrain_world_default.cpp @@ -182,35 +182,35 @@ Ref TerrainWorldDefault::_create_chunk(int x, int z, Refjob_get_count() == 0) { Ref tj; - tj.instance(); + tj.instantiate(); Ref lj; - lj.instance(); + lj.instantiate(); Ref pj; - pj.instance(); + pj.instantiate(); pj->set_prop_mesher(Ref(memnew(TerrainMesherDefault))); Ref s; - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_lod_index(1); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_lod_index(2); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS); tj->add_jobs_step(s); - s.instance(); + s.instantiate(); s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE); tj->add_jobs_step(s); diff --git a/world/jobs/terrain_job.cpp b/world/jobs/terrain_job.cpp index b40d912..163b809 100644 --- a/world/jobs/terrain_job.cpp +++ b/world/jobs/terrain_job.cpp @@ -153,7 +153,7 @@ void TerrainJob::generate_random_ao(int seed, int octaves, int period, float per int position_z = _chunk->get_position_z(); Ref noise; - noise.instance(); + noise.instantiate(); noise->set_seed(seed); noise->set_octaves(octaves); diff --git a/world/jobs/terrain_job.h b/world/jobs/terrain_job.h index bd682b8..54ded78 100644 --- a/world/jobs/terrain_job.h +++ b/world/jobs/terrain_job.h @@ -32,7 +32,7 @@ SOFTWARE. #include "core/version.h" #if VERSION_MAJOR > 3 -#include "core/object/reference.h" +#include "core/object/ref_counted.h" #else #include "core/reference.h" #endif diff --git a/world/jobs/terrain_prop_job.cpp b/world/jobs/terrain_prop_job.cpp index 19a8bd8..42d0286 100644 --- a/world/jobs/terrain_prop_job.cpp +++ b/world/jobs/terrain_prop_job.cpp @@ -529,7 +529,7 @@ void TerrainPropJob::step_type_bake_texture() { Ref tex; if (mat.is_valid()) { - tex = mat->get_shader_param("texture_albedo"); + tex = mat->get_shader_parameter("texture_albedo"); } else if (spmat.is_valid()) { tex = spmat->get_texture(SpatialMaterial::TEXTURE_ALBEDO); } diff --git a/world/terrain_world_editor.cpp b/world/terrain_world_editor.cpp index 92cc67e..e718cee 100644 --- a/world/terrain_world_editor.cpp +++ b/world/terrain_world_editor.cpp @@ -233,7 +233,7 @@ TerrainWorldEditor::TerrainWorldEditor(EditorNode *p_editor) { spatial_editor_hb->set_alignment(BoxContainer::ALIGN_BEGIN); SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb); - _tool_button_group.instance(); + _tool_button_group.instantiate(); ToolButton *add_button = memnew(ToolButton); add_button->set_text("Add"); @@ -290,7 +290,7 @@ TerrainWorldEditor::TerrainWorldEditor(EditorNode *p_editor) { scs->add_child(_surfaces_vbox_container); _surfaces_vbox_container->set_h_size_flags(SIZE_EXPAND_FILL); - _surfaces_button_group.instance(); + _surfaces_button_group.instantiate(); } TerrainWorldEditor::~TerrainWorldEditor() { _world = NULL;