From 3ede5bdd2930971682a3051953f5c3b0798a5a02 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 9 Jan 2023 20:03:02 +0100 Subject: [PATCH] Work on fixing compile. --- library/terrain_library_merger.cpp | 12 +++-------- library/terrain_library_merger.h | 2 +- library/terrain_library_merger_pcm.cpp | 12 +++-------- library/terrain_library_merger_pcm.h | 2 +- library/terrain_material_cache_pcm.cpp | 7 ++----- meshers/terrain_mesher.cpp | 2 +- world/default/terrain_chunk_default.cpp | 28 ++++++++++++------------- 7 files changed, 25 insertions(+), 40 deletions(-) diff --git a/library/terrain_library_merger.cpp b/library/terrain_library_merger.cpp index 429db5b..b833ac0 100644 --- a/library/terrain_library_merger.cpp +++ b/library/terrain_library_merger.cpp @@ -207,7 +207,7 @@ Rect2 TerrainLibraryMerger::get_prop_uv_rect(const Ref &texture) { return Rect2(0, 0, 1, 1); } - Ref image = tex->get_data(); + Ref image = tex->get_image(); if (!image.is_valid()) { return Rect2(0, 0, 1, 1); @@ -367,11 +367,8 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons TerrainLibraryMerger::TerrainLibraryMerger() { _packer.instantiate(); -#if GODOT4 #warning implement -#else - _packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); -#endif + //_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); _packer->set_max_atlas_size(1024); _packer->set_keep_original_atlases(false); @@ -379,11 +376,8 @@ TerrainLibraryMerger::TerrainLibraryMerger() { _prop_packer.instantiate(); -#if GODOT4 #warning implement -#else - _prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); -#endif + //_prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); _prop_packer->set_max_atlas_size(1024); _prop_packer->set_keep_original_atlases(false); diff --git a/library/terrain_library_merger.h b/library/terrain_library_merger.h index 66437fa..22af1ce 100644 --- a/library/terrain_library_merger.h +++ b/library/terrain_library_merger.h @@ -27,7 +27,7 @@ SOFTWARE. #if VERSION_MAJOR > 3 #include "core/io/resource.h" -#include "core/templates/map.h" +#include "core/templates/hash_map.h" #else #include "core/resource.h" #include "core/map.h" diff --git a/library/terrain_library_merger_pcm.cpp b/library/terrain_library_merger_pcm.cpp index efcfef4..f4963ac 100644 --- a/library/terrain_library_merger_pcm.cpp +++ b/library/terrain_library_merger_pcm.cpp @@ -742,7 +742,7 @@ Rect2 TerrainLibraryMergerPCM::get_prop_uv_rect(const Ref &texture) { return Rect2(0, 0, 1, 1); } - Ref image = tex->get_data(); + Ref image = tex->get_image(); if (!image.is_valid()) { return Rect2(0, 0, 1, 1); @@ -905,11 +905,8 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() { _packer.instantiate(); -#if GODOT4 #warning implement -#else - _packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); -#endif + //_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); _packer->set_max_atlas_size(1024); _packer->set_keep_original_atlases(false); @@ -917,11 +914,8 @@ TerrainLibraryMergerPCM::TerrainLibraryMergerPCM() { _prop_packer.instantiate(); -#if GODOT4 #warning implement -#else - _prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); -#endif + //_prop_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); _prop_packer->set_max_atlas_size(1024); _prop_packer->set_keep_original_atlases(false); diff --git a/library/terrain_library_merger_pcm.h b/library/terrain_library_merger_pcm.h index b5e48ad..ecbc071 100644 --- a/library/terrain_library_merger_pcm.h +++ b/library/terrain_library_merger_pcm.h @@ -27,7 +27,7 @@ SOFTWARE. #if VERSION_MAJOR > 3 #include "core/io/resource.h" -#include "core/templates/map.h" +#include "core/templates/hash_map.h" #else #include "core/resource.h" #include "core/map.h" diff --git a/library/terrain_material_cache_pcm.cpp b/library/terrain_material_cache_pcm.cpp index 658bf40..a10db91 100644 --- a/library/terrain_material_cache_pcm.cpp +++ b/library/terrain_material_cache_pcm.cpp @@ -88,7 +88,7 @@ Rect2 TerrainMaterialCachePCM::additional_texture_get_uv_rect(const Ref return Rect2(0, 0, 1, 1); } - Ref image = tex->get_data(); + Ref image = tex->get_image(); if (!image.is_valid()) { return Rect2(0, 0, 1, 1); @@ -181,11 +181,8 @@ void TerrainMaterialCachePCM::_setup_material_albedo(Ref texture) { TerrainMaterialCachePCM::TerrainMaterialCachePCM() { _packer.instantiate(); -#if GODOT4 #warning implement -#else - _packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); -#endif + //_packer->set_texture_flags(Texture::FLAG_MIPMAPS | Texture::FLAG_FILTER); _packer->set_max_atlas_size(1024); _packer->set_keep_original_atlases(false); diff --git a/meshers/terrain_mesher.cpp b/meshers/terrain_mesher.cpp index 448ef01..191c162 100644 --- a/meshers/terrain_mesher.cpp +++ b/meshers/terrain_mesher.cpp @@ -482,7 +482,7 @@ void TerrainMesher::add_chunk(Ref chunk) { #ifdef MESH_DATA_RESOURCE_PRESENT void TerrainMesher::add_mesh_data_resource(Ref mesh, const Vector3 position, const Vector3 rotation, const Vector3 scale, const Rect2 uv_rect) { - Transform transform = Transform(Basis(rotation).scaled(scale), position); + Transform3D transform = Transform3D(Basis::from_euler(rotation).scaled(scale), position); add_mesh_data_resource_transform(mesh, transform, uv_rect); } diff --git a/world/default/terrain_chunk_default.cpp b/world/default/terrain_chunk_default.cpp index ae65542..13e3a4d 100644 --- a/world/default/terrain_chunk_default.cpp +++ b/world/default/terrain_chunk_default.cpp @@ -88,12 +88,12 @@ void TerrainChunkDefault::set_current_lod_level(const int value) { RID rid = mesh_rid_get_index(MESH_INDEX_TERRAIN, MESH_TYPE_INDEX_MESH_INSTANCE, i); if (rid != RID()) - VisualServer::get_singleton()->instance_set_visible(rid, vis); + RenderingServer::get_singleton()->instance_set_visible(rid, vis); rid = mesh_rid_get_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH_INSTANCE, i); if (rid != RID()) - VisualServer::get_singleton()->instance_set_visible(rid, vis); + RenderingServer::get_singleton()->instance_set_visible(rid, vis); } } @@ -535,11 +535,11 @@ int TerrainChunkDefault::get_light_count() const { void TerrainChunkDefault::debug_mesh_allocate() { if (_debug_mesh_rid == RID()) { - _debug_mesh_rid = VisualServer::get_singleton()->mesh_create(); + _debug_mesh_rid = RenderingServer::get_singleton()->mesh_create(); } if (_debug_mesh_instance == RID()) { - _debug_mesh_instance = VisualServer::get_singleton()->instance_create(); + _debug_mesh_instance = RenderingServer::get_singleton()->instance_create(); if (get_voxel_world()->GET_WORLD().is_valid()) VS::get_singleton()->instance_set_scenario(_debug_mesh_instance, get_voxel_world()->GET_WORLD()->get_scenario()); @@ -551,11 +551,11 @@ void TerrainChunkDefault::debug_mesh_allocate() { } void TerrainChunkDefault::debug_mesh_free() { if (_debug_mesh_instance != RID()) { - VisualServer::get_singleton()->free(_debug_mesh_instance); + RenderingServer::get_singleton()->free(_debug_mesh_instance); } if (_debug_mesh_rid != RID()) { - VisualServer::get_singleton()->free(_debug_mesh_rid); + RenderingServer::get_singleton()->free(_debug_mesh_rid); } } bool TerrainChunkDefault::debug_mesh_has() { @@ -563,7 +563,7 @@ bool TerrainChunkDefault::debug_mesh_has() { } void TerrainChunkDefault::debug_mesh_clear() { if (_debug_mesh_rid != RID()) { - VisualServer::get_singleton()->mesh_clear(_debug_mesh_rid); + RenderingServer::get_singleton()->mesh_clear(_debug_mesh_rid); } } void TerrainChunkDefault::debug_mesh_array_clear() { @@ -586,13 +586,13 @@ void TerrainChunkDefault::debug_mesh_send() { SceneTree *st = SceneTree::get_singleton(); Array arr; - arr.resize(VisualServer::ARRAY_MAX); - arr[VisualServer::ARRAY_VERTEX] = _debug_mesh_array; + arr.resize(RenderingServer::ARRAY_MAX); + arr[RenderingServer::ARRAY_VERTEX] = _debug_mesh_array; - VisualServer::get_singleton()->mesh_add_surface_from_arrays(_debug_mesh_rid, VisualServer::PRIMITIVE_LINES, arr); + RenderingServer::get_singleton()->mesh_add_surface_from_arrays(_debug_mesh_rid, RenderingServer::PRIMITIVE_LINES, arr); if (st) { - VisualServer::get_singleton()->mesh_surface_set_material(_debug_mesh_rid, 0, SceneTree::get_singleton()->get_debug_collision_material()->get_rid()); + RenderingServer::get_singleton()->mesh_surface_set_material(_debug_mesh_rid, 0, SceneTree::get_singleton()->get_debug_collision_material()->get_rid()); } debug_mesh_array_clear(); @@ -715,17 +715,17 @@ void TerrainChunkDefault::_visibility_changed(bool visible) { RID rid = mesh_rid_get_index(MESH_INDEX_TERRAIN, MESH_TYPE_INDEX_MESH_INSTANCE, i); if (rid != RID()) - VisualServer::get_singleton()->instance_set_visible(rid, false); + RenderingServer::get_singleton()->instance_set_visible(rid, false); rid = mesh_rid_get_index(MESH_INDEX_LIQUID, MESH_TYPE_INDEX_MESH_INSTANCE, i); if (rid != RID()) - VisualServer::get_singleton()->instance_set_visible(rid, false); + RenderingServer::get_singleton()->instance_set_visible(rid, false); rid = mesh_rid_get_index(MESH_INDEX_PROP, MESH_TYPE_INDEX_MESH_INSTANCE, i); if (rid != RID()) - VisualServer::get_singleton()->instance_set_visible(rid, false); + RenderingServer::get_singleton()->instance_set_visible(rid, false); } }