archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #106041: fix uv packing performance on aligned quads

Browse Source 
AABB aligned quads would defeat the "witness" accelerator when
using the xatlas packing strategy.

This change reorders the search to allow use of the "witness" technique.
This commit is contained in:
Chris Blackbourn
2023-03-24 11:55:22 +13:00
parent 8a5c9f1f6e
commit f7946b486b
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/geometry/intern/uv_pack.cc
View File

@@ -421,27 +421,29 @@ static float2 find_best_fit_for_island(
const float size_x_scaled = BLI_rctf_size_x(&island->bounds_rect) * scale; const float size_x_scaled = BLI_rctf_size_x(&island->bounds_rect) * scale;
const float size_y_scaled = BLI_rctf_size_y(&island->bounds_rect) * scale; const float size_y_scaled = BLI_rctf_size_y(&island->bounds_rect) * scale;
/* Scan using an "Alpaca"-style search, first vertically. */
int t = 0; int t = 0;
while (t <= scan_line) { while (t <= scan_line) {
const float t_bscaled = t / occupancy.bitmap_scale_reciprocal; const float t_bscaled = t / occupancy.bitmap_scale_reciprocal;
const float2 probe(scan_line_bscaled - size_x_scaled, t_bscaled - size_y_scaled);
/* Scan using an "Alpaca"-style search, both horizontally and vertically at the same time. */ const float extent = occupancy.trace_island(island, scale, margin, probe, false);
if (extent < 0.0f) {
const float2 horiz(scan_line_bscaled - size_x_scaled, t_bscaled - size_y_scaled); return probe;
const float extentH = occupancy.trace_island(island, scale, margin, horiz, false); }
if (extentH < 0.0f) { t = t + std::max(1, int(extent));
return horiz;
} }
const float2 vert(t_bscaled - size_x_scaled, scan_line_bscaled - size_y_scaled); /* Now scan horizontally. */
const float extentV = occupancy.trace_island(island, scale, margin, vert, false); t = 0;
if (extentV < 0.0f) { while (t <= scan_line) {
return vert; const float t_bscaled = t / occupancy.bitmap_scale_reciprocal;
const float2 probe(t_bscaled - size_x_scaled, scan_line_bscaled - size_y_scaled);
const float extent = occupancy.trace_island(island, scale, margin, probe, false);
if (extent < 0.0f) {
return probe;
} }
t = t + std::max(1, int(extent));
const float min_extent = std::min(extentH, extentV);
t = t + std::max(1, int(min_extent));
} }
return float2(-1, -1); return float2(-1, -1);
} }