Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-15 21:06:06 +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:16:03 +01:00
parent 1374ff1636
commit efc9f895bd
8 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/voxel_library_merger_pcm.cpp
View File

@ -120,7 +120,7 @@ void VoxelLibraryMergerPCM::_material_cache_get_key(Ref<VoxelChunk> chunk) {
//print_error("New cache: " + hstr); //print_error("New cache: " + hstr);
Ref<VoxelMaterialCachePCM> cache; Ref<VoxelMaterialCachePCM> 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());
@ -295,7 +295,7 @@ void VoxelLibraryMergerPCM::_prop_material_cache_get_key(Ref<VoxelChunk> chunk)
//print_error("New prop cache: " + hstr); //print_error("New prop cache: " + hstr);
Ref<VoxelMaterialCachePCM> cache; Ref<VoxelMaterialCachePCM> 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());
@ -514,7 +514,7 @@ void VoxelLibraryMergerPCM::set_prop(const int index, const Ref<PropData> &value
void VoxelLibraryMergerPCM::remove_prop(const int index) { void VoxelLibraryMergerPCM::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 VoxelLibraryMergerPCM::get_num_props() const { int VoxelLibraryMergerPCM::get_num_props() const {
return _props.size(); return _props.size();
@ -708,7 +708,7 @@ void VoxelLibraryMergerPCM::_setup_material_albedo(const int material_index, con
} }
VoxelLibraryMergerPCM::VoxelLibraryMergerPCM() { VoxelLibraryMergerPCM::VoxelLibraryMergerPCM() {
_packer.instance(); _packer.instantiate();
#if GODOT4 #if GODOT4
#warning implement #warning implement
@ -720,7 +720,7 @@ VoxelLibraryMergerPCM::VoxelLibraryMergerPCM() {
_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/voxel_material_cache_pcm.cpp
View File

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

22
world/blocky/voxel_world_blocky.cpp
View File

@ -48,26 +48,26 @@ Ref<VoxelChunk> VoxelWorldBlocky::_create_chunk(int x, int y, int z, Ref<VoxelCh
tj.INSTANCE(); tj.INSTANCE();
Ref<VoxelMesherJobStep> s; Ref<VoxelMesherJobStep> s;
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2); s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
tj->add_jobs_step(s); tj->add_jobs_step(s);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
s.instance(); s.instantiate();
Ref<FastQuadraticMeshSimplifier> fqms; Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
s->set_simplification_step_ratio(0.8); s->set_simplification_step_ratio(0.8);
@ -83,22 +83,22 @@ Ref<VoxelChunk> VoxelWorldBlocky::_create_chunk(int x, int y, int z, Ref<VoxelCh
pj.INSTANCE(); pj.INSTANCE();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherBlocky))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherBlocky)));
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_simplification_steps(2); s->set_simplification_steps(2);
#endif #endif

22
world/cubic/voxel_world_cubic.cpp
View File

@ -46,26 +46,26 @@ Ref<VoxelChunk> VoxelWorldCubic::_create_chunk(int x, int y, int z, Ref<VoxelChu
tj.INSTANCE(); tj.INSTANCE();
Ref<VoxelMesherJobStep> s; Ref<VoxelMesherJobStep> s;
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2); s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
tj->add_jobs_step(s); tj->add_jobs_step(s);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
s.instance(); s.instantiate();
Ref<FastQuadraticMeshSimplifier> fqms; Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
s->set_simplification_step_ratio(0.8); s->set_simplification_step_ratio(0.8);
@ -84,22 +84,22 @@ Ref<VoxelChunk> VoxelWorldCubic::_create_chunk(int x, int y, int z, Ref<VoxelChu
pj.INSTANCE(); pj.INSTANCE();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherCubic))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherCubic)));
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_simplification_steps(2); s->set_simplification_steps(2);
#endif #endif

28
world/default/voxel_world_default.cpp
View File

@ -194,32 +194,32 @@ Ref<VoxelChunk> VoxelWorldDefault::_create_chunk(int x, int y, int z, Ref<VoxelC
if (chunk->job_get_count() == 0) { if (chunk->job_get_count() == 0) {
Ref<VoxelLightJob> lj; Ref<VoxelLightJob> lj;
lj.instance(); lj.instantiate();
Ref<VoxelTerrainJob> tj; Ref<VoxelTerrainJob> tj;
tj.instance(); tj.instantiate();
Ref<VoxelMesherJobStep> s; Ref<VoxelMesherJobStep> s;
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2); s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
tj->add_jobs_step(s); tj->add_jobs_step(s);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
s.instance(); s.instantiate();
Ref<FastQuadraticMeshSimplifier> fqms; Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
s->set_simplification_step_ratio(0.8); s->set_simplification_step_ratio(0.8);
@ -232,25 +232,25 @@ Ref<VoxelChunk> VoxelWorldDefault::_create_chunk(int x, int y, int z, Ref<VoxelC
//tj->add_liquid_mesher(Ref<VoxelMesher>(memnew(VoxelMesherDefault()))); //tj->add_liquid_mesher(Ref<VoxelMesher>(memnew(VoxelMesherDefault())));
Ref<VoxelPropJob> pj; Ref<VoxelPropJob> pj;
pj.instance(); pj.instantiate();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherDefault))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherDefault)));
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_simplification_steps(2); s->set_simplification_steps(2);
#endif #endif

22
world/marching_cubes/voxel_world_marching_cubes.cpp
View File

@ -46,26 +46,26 @@ Ref<VoxelChunk> VoxelWorldMarchingCubes::_create_chunk(int x, int y, int z, Ref<
tj.INSTANCE(); tj.INSTANCE();
Ref<VoxelMesherJobStep> s; Ref<VoxelMesherJobStep> s;
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2); s->set_job_type(VoxelMesherJobStep::TYPE_DROP_UV2);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
tj->add_jobs_step(s); tj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
tj->add_jobs_step(s); tj->add_jobs_step(s);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
s.instance(); s.instantiate();
Ref<FastQuadraticMeshSimplifier> fqms; Ref<FastQuadraticMeshSimplifier> fqms;
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
s->set_simplification_step_ratio(0.8); s->set_simplification_step_ratio(0.8);
@ -85,22 +85,22 @@ Ref<VoxelChunk> VoxelWorldMarchingCubes::_create_chunk(int x, int y, int z, Ref<
pj.INSTANCE(); pj.INSTANCE();
pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherMarchingCubes))); pj->set_prop_mesher(Ref<VoxelMesher>(memnew(VoxelMesherMarchingCubes)));
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL); s->set_job_type(VoxelMesherJobStep::TYPE_NORMAL);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS); s->set_job_type(VoxelMesherJobStep::TYPE_MERGE_VERTS);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE); s->set_job_type(VoxelMesherJobStep::TYPE_BAKE_TEXTURE);
pj->add_jobs_step(s); pj->add_jobs_step(s);
s.instance(); s.instantiate();
s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH); s->set_job_type(VoxelMesherJobStep::TYPE_SIMPLIFY_MESH);
#ifdef MESH_UTILS_PRESENT #ifdef MESH_UTILS_PRESENT
fqms.instance(); fqms.instantiate();
s->set_fqms(fqms); s->set_fqms(fqms);
s->set_simplification_steps(2); s->set_simplification_steps(2);
#endif #endif

4
world/voxel_world.cpp
View File

@ -413,7 +413,7 @@ void VoxelWorld::chunk_setup(Ref<VoxelChunk> chunk) {
Ref<VoxelChunk> VoxelWorld::_create_chunk(const int x, const int y, const int z, Ref<VoxelChunk> chunk) { Ref<VoxelChunk> VoxelWorld::_create_chunk(const int x, const int y, const int z, Ref<VoxelChunk> chunk) {
if (!chunk.is_valid()) { if (!chunk.is_valid()) {
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
chunk.instance(); chunk.instantiate();
#else #else
chunk.instantiate(); chunk.instantiate();
#endif #endif
@ -668,7 +668,7 @@ void VoxelWorld::prop_add(Transform tarnsform, const Ref<PropData> &prop, const
if (light_data.is_valid()) { if (light_data.is_valid()) {
Ref<VoxelLight> light; Ref<VoxelLight> light;
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
light.instance(); light.instantiate();
#else #else
light.instantiate(); light.instantiate();
#endif #endif

4
world/voxel_world_editor.cpp
View File

@ -253,7 +253,7 @@ VoxelWorldEditor::VoxelWorldEditor(EditorNode *p_editor) {
SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb); SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb);
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
_tool_button_group.instance(); _tool_button_group.instantiate();
#else #else
_tool_button_group.instantiate(); _tool_button_group.instantiate();
#endif #endif
@ -329,7 +329,7 @@ VoxelWorldEditor::VoxelWorldEditor(EditorNode *p_editor) {
_surfaces_vbox_container->set_h_size_flags(SIZE_EXPAND_FILL); _surfaces_vbox_container->set_h_size_flags(SIZE_EXPAND_FILL);
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
_surfaces_button_group.instance(); _surfaces_button_group.instantiate();
#else #else
_surfaces_button_group.instantiate(); _surfaces_button_group.instantiate();
#endif #endif