updated

xelatihy · Jan 30, 2024 · cfc0b70 · cfc0b70
1 parent 9e096fb
commit cfc0b70
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/libs/yocto/yocto_raycasting.cpp b/libs/yocto/yocto_raycasting.cpp
@@ -100,7 +100,7 @@ inline void parallel_for(T num, Func&& func) {
 namespace yocto {
 
 // Splits a BVH node using the SAH heuristic. Returns split position and axis.
-static pair<int, int> split_sah(vector<int>& primitives,
+static pair<int, int> split_bvh_sah(vector<int>& primitives,
     const vector<bbox3f>& bboxes, const vector<vec3f>& centers, int start,
     int end) {
   // compute primintive bounds and size
@@ -160,9 +160,9 @@ static pair<int, int> split_sah(vector<int>& primitives,
 
 // Splits a BVH node using the balance heuristic. Returns split position and
 // axis.
-[[maybe_unused]] static pair<int, int> split_balanced(vector<int>& primitives,
-    const vector<bbox3f>& bboxes, const vector<vec3f>& centers, int start,
-    int end) {
+[[maybe_unused]] static pair<int, int> split_bvh_balanced(
+    vector<int>& primitives, const vector<bbox3f>& bboxes,
+    const vector<vec3f>& centers, int start, int end) {
   // compute primitives bounds and size
   auto cbbox = invalidb3f;
   for (auto i = start; i < end; i++)
@@ -194,7 +194,7 @@ static pair<int, int> split_sah(vector<int>& primitives,
 
 // Splits a BVH node using the middle heuristic. Returns split position and
 // axis.
-static pair<int, int> split_middle(vector<int>& primitives,
+static pair<int, int> split_bvh_middle(vector<int>& primitives,
     const vector<bbox3f>& bboxes, const vector<vec3f>& centers, int start,
     int end) {
   // compute primintive bounds and size
@@ -273,8 +273,8 @@ static bvh_tree make_elements_bvh(size_t num, bool highquality, BBox&& bbox) {
       // get split
       auto [mid, axis] =
           highquality
-              ? split_sah(bvh.primitives, bboxes, centers, start, end)
-              : split_middle(bvh.primitives, bboxes, centers, start, end);
+              ? split_bvh_sah(bvh.primitives, bboxes, centers, start, end)
+              : split_bvh_middle(bvh.primitives, bboxes, centers, start, end);
 
       // make an internal node
       node.internal = true;