Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove implicit conversion from LocalVector to PoolVector

Browse source
This commit is contained in:
lawnjelly 2025-06-14 20:11:48 +01:00
parent 3c35777742
commit 035ffd8caa
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/local_vector.h
View file

@ -255,7 +255,7 @@ public:
return ret; return ret;
} }
operator PoolVector<T>() const { explicit operator PoolVector<T>() const {
PoolVector<T> pl; PoolVector<T> pl;
if (size()) { if (size()) {
pl.resize(size()); pl.resize(size());

2
core/math/vertex_cache_optimizer.cpp
View file

@ -281,7 +281,7 @@ bool VertexCacheOptimizer::reorder_indices_pool(PoolVector<int> &r_indices, uint
LocalVector<int> temp; LocalVector<int> temp;
temp = r_indices; temp = r_indices;
if (reorder_indices(temp, p_num_triangles, p_num_verts)) { if (reorder_indices(temp, p_num_triangles, p_num_verts)) {
r_indices = temp; r_indices = PoolVector<int>(temp);
return true; return true;
} }
return false; return false;

4
scene/resources/merging_tool.cpp
View file

@ -505,7 +505,7 @@ int MergingTool::_clean_mesh_surface(const String &p_source_name, const Transfor
return 0; return 0;
} }
bool MergingTool::_ensure_indices_valid(LocalVector<int> &r_indices, const PoolVector<Vector3> &p_verts) { bool MergingTool::_ensure_indices_valid(LocalVector<int> &r_indices, const LocalVector<Vector3> &p_verts) {
// No indices? create some. // No indices? create some.
if (!r_indices.size()) { if (!r_indices.size()) {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
@ -535,7 +535,7 @@ bool MergingTool::_ensure_indices_valid(LocalVector<int> &r_indices, const PoolV
} }
// Check for invalid tris, or make a list of the valid triangles, depending on whether r_inds is set. // Check for invalid tris, or make a list of the valid triangles, depending on whether r_inds is set.
bool MergingTool::_check_for_valid_indices(const LocalVector<int> &p_inds, const PoolVector<Vector3> &p_verts, LocalVector<int> *r_inds) { bool MergingTool::_check_for_valid_indices(const LocalVector<int> &p_inds, const LocalVector<Vector3> &p_verts, LocalVector<int> *r_inds) {
int nTris = p_inds.size(); int nTris = p_inds.size();
nTris /= 3; nTris /= 3;
int indCount = 0; int indCount = 0;

4
scene/resources/merging_tool.h
View file

@ -109,8 +109,8 @@ private:
static bool _is_mergeable_with_common(const MeshInstance &p_mi, const MeshInstance &p_other); static bool _is_mergeable_with_common(const MeshInstance &p_mi, const MeshInstance &p_other);
static bool _is_shadow_mergeable(const MeshInstance &p_mi); static bool _is_shadow_mergeable(const MeshInstance &p_mi);
static bool _is_material_opaque(const Ref<Material> &p_mat); static bool _is_material_opaque(const Ref<Material> &p_mat);
static bool _ensure_indices_valid(LocalVector<int> &r_indices, const PoolVector<Vector3> &p_verts); static bool _ensure_indices_valid(LocalVector<int> &r_indices, const LocalVector<Vector3> &p_verts);
static bool _check_for_valid_indices(const LocalVector<int> &p_inds, const PoolVector<Vector3> &p_verts, LocalVector<int> *r_inds); static bool _check_for_valid_indices(const LocalVector<int> &p_inds, const LocalVector<Vector3> &p_verts, LocalVector<int> *r_inds);
static bool _triangle_is_degenerate(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, real_t p_epsilon); static bool _triangle_is_degenerate(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, real_t p_epsilon);
static int _clean_mesh_surface(const String &p_source_name, const Transform &p_xform, Ref<Mesh> &p_rmesh, int p_surface_id, Ref<ArrayMesh> r_dest_mesh); static int _clean_mesh_surface(const String &p_source_name, const Transform &p_xform, Ref<Mesh> &p_rmesh, int p_surface_id, Ref<ArrayMesh> r_dest_mesh);
static void _copy_geometry_instance_settings(const GeometryInstance &p_source, MeshInstance &r_dest, bool p_copy_transform); static void _copy_geometry_instance_settings(const GeometryInstance &p_source, MeshInstance &r_dest, bool p_copy_transform);