Relintai/terraman
1
0
Fork 0
mirror of https://github.com/Relintai/terraman.git synced 2025-04-23 21:43:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Work on fixing compile.

Browse Source
This commit is contained in:
Relintai 2023-01-09 01:15:58 +01:00
parent e7b6f5eaa9
commit cb3229876b
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/terrain_library_merger.cpp
View File

@ -171,7 +171,7 @@ void TerrainLibraryMerger::set_prop(const int index, const Ref<PropData> &value)
void TerrainLibraryMerger::remove_prop(const int index) { void TerrainLibraryMerger::remove_prop(const int index) {
ERR_FAIL_INDEX(index, _props.size()); ERR_FAIL_INDEX(index, _props.size());
_props.remove(index); _props.remove_at(index);
} }
int TerrainLibraryMerger::get_num_props() const { int TerrainLibraryMerger::get_num_props() const {
return _props.size(); return _props.size();
@ -365,7 +365,7 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons
} }
TerrainLibraryMerger::TerrainLibraryMerger() { TerrainLibraryMerger::TerrainLibraryMerger() {
_packer.instance(); _packer.instantiate();
#if GODOT4 #if GODOT4
#warning implement #warning implement
@ -377,7 +377,7 @@ TerrainLibraryMerger::TerrainLibraryMerger() {
_packer->set_keep_original_atlases(false); _packer->set_keep_original_atlases(false);
_packer->set_margin(0); _packer->set_margin(0);
_prop_packer.instance(); _prop_packer.instantiate();
#if GODOT4 #if GODOT4
#warning implement #warning implement

12
library/terrain_library_merger_pcm.cpp
View File

@ -118,7 +118,7 @@ void TerrainLibraryMergerPCM::_material_cache_get_key(Ref<TerrainChunk> chunk) {
//print_error("New cache: " + hstr); //print_error("New cache: " + hstr);
Ref<TerrainMaterialCachePCM> cache; Ref<TerrainMaterialCachePCM> cache;
cache.instance(); cache.instantiate();
cache->inc_ref_count(); cache->inc_ref_count();
cache->set_texture_flags(get_texture_flags()); cache->set_texture_flags(get_texture_flags());
@ -287,7 +287,7 @@ void TerrainLibraryMergerPCM::_liquid_material_cache_get_key(Ref<TerrainChunk> c
//print_error("New cache: " + hstr); //print_error("New cache: " + hstr);
Ref<TerrainMaterialCachePCM> cache; Ref<TerrainMaterialCachePCM> cache;
cache.instance(); cache.instantiate();
cache->inc_ref_count(); cache->inc_ref_count();
cache->set_texture_flags(get_texture_flags()); cache->set_texture_flags(get_texture_flags());
@ -475,7 +475,7 @@ void TerrainLibraryMergerPCM::_prop_material_cache_get_key(Ref<TerrainChunk> chu
//print_error("New prop cache: " + hstr); //print_error("New prop cache: " + hstr);
Ref<TerrainMaterialCachePCM> cache; Ref<TerrainMaterialCachePCM> cache;
cache.instance(); cache.instantiate();
cache->inc_ref_count(); cache->inc_ref_count();
cache->set_texture_flags(get_texture_flags()); cache->set_texture_flags(get_texture_flags());
@ -706,7 +706,7 @@ void TerrainLibraryMergerPCM::set_prop(const int index, const Ref<PropData> &val
void TerrainLibraryMergerPCM::remove_prop(const int index) { void TerrainLibraryMergerPCM::remove_prop(const int index) {
ERR_FAIL_INDEX(index, _props.size()); ERR_FAIL_INDEX(index, _props.size());
_props.remove(index); _props.remove_at(index);
} }
int TerrainLibraryMergerPCM::get_num_props() const { int TerrainLibraryMergerPCM::get_num_props() const {
return _props.size(); return _props.size();
@ -903,7 +903,7 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c
} }
TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() { TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() {
_packer.instance(); _packer.instantiate();
#if GODOT4 #if GODOT4
#warning implement #warning implement
@ -915,7 +915,7 @@ TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() {
_packer->set_keep_original_atlases(false); _packer->set_keep_original_atlases(false);
_packer->set_margin(0); _packer->set_margin(0);
_prop_packer.instance(); _prop_packer.instantiate();
#if GODOT4 #if GODOT4
#warning implement #warning implement

2
library/terrain_material_cache_pcm.cpp
View File

@ -179,7 +179,7 @@ void TerrainMaterialCachePCM::_setup_material_albedo(Ref<Texture> texture) {
} }
TerrainMaterialCachePCM::TerrainMaterialCachePCM() { TerrainMaterialCachePCM::TerrainMaterialCachePCM() {
_packer.instance(); _packer.instantiate();
#if GODOT4 #if GODOT4
#warning implement #warning implement

28
world/blocky/terrain_world_blocky.cpp
View File

@ -36,63 +36,63 @@ Ref<TerrainChunk> TerrainWorldBlocky::_create_chunk(int x, int z, Ref<TerrainChu
if (chunk->job_get_count() == 0) { if (chunk->job_get_count() == 0) {
Ref<TerrainTerrainJob> tj; Ref<TerrainTerrainJob> tj;
tj.instance(); tj.instantiate();
Ref<TerrainLightJob> lj; Ref<TerrainLightJob> lj;
lj.instance(); lj.instantiate();
Ref<TerrainMesherJobStep> s; Ref<TerrainMesherJobStep> s;
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD);
s->set_lod_index(1); s->set_lod_index(1);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD);
s->set_lod_index(2); s->set_lod_index(2);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE);
tj->add_jobs_step(s); tj->add_jobs_step(s);
tj->set_mesher(Ref<TerrainMesher>(memnew(TerrainMesherBlocky()))); tj->set_mesher(Ref<TerrainMesher>(memnew(TerrainMesherBlocky())));
Ref<TerrainMesherBlocky> liquid_mesher; Ref<TerrainMesherBlocky> liquid_mesher;
liquid_mesher.instance(); liquid_mesher.instantiate();
liquid_mesher->set_channel_index_type(TerrainChunkDefault::DEFAULT_CHANNEL_LIQUID_TYPE); liquid_mesher->set_channel_index_type(TerrainChunkDefault::DEFAULT_CHANNEL_LIQUID_TYPE);
liquid_mesher->set_channel_index_isolevel(TerrainChunkDefault::DEFAULT_CHANNEL_LIQUID_ISOLEVEL); liquid_mesher->set_channel_index_isolevel(TerrainChunkDefault::DEFAULT_CHANNEL_LIQUID_ISOLEVEL);
tj->set_liquid_mesher(liquid_mesher); tj->set_liquid_mesher(liquid_mesher);
Ref<TerrainPropJob> pj; Ref<TerrainPropJob> pj;
pj.instance(); pj.instantiate();
pj->set_prop_mesher(Ref<TerrainMesher>(memnew(TerrainMesherBlocky))); pj->set_prop_mesher(Ref<TerrainMesher>(memnew(TerrainMesherBlocky)));
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(TerrainMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
Ref<FastQuadraticMeshSimplifier> fqms; Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_simplification_steps(2); s->set_simplification_steps(2);
#endif #endif

16
world/default/terrain_world_default.cpp
View File

@ -182,35 +182,35 @@ Ref<TerrainChunk> TerrainWorldDefault::_create_chunk(int x, int z, Ref<TerrainCh
if (chunk->job_get_count() == 0) { if (chunk->job_get_count() == 0) {
Ref<TerrainTerrainJob> tj; Ref<TerrainTerrainJob> tj;
tj.instance(); tj.instantiate();
Ref<TerrainLightJob> lj; Ref<TerrainLightJob> lj;
lj.instance(); lj.instantiate();
Ref<TerrainPropJob> pj; Ref<TerrainPropJob> pj;
pj.instance(); pj.instantiate();
pj->set_prop_mesher(Ref<TerrainMesher>(memnew(TerrainMesherDefault))); pj->set_prop_mesher(Ref<TerrainMesher>(memnew(TerrainMesherDefault)));
Ref<TerrainMesherJobStep> s; Ref<TerrainMesherJobStep> s;
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD);
s->set_lod_index(1); s->set_lod_index(1);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD); s->set_job_type(TerrainMesherJobStep::TYPE_NORMAL_LOD);
s->set_lod_index(2); s->set_lod_index(2);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(TerrainMesherJobStep::TYPE_MERGE_VERTS);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(TerrainMesherJobStep::TYPE_BAKE_TEXTURE);
tj->add_jobs_step(s); tj->add_jobs_step(s);

2
world/jobs/terrain_job.cpp
View File

@ -153,7 +153,7 @@ void TerrainJob::generate_random_ao(int seed, int octaves, int period, float per
int position_z = _chunk->get_position_z(); int position_z = _chunk->get_position_z();
Ref<OpenSimplexNoise> noise; Ref<OpenSimplexNoise> noise;
noise.instance(); noise.instantiate();
noise->set_seed(seed); noise->set_seed(seed);
noise->set_octaves(octaves); noise->set_octaves(octaves);

2
world/jobs/terrain_job.h
View File

@ -32,7 +32,7 @@ SOFTWARE.
#include "core/version.h" #include "core/version.h"
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
#include "core/object/reference.h" #include "core/object/ref_counted.h"
#else #else
#include "core/reference.h" #include "core/reference.h"
#endif #endif

2
world/jobs/terrain_prop_job.cpp
View File

@ -529,7 +529,7 @@ void TerrainPropJob::step_type_bake_texture() {
Ref<Texture> tex; Ref<Texture> tex;
if (mat.is_valid()) { if (mat.is_valid()) {
tex = mat->get_shader_param("texture_albedo"); tex = mat->get_shader_parameter("texture_albedo");
} else if (spmat.is_valid()) { } else if (spmat.is_valid()) {
tex = spmat->get_texture(SpatialMaterial::TEXTURE_ALBEDO); tex = spmat->get_texture(SpatialMaterial::TEXTURE_ALBEDO);
} }

4
world/terrain_world_editor.cpp
View File

@ -233,7 +233,7 @@ TerrainWorldEditor::TerrainWorldEditor(EditorNode *p_editor) {
spatial_editor_hb->set_alignment(BoxContainer::ALIGN_BEGIN); spatial_editor_hb->set_alignment(BoxContainer::ALIGN_BEGIN);
SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb); SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb);
_tool_button_group.instance(); _tool_button_group.instantiate();
ToolButton *add_button = memnew(ToolButton); ToolButton *add_button = memnew(ToolButton);
add_button->set_text("Add"); add_button->set_text("Add");
@ -290,7 +290,7 @@ TerrainWorldEditor::TerrainWorldEditor(EditorNode *p_editor) {
scs->add_child(_surfaces_vbox_container); scs->add_child(_surfaces_vbox_container);
_surfaces_vbox_container->set_h_size_flags(SIZE_EXPAND_FILL); _surfaces_vbox_container->set_h_size_flags(SIZE_EXPAND_FILL);
_surfaces_button_group.instance(); _surfaces_button_group.instantiate();
} }
TerrainWorldEditor::~TerrainWorldEditor() { TerrainWorldEditor::~TerrainWorldEditor() {
_world = NULL; _world = NULL;