godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62697 from bruvzg/custom_key_3

Browse Source
This commit is contained in:
Rémi Verschelde 2022-07-04 09:44:58 +02:00 committed by GitHub
commit 6a6d32276a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/3d/label_3d.cpp
View File

@ -535,15 +535,8 @@ float Label3D::_generate_glyph_surfaces(const Ref<Font> &p_font, CharType p_char
gl_uv = p_font->get_char_tx_uv_rect(p_char, p_next, p_outline); gl_uv = p_font->get_char_tx_uv_rect(p_char, p_next, p_outline);
texs = p_font->get_char_texture_size(p_char, p_next, p_outline); texs = p_font->get_char_texture_size(p_char, p_next, p_outline);
uint64_t mat_hash; SurfaceKey key = SurfaceKey(tex.get_id(), p_priority);
if (tex != RID()) { if (!surfaces.has(key)) {
mat_hash = hash_one_uint64(tex.get_id());
} else {
mat_hash = hash_one_uint64(0);
}
mat_hash = hash_djb2_one_64(p_priority, mat_hash);
if (!surfaces.has(mat_hash)) {
SurfaceData surf; SurfaceData surf;
surf.material = RID_PRIME(VisualServer::get_singleton()->material_create()); surf.material = RID_PRIME(VisualServer::get_singleton()->material_create());
// Set defaults for material, names need to match up those in SpatialMaterial // Set defaults for material, names need to match up those in SpatialMaterial
@ -567,9 +560,9 @@ float Label3D::_generate_glyph_surfaces(const Ref<Font> &p_font, CharType p_char
surf.z_shift = p_priority; surf.z_shift = p_priority;
} }
surfaces[mat_hash] = surf; surfaces[key] = surf;
} }
SurfaceData &s = surfaces[mat_hash]; SurfaceData &s = surfaces[key];
s.mesh_vertices.resize((s.offset + 1) * 4); s.mesh_vertices.resize((s.offset + 1) * 4);
s.mesh_normals.resize((s.offset + 1) * 4); s.mesh_normals.resize((s.offset + 1) * 4);
@ -624,7 +617,7 @@ void Label3D::_shape() {
// Clear materials. // Clear materials.
{ {
const uint64_t *k = nullptr; const SurfaceKey *k = nullptr;
while ((k = surfaces.next(k))) { while ((k = surfaces.next(k))) {
VS::get_singleton()->free(surfaces[*k].material); VS::get_singleton()->free(surfaces[*k].material);
} }
@ -754,7 +747,7 @@ void Label3D::_shape() {
line++; line++;
} }
const uint64_t *k = nullptr; const SurfaceKey *k = nullptr;
int idx = 0; int idx = 0;
while ((k = surfaces.next(k))) { while ((k = surfaces.next(k))) {
const SurfaceData &surf = surfaces[*k]; const SurfaceData &surf = surfaces[*k];
@ -1063,7 +1056,7 @@ Label3D::~Label3D() {
} }
VS::get_singleton()->free(mesh); VS::get_singleton()->free(mesh);
const uint64_t *k = nullptr; const SurfaceKey *k = nullptr;
while ((k = surfaces.next(k))) { while ((k = surfaces.next(k))) {
VS::get_singleton()->free(surfaces[*k].material); VS::get_singleton()->free(surfaces[*k].material);
} }

25
scene/3d/label_3d.h
View File

@ -78,6 +78,7 @@ private:
mutable Ref<TriangleMesh> triangle_mesh; mutable Ref<TriangleMesh> triangle_mesh;
RID mesh; RID mesh;
struct SurfaceData { struct SurfaceData {
PoolVector3Array mesh_vertices; PoolVector3Array mesh_vertices;
PoolVector3Array mesh_normals; PoolVector3Array mesh_normals;
@ -89,7 +90,29 @@ private:
float z_shift = 0.0; float z_shift = 0.0;
RID material; RID material;
}; };
HashMap<uint64_t, SurfaceData> surfaces;
struct SurfaceKey {
uint64_t texture_id;
int32_t priority;
bool operator==(const SurfaceKey &p_b) const {
return (texture_id == p_b.texture_id) && (priority == p_b.priority);
}
SurfaceKey(uint64_t p_texture_id, int p_priority) {
texture_id = p_texture_id;
priority = p_priority;
}
};
struct SurfaceKeyHasher {
_FORCE_INLINE_ static uint32_t hash(const SurfaceKey &p_a) {
uint32_t hash = hash_djb2_one_32(p_a.texture_id);
return hash_djb2_one_32(p_a.priority, hash);
}
};
HashMap<SurfaceKey, SurfaceData, SurfaceKeyHasher> surfaces;
struct WordCache { struct WordCache {
enum { enum {