Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed occlusion culling for double builds by enforcing float conversion for Embree.

Browse Source
This commit is contained in:
Rudolph Bester
2024-11-02 16:48:08 +02:00
parent 9e6098432a
commit 4089a6cb8c
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/raycast/raycast_occlusion_cull.cpp
View File

@@ -334,10 +334,10 @@ void RaycastOcclusionCull::Scenario::_update_dirty_instance(int p_idx, RID *p_in
int vertices_size = occ->vertices.size(); int vertices_size = occ->vertices.size();
// Embree requires the last element to be readable by a 16-byte SSE load instruction, so we add padding to be safe. // Embree requires the last element to be readable by a 16-byte SSE load instruction, so we add padding to be safe.
occ_inst->xformed_vertices.resize(vertices_size + 1); occ_inst->xformed_vertices.resize(3 * vertices_size + 3);
const Vector3 *read_ptr = occ->vertices.ptr(); const Vector3 *read_ptr = occ->vertices.ptr();
Vector3 *write_ptr = occ_inst->xformed_vertices.ptr(); float *write_ptr = occ_inst->xformed_vertices.ptr();
if (vertices_size > 1024) { if (vertices_size > 1024) {
TransformThreadData td; TransformThreadData td;
@@ -365,9 +365,14 @@ void RaycastOcclusionCull::Scenario::_transform_vertices_thread(uint32_t p_threa
_transform_vertices_range(p_data->read, p_data->write, p_data->xform, from, to); _transform_vertices_range(p_data->read, p_data->write, p_data->xform, from, to);
} }
void RaycastOcclusionCull::Scenario::_transform_vertices_range(const Vector3 *p_read, Vector3 *p_write, const Transform3D &p_xform, int p_from, int p_to) { void RaycastOcclusionCull::Scenario::_transform_vertices_range(const Vector3 *p_read, float *p_write, const Transform3D &p_xform, int p_from, int p_to) {
float *floats_w = p_write;
for (int i = p_from; i < p_to; i++) { for (int i = p_from; i < p_to; i++) {
p_write[i] = p_xform.xform(p_read[i]); const Vector3 p = p_xform.xform(p_read[i]);
floats_w[0] = p.x;
floats_w[1] = p.y;
floats_w[2] = p.z;
floats_w += 3;
} }
} }
@@ -458,7 +463,7 @@ void RaycastOcclusionCull::Scenario::update() {
} }
RTCGeometry geom = rtcNewGeometry(raycast_singleton->ebr_device, RTC_GEOMETRY_TYPE_TRIANGLE); RTCGeometry geom = rtcNewGeometry(raycast_singleton->ebr_device, RTC_GEOMETRY_TYPE_TRIANGLE);
rtcSetSharedGeometryBuffer(geom, RTC_BUFFER_TYPE_VERTEX, 0, RTC_FORMAT_FLOAT3, occ_inst->xformed_vertices.ptr(), 0, sizeof(Vector3), occ_inst->xformed_vertices.size()); rtcSetSharedGeometryBuffer(geom, RTC_BUFFER_TYPE_VERTEX, 0, RTC_FORMAT_FLOAT3, occ_inst->xformed_vertices.ptr(), 0, sizeof(float) * 3, occ_inst->xformed_vertices.size() / 3);
rtcSetSharedGeometryBuffer(geom, RTC_BUFFER_TYPE_INDEX, 0, RTC_FORMAT_UINT3, occ_inst->indices.ptr(), 0, sizeof(uint32_t) * 3, occ_inst->indices.size() / 3); rtcSetSharedGeometryBuffer(geom, RTC_BUFFER_TYPE_INDEX, 0, RTC_FORMAT_UINT3, occ_inst->indices.ptr(), 0, sizeof(uint32_t) * 3, occ_inst->indices.size() / 3);
rtcCommitGeometry(geom); rtcCommitGeometry(geom);
rtcAttachGeometry(next_scene, geom); rtcAttachGeometry(next_scene, geom);

6
modules/raycast/raycast_occlusion_cull.h
View File

@@ -109,7 +109,7 @@ private:
struct OccluderInstance { struct OccluderInstance {
RID occluder; RID occluder;
LocalVector<uint32_t> indices; LocalVector<uint32_t> indices;
LocalVector<Vector3> xformed_vertices; LocalVector<float> xformed_vertices;
Transform3D xform; Transform3D xform;
bool enabled = true; bool enabled = true;
bool removed = false; bool removed = false;
@@ -126,7 +126,7 @@ private:
uint32_t vertex_count; uint32_t vertex_count;
Transform3D xform; Transform3D xform;
const Vector3 *read; const Vector3 *read;
Vector3 *write = nullptr; float *write = nullptr;
}; };
Thread *commit_thread = nullptr; Thread *commit_thread = nullptr;
@@ -144,7 +144,7 @@ private:
void _update_dirty_instance_thread(int p_idx, RID *p_instances); void _update_dirty_instance_thread(int p_idx, RID *p_instances);
void _update_dirty_instance(int p_idx, RID *p_instances); void _update_dirty_instance(int p_idx, RID *p_instances);
void _transform_vertices_thread(uint32_t p_thread, TransformThreadData *p_data); void _transform_vertices_thread(uint32_t p_thread, TransformThreadData *p_data);
void _transform_vertices_range(const Vector3 *p_read, Vector3 *p_write, const Transform3D &p_xform, int p_from, int p_to); void _transform_vertices_range(const Vector3 *p_read, float *p_write, const Transform3D &p_xform, int p_from, int p_to);
static void _commit_scene(void *p_ud); static void _commit_scene(void *p_ud);
void free(); void free();
void update(); void update();