mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 16:52:20 +00:00
fix(navara): batch contours and order ground overlays
Batch consecutive disjoint installation outlines to avoid three stencil draws per feature. Preserve overlapping volumes, material order and local precision. Delete the public effect handle correctly during teardown. Keep imagery below ground classifications and glyphs in every activation order, including minimal mode without tone mapping. Exclude fully offscreen ground volumes from the screen candidate grid. Full unit/allocation, boundaries, formatting and keyless builds pass. Browser checks cover contour coverage, bounded colour differences, a missing-contour negative control, real pass order, sprite alpha and FIRMS glows. Whole-wave performance acceptance remains separate from this implementation checkpoint.
This commit is contained in:
1 parent
9ba5a3aba9
commit
8328aab779
12 files changed
+320
-31
No files matched your search
@@ -11,6 +11,7 @@ import {
|
||||
createInstallationDrapedMesh,
|
||||
createInstallationOutlineDrapedMesh,
|
||||
} from './navaraGeometry.js';
|
||||
import { batchInstallationOutlines } from './navaraOutlineBatch.js';
|
||||
|
||||
const registeredViews = new WeakSet();
|
||||
const KEY = 'gevInstallationsDrape';
|
||||
@@ -131,7 +132,9 @@ export function createInstallationsNavaraRenderer(
|
||||
const contextObjects = new Map();
|
||||
const namedRecords = new Map();
|
||||
const selectionMeshes = new Set();
|
||||
const outlinesById = new Map();
|
||||
const outlineMeshes = new Set();
|
||||
let outlineRecords = [],
|
||||
outlineWidthM = null;
|
||||
let drapeHandle = null;
|
||||
let visible = false;
|
||||
let fillRecord = null;
|
||||
@@ -228,18 +231,17 @@ export function createInstallationsNavaraRenderer(
|
||||
1,
|
||||
(2 * cameraHeight * Math.tan(fov / 2) * 2) / canvasHeight,
|
||||
);
|
||||
const desired = new Map(
|
||||
records
|
||||
.filter((record) => !record.pointOnly && !record.namedArea)
|
||||
.map((record) => [record.id, record]),
|
||||
const desired = records.filter(
|
||||
(record) => !record.pointOnly && !record.namedArea,
|
||||
);
|
||||
for (const [id, entry] of outlinesById) {
|
||||
if (desired.get(id) === entry.record && entry.widthM === widthM) continue;
|
||||
replaceOwnedMeshes(entry.meshes, []);
|
||||
outlinesById.delete(id);
|
||||
}
|
||||
for (const [id, record] of desired) {
|
||||
if (outlinesById.has(id)) continue;
|
||||
if (
|
||||
outlineWidthM === widthM &&
|
||||
desired.length === outlineRecords.length &&
|
||||
desired.every((record, index) => record === outlineRecords[index])
|
||||
)
|
||||
return;
|
||||
const next = [];
|
||||
for (const record of desired) {
|
||||
const lines =
|
||||
record.outlineLines || (record.footprint ? [record.footprint] : []);
|
||||
const meshes = lines
|
||||
@@ -254,17 +256,17 @@ export function createInstallationsNavaraRenderer(
|
||||
}),
|
||||
)
|
||||
.filter(Boolean);
|
||||
const owned = new Set(meshes);
|
||||
for (const mesh of owned) owner.meshes.add(mesh);
|
||||
outlinesById.set(id, { record, widthM, meshes: owned });
|
||||
next.push(...meshes);
|
||||
}
|
||||
syncDrapeEffect();
|
||||
replaceOwnedMeshes(outlineMeshes, batchInstallationOutlines(next));
|
||||
outlineRecords = desired;
|
||||
outlineWidthM = widthM;
|
||||
}
|
||||
|
||||
function clearOutlines() {
|
||||
for (const entry of outlinesById.values())
|
||||
replaceOwnedMeshes(entry.meshes, []);
|
||||
outlinesById.clear();
|
||||
replaceOwnedMeshes(outlineMeshes, []);
|
||||
outlineRecords = [];
|
||||
outlineWidthM = null;
|
||||
}
|
||||
|
||||
function registerContext(record) {
|
||||
@@ -643,7 +645,7 @@ export function createInstallationsNavaraRenderer(
|
||||
selection.destroy();
|
||||
rendering.clearRendered();
|
||||
namedMarkers.destroy();
|
||||
drapeHandle?.destroy();
|
||||
drapeHandle?.delete();
|
||||
drapeHandle = null;
|
||||
normalSet.destroy();
|
||||
selectedSet.destroy();
|
||||
|
||||
Reference in new issue
Block a user