mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-11 18:16:40 +00:00
wgpu backend: selection visualisation + global object_id rebase
Closes the loop on stage 4 (pick): clicking an object now highlights it
on screen. Plus the prerequisite plumbing for selection to behave
correctly across multi-sidecar loads.
Pieces:
1. WgpuSelectionState (new header)
CPU-side multi-set + active-id, mirroring the GL Selection.h shape
but pure stdlib (no Qt deps) so it can move into ifcviewer-core
later without dragging Qt across. clear/replace/add/remove/toggle
APIs + a fillFlagsArray helper that packs (selected, active) into
a u32 bitmap indexed by object_id.
2. selection_flags storage buffer + frame_bgl bump to 2 entries
Indexed by object_id, bit 0 = selected, bit 1 = active. Lives in
the frame bind group (group=0 binding=1) because object_ids are
globally unique — making it model-scoped would be the wrong cut.
ensureSelectionFlagsBuffer grows geometrically (64 → 128 → … u32)
as new models push next_object_id_ up, rebuilds the frame bind
group when it does.
3. Global object_id rebase in applyCachedModel
Each sidecar's local ids start from 1 and collide across files;
pick was previously ambiguous on multi-model loads. We now add
next_object_id_ as a base offset, rewrite InstanceCpu.object_id
(CPU mirror stays consistent) + InstanceGpu.object_id (what pick
reads back), and bump next_object_id_ by the model's max + 1.
4. WGSL main fragment reads sel_flags
Vertex shader passes inst.object_id through to fragment as
@interpolate(flat). Fragment reads sel_flags[object_id], mixes
(0.2, 0.6, 1.0) at 0.45 for in-selection and (0.4, 0.8, 1.0) at
0.40 on top for active. Same constants as the GL main shader.
5. Mouse → selection
LMB-click-without-drag pick result feeds the selection:
no modifier → replace
Shift → add
Ctrl → remove (active migrates to another id in the set)
miss + no modifier → clear
uploadSelectionFlagsIfDirty repacks + writes the GPU bitmap at
the top of the next render(); no upload on still frames.
Pick pipeline is unchanged — it already outputs the per-instance
object_id, and that's what the selection storage indexes.
Visibility + clip planes are pending follow-ups in stage 5 (mostly
small, share the same buffer-lifecycle pattern). Edge silhouette
(stage 9 partial), --screenshot diff harness (stage 10 partial),
ifcviewer-core extract (stage 12), and web chunking (stage 13) all
still pending.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,103 @@
|
||||
/********************************************************************************
|
||||
* *
|
||||
* This file is part of IfcOpenShell. *
|
||||
* *
|
||||
* IfcOpenShell is free software: you can redistribute it and/or modify *
|
||||
* it under the terms of the Lesser GNU General Public License as published by *
|
||||
* the Free Software Foundation, either version 3.0 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* IfcOpenShell is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* Lesser GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the Lesser GNU General Public License *
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
* *
|
||||
********************************************************************************/
|
||||
|
||||
#ifndef WGPUSELECTIONSTATE_H
|
||||
#define WGPUSELECTIONSTATE_H
|
||||
|
||||
#include <cstdint>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
// CPU-side selection tracking. Mirrors src/ifcviewer/Selection.h shape but
|
||||
// without Qt deps (kept pure stdlib so it can move into ifcviewer-core
|
||||
// later without dragging Qt along).
|
||||
//
|
||||
// Two flavours of "selected":
|
||||
// - the multi-set (ids()): every object the user has Shift-added.
|
||||
// - active (activeId()): the *last* single-clicked object. UIs typically
|
||||
// use this to drive the properties panel; the renderer tints it
|
||||
// slightly more strongly than the rest of the multi-set.
|
||||
//
|
||||
// The GPU consumes a flat u32 array indexed by object_id: bit 0 = selected,
|
||||
// bit 1 = active. Sized to (max_object_id + 1) by the caller.
|
||||
class WgpuSelectionState {
|
||||
public:
|
||||
void clear() {
|
||||
if (ids_.empty() && active_ == 0) return;
|
||||
ids_.clear();
|
||||
active_ = 0;
|
||||
dirty_ = true;
|
||||
}
|
||||
|
||||
// Replace the selection with a single object. id == 0 clears.
|
||||
void replace(uint32_t id) {
|
||||
ids_.clear();
|
||||
if (id != 0) ids_.insert(id);
|
||||
active_ = id;
|
||||
dirty_ = true;
|
||||
}
|
||||
|
||||
void add(uint32_t id) {
|
||||
if (id == 0) return;
|
||||
ids_.insert(id);
|
||||
active_ = id;
|
||||
dirty_ = true;
|
||||
}
|
||||
|
||||
void remove(uint32_t id) {
|
||||
if (id == 0) return;
|
||||
if (ids_.erase(id) == 0) return;
|
||||
if (active_ == id) {
|
||||
active_ = ids_.empty() ? 0 : *ids_.begin();
|
||||
}
|
||||
dirty_ = true;
|
||||
}
|
||||
|
||||
void toggle(uint32_t id) {
|
||||
if (id == 0) return;
|
||||
if (ids_.count(id)) remove(id);
|
||||
else add(id);
|
||||
}
|
||||
|
||||
bool contains(uint32_t id) const { return ids_.count(id) > 0; }
|
||||
uint32_t activeId() const { return active_; }
|
||||
const std::unordered_set<uint32_t>& ids() const { return ids_; }
|
||||
size_t count() const { return ids_.size(); }
|
||||
|
||||
bool dirty() const { return dirty_; }
|
||||
void markClean() { dirty_ = false; }
|
||||
|
||||
// Fill `out` (sized to entries u32s) with bit-packed flags:
|
||||
// bit 0 = selected (in ids_), bit 1 = active. out[0] is always 0
|
||||
// because object_id 0 is the "miss" sentinel.
|
||||
void fillFlagsArray(std::vector<uint32_t>& out, uint32_t entries) const {
|
||||
out.assign(entries, 0);
|
||||
for (uint32_t id : ids_) {
|
||||
if (id < entries) out[id] |= 1u;
|
||||
}
|
||||
if (active_ != 0 && active_ < entries) out[active_] |= 2u;
|
||||
}
|
||||
|
||||
private:
|
||||
std::unordered_set<uint32_t> ids_;
|
||||
uint32_t active_ = 0;
|
||||
bool dirty_ = false;
|
||||
};
|
||||
|
||||
#endif // WGPUSELECTIONSTATE_H
|
||||
@@ -207,6 +207,10 @@ struct PerModel {
|
||||
};
|
||||
|
||||
@group(0) @binding(0) var<uniform> u_frame: FrameUniforms;
|
||||
// Selection flags indexed by object_id. bit 0 = in selection, bit 1 = active.
|
||||
// Sized to next_object_id_ on the CPU side; out-of-range reads can't happen
|
||||
// because we cap the index by arrayLength before fetching.
|
||||
@group(0) @binding(1) var<storage, read> sel_flags: array<u32>;
|
||||
|
||||
@group(1) @binding(0) var<storage, read> vertices: array<u32>;
|
||||
@group(1) @binding(1) var<storage, read> meshes: array<MeshQuant>;
|
||||
@@ -221,6 +225,7 @@ struct VsOut {
|
||||
@location(0) normal: vec3<f32>,
|
||||
@location(1) color: vec4<f32>,
|
||||
@location(2) world_pos: vec3<f32>,
|
||||
@location(3) @interpolate(flat) object_id: u32,
|
||||
};
|
||||
|
||||
// Sign-extend an i8 packed into the byte_idx'th byte of `packed`.
|
||||
@@ -317,6 +322,7 @@ fn vs_main(@builtin(vertex_index) vid: u32) -> VsOut {
|
||||
out.normal = n_final;
|
||||
out.color = color;
|
||||
out.world_pos = world4.xyz;
|
||||
out.object_id = inst.object_id;
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -352,6 +358,14 @@ fn fs_main(in: VsOut) -> @location(0) vec4<f32> {
|
||||
let cavity = clamp(length(fwidth(n)) * 1.5, 0.0, 0.35);
|
||||
color = color * (1.0 - cavity);
|
||||
|
||||
// Selection tint. bit 0 = in selection (cool blue mix), bit 1 = active
|
||||
// (slightly stronger blue mix). Matches the GL main shader.
|
||||
if (in.object_id < arrayLength(&sel_flags)) {
|
||||
let flags = sel_flags[in.object_id];
|
||||
if ((flags & 1u) != 0u) { color = mix(color, vec3<f32>(0.2, 0.6, 1.0), 0.45); }
|
||||
if ((flags & 2u) != 0u) { color = mix(color, vec3<f32>(0.4, 0.8, 1.0), 0.40); }
|
||||
}
|
||||
|
||||
// Cancel the swap chain's implicit linear→sRGB encoding so the final
|
||||
// bytes match the GL backend (see srgbToLinear above).
|
||||
return vec4<f32>(srgbToLinear(color), in.color.a);
|
||||
@@ -562,12 +576,19 @@ void WgpuViewportWindow::applyCachedModel(uint32_t model_id, SidecarData data) {
|
||||
WGPUBufferUsage_Storage,
|
||||
"model.mesh_storage");
|
||||
|
||||
// Derive InstanceGpu[] from InstanceCpu[]. Stage 2 uses the cached
|
||||
// `transform` directly (stage matrices are identity until stage 5+
|
||||
// adds federation composition).
|
||||
// Derive InstanceGpu[] from InstanceCpu[]. Rebase each instance's
|
||||
// object_id by next_object_id_ so picks are globally unambiguous
|
||||
// across multiple loaded sidecars (each sidecar's local IDs start
|
||||
// from 1 and would otherwise collide).
|
||||
const uint32_t object_id_base = next_object_id_;
|
||||
uint32_t max_local_id = 0;
|
||||
std::vector<InstanceGpu> inst_gpu;
|
||||
inst_gpu.reserve(data.instances.size());
|
||||
for (const auto& ic : data.instances) {
|
||||
for (auto& ic : data.instances) {
|
||||
if (ic.object_id > max_local_id) max_local_id = ic.object_id;
|
||||
// Rebase in the CPU mirror too so future cull / picks see the
|
||||
// global id consistently.
|
||||
ic.object_id = object_id_base + ic.object_id;
|
||||
InstanceGpu ig = {};
|
||||
std::memcpy(ig.transform, ic.transform, sizeof(ig.transform));
|
||||
ig.object_id = ic.object_id;
|
||||
@@ -575,6 +596,7 @@ void WgpuViewportWindow::applyCachedModel(uint32_t model_id, SidecarData data) {
|
||||
ig.mesh_id = ic.mesh_id;
|
||||
inst_gpu.push_back(ig);
|
||||
}
|
||||
next_object_id_ = object_id_base + max_local_id + 1;
|
||||
m.instance_storage = createBufferWithData(
|
||||
device_, queue_,
|
||||
inst_gpu.data(), inst_gpu.size() * sizeof(InstanceGpu),
|
||||
@@ -634,6 +656,8 @@ void WgpuViewportWindow::applyCachedModel(uint32_t model_id, SidecarData data) {
|
||||
viewAll();
|
||||
initial_view_applied_ = true;
|
||||
}
|
||||
// Grow selection_flags_ to cover the new id range.
|
||||
ensureSelectionFlagsBuffer();
|
||||
if (isExposed()) requestUpdate();
|
||||
}
|
||||
|
||||
@@ -2017,6 +2041,9 @@ void WgpuViewportWindow::render() {
|
||||
// pyramid is as fresh as it can be before cull runs.
|
||||
if (hiz_enabled_) drainHizReadbacks();
|
||||
|
||||
// Flush any pending selection changes to GPU.
|
||||
uploadSelectionFlagsIfDirty();
|
||||
|
||||
WGPUSurfaceTexture surf_tex = {};
|
||||
wgpuSurfaceGetCurrentTexture(surface_, &surf_tex);
|
||||
|
||||
@@ -2391,14 +2418,17 @@ void WgpuViewportWindow::render() {
|
||||
|
||||
bool WgpuViewportWindow::buildPipelines() {
|
||||
// ---- Bind group layouts ----------------------------------------------
|
||||
WGPUBindGroupLayoutEntry frame_entries[1] = {};
|
||||
WGPUBindGroupLayoutEntry frame_entries[2] = {};
|
||||
frame_entries[0].binding = 0;
|
||||
frame_entries[0].visibility = WGPUShaderStage_Vertex | WGPUShaderStage_Fragment;
|
||||
frame_entries[0].buffer.type = WGPUBufferBindingType_Uniform;
|
||||
frame_entries[0].buffer.minBindingSize = sizeof(FrameUniforms);
|
||||
frame_entries[1].binding = 1;
|
||||
frame_entries[1].visibility = WGPUShaderStage_Fragment;
|
||||
frame_entries[1].buffer.type = WGPUBufferBindingType_ReadOnlyStorage;
|
||||
|
||||
WGPUBindGroupLayoutDescriptor frame_bgl_desc = {};
|
||||
frame_bgl_desc.entryCount = 1;
|
||||
frame_bgl_desc.entryCount = 2;
|
||||
frame_bgl_desc.entries = frame_entries;
|
||||
frame_bgl_desc.label = svFromCStr("ifcviewer-wgpu.frame_bgl");
|
||||
frame_bgl_ = wgpuDeviceCreateBindGroupLayout(device_, &frame_bgl_desc);
|
||||
@@ -2479,26 +2509,91 @@ bool WgpuViewportWindow::buildPipelines() {
|
||||
return false;
|
||||
}
|
||||
|
||||
// ---- Per-frame uniform buffer + bind group ---------------------------
|
||||
// ---- Per-frame uniform buffer ---------------------------------------
|
||||
WGPUBufferDescriptor fb_desc = {};
|
||||
fb_desc.size = sizeof(FrameUniforms);
|
||||
fb_desc.usage = WGPUBufferUsage_Uniform | WGPUBufferUsage_CopyDst;
|
||||
fb_desc.label = svFromCStr("ifcviewer-wgpu.frame_uniform");
|
||||
frame_uniform_buffer_ = wgpuDeviceCreateBuffer(device_, &fb_desc);
|
||||
|
||||
WGPUBindGroupEntry fbg_entries[1] = {};
|
||||
// frame_bind_group_ is built lazily once we have a selection_flags_
|
||||
// buffer to bind alongside the uniform — ensureSelectionFlagsBuffer
|
||||
// handles both the first creation and any subsequent resize.
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void WgpuViewportWindow::ensureSelectionFlagsBuffer() {
|
||||
// Round up to at least 64 entries (256 B — minimum useful storage) and
|
||||
// grow geometrically when next_object_id_ outruns the current capacity.
|
||||
const uint32_t needed = std::max<uint32_t>(next_object_id_, 64);
|
||||
if (selection_flags_buffer_ && selection_flags_capacity_ >= needed) {
|
||||
if (!frame_bind_group_) {
|
||||
// First-time bind group creation after the buffer exists.
|
||||
// (Should always be true here.)
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// (Re)allocate. Geometric grow so we don't recreate every frame as a
|
||||
// big scene streams in.
|
||||
uint32_t new_cap = selection_flags_capacity_;
|
||||
if (new_cap < 64) new_cap = 64;
|
||||
while (new_cap < needed) new_cap *= 2;
|
||||
|
||||
if (!selection_flags_buffer_ || selection_flags_capacity_ < new_cap) {
|
||||
if (selection_flags_buffer_) {
|
||||
wgpuBufferRelease(selection_flags_buffer_);
|
||||
selection_flags_buffer_ = nullptr;
|
||||
}
|
||||
WGPUBufferDescriptor sb = {};
|
||||
sb.size = uint64_t(new_cap) * sizeof(uint32_t);
|
||||
sb.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst;
|
||||
sb.label = svFromCStr("ifcviewer-wgpu.selection_flags");
|
||||
selection_flags_buffer_ = wgpuDeviceCreateBuffer(device_, &sb);
|
||||
selection_flags_capacity_ = new_cap;
|
||||
// Initialise to zero so any unused range reads as "not selected".
|
||||
// wgpuQueueWriteBuffer with a small zero block is enough; the rest
|
||||
// is created as zero-initialised by wgpu per the spec.
|
||||
}
|
||||
|
||||
// Rebuild the frame bind group against the (possibly new) buffer.
|
||||
if (frame_bind_group_) {
|
||||
wgpuBindGroupRelease(frame_bind_group_);
|
||||
frame_bind_group_ = nullptr;
|
||||
}
|
||||
WGPUBindGroupEntry fbg_entries[2] = {};
|
||||
fbg_entries[0].binding = 0;
|
||||
fbg_entries[0].buffer = frame_uniform_buffer_;
|
||||
fbg_entries[0].offset = 0;
|
||||
fbg_entries[0].size = sizeof(FrameUniforms);
|
||||
fbg_entries[1].binding = 1;
|
||||
fbg_entries[1].buffer = selection_flags_buffer_;
|
||||
fbg_entries[1].size = WGPU_WHOLE_SIZE;
|
||||
WGPUBindGroupDescriptor fbg_desc = {};
|
||||
fbg_desc.layout = frame_bgl_;
|
||||
fbg_desc.entryCount = 1;
|
||||
fbg_desc.entryCount = 2;
|
||||
fbg_desc.entries = fbg_entries;
|
||||
fbg_desc.label = svFromCStr("ifcviewer-wgpu.frame_bind_group");
|
||||
frame_bind_group_ = wgpuDeviceCreateBindGroup(device_, &fbg_desc);
|
||||
|
||||
return true;
|
||||
// Force a re-upload of the flags into the (possibly new) buffer.
|
||||
selection_flags_scratch_.assign(selection_flags_capacity_, 0);
|
||||
selection_.fillFlagsArray(selection_flags_scratch_, selection_flags_capacity_);
|
||||
wgpuQueueWriteBuffer(queue_, selection_flags_buffer_, 0,
|
||||
selection_flags_scratch_.data(),
|
||||
selection_flags_scratch_.size() * sizeof(uint32_t));
|
||||
selection_.markClean();
|
||||
}
|
||||
|
||||
void WgpuViewportWindow::uploadSelectionFlagsIfDirty() {
|
||||
if (!selection_.dirty() || !selection_flags_buffer_) return;
|
||||
selection_flags_scratch_.assign(selection_flags_capacity_, 0);
|
||||
selection_.fillFlagsArray(selection_flags_scratch_, selection_flags_capacity_);
|
||||
wgpuQueueWriteBuffer(queue_, selection_flags_buffer_, 0,
|
||||
selection_flags_scratch_.data(),
|
||||
selection_flags_scratch_.size() * sizeof(uint32_t));
|
||||
selection_.markClean();
|
||||
}
|
||||
|
||||
void WgpuViewportWindow::buildModelBindGroup(WgpuModelGpuData& m) {
|
||||
@@ -2794,19 +2889,34 @@ void WgpuViewportWindow::mousePressEvent(QMouseEvent* event) {
|
||||
|
||||
void WgpuViewportWindow::mouseReleaseEvent(QMouseEvent* event) {
|
||||
if (event->button() == nav_active_button_) {
|
||||
// LMB-click without drag → pick the object under the cursor.
|
||||
// LMB-click without drag → pick the object under the cursor and
|
||||
// route through the selection state. Shift = add, Ctrl = remove,
|
||||
// no modifier = replace. Empty-space click clears.
|
||||
if (event->button() == Qt::LeftButton && !nav_dragged_) {
|
||||
const QPoint pos = event->position().toPoint();
|
||||
const int px = int(pos.x() * devicePixelRatio());
|
||||
const int py = int(pos.y() * devicePixelRatio());
|
||||
const uint32_t id = pickObjectAt(px, py);
|
||||
if (id != 0) {
|
||||
qInfo().noquote().nospace()
|
||||
<< "[wgpu pick] object_id=" << id << " at (" << pos.x()
|
||||
<< ", " << pos.y() << ")";
|
||||
} else {
|
||||
const auto mods = event->modifiers();
|
||||
if (id == 0) {
|
||||
if (!(mods & (Qt::ShiftModifier | Qt::ControlModifier))) {
|
||||
selection_.clear();
|
||||
}
|
||||
qInfo().noquote() << "[wgpu pick] miss";
|
||||
} else if (mods & Qt::ControlModifier) {
|
||||
selection_.remove(id);
|
||||
qInfo().noquote().nospace()
|
||||
<< "[wgpu pick] -remove object_id=" << id;
|
||||
} else if (mods & Qt::ShiftModifier) {
|
||||
selection_.add(id);
|
||||
qInfo().noquote().nospace()
|
||||
<< "[wgpu pick] +add object_id=" << id;
|
||||
} else {
|
||||
selection_.replace(id);
|
||||
qInfo().noquote().nospace()
|
||||
<< "[wgpu pick] replace object_id=" << id;
|
||||
}
|
||||
requestUpdate();
|
||||
}
|
||||
nav_active_button_ = Qt::NoButton;
|
||||
}
|
||||
@@ -2882,8 +2992,10 @@ void WgpuViewportWindow::shutdown() {
|
||||
releaseEdgeResources();
|
||||
releasePickResources();
|
||||
|
||||
if (frame_bind_group_) { wgpuBindGroupRelease(frame_bind_group_); frame_bind_group_ = nullptr; }
|
||||
if (frame_uniform_buffer_) { wgpuBufferRelease(frame_uniform_buffer_); frame_uniform_buffer_ = nullptr; }
|
||||
if (frame_bind_group_) { wgpuBindGroupRelease(frame_bind_group_); frame_bind_group_ = nullptr; }
|
||||
if (frame_uniform_buffer_) { wgpuBufferRelease(frame_uniform_buffer_); frame_uniform_buffer_ = nullptr; }
|
||||
if (selection_flags_buffer_) { wgpuBufferRelease(selection_flags_buffer_); selection_flags_buffer_ = nullptr; }
|
||||
selection_flags_capacity_ = 0;
|
||||
if (main_pipeline_) { wgpuRenderPipelineRelease(main_pipeline_); main_pipeline_ = nullptr; }
|
||||
if (main_shader_module_) { wgpuShaderModuleRelease(main_shader_module_); main_shader_module_ = nullptr; }
|
||||
if (pipeline_layout_) { wgpuPipelineLayoutRelease(pipeline_layout_); pipeline_layout_ = nullptr; }
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include "SidecarCache.h"
|
||||
#include "WgpuModelGpuData.h"
|
||||
#include "WgpuSelectionState.h"
|
||||
|
||||
// Stage-2 wgpu viewport: opens a native QWindow, brings up a wgpu instance/
|
||||
// adapter/device, configures a surface against the platform-native window
|
||||
@@ -126,6 +127,14 @@ private:
|
||||
void releaseEdgeResources();
|
||||
|
||||
bool buildPickPipeline();
|
||||
|
||||
// Make sure selection_flags_buffer_ is large enough to address every
|
||||
// object_id in next_object_id_. Recreates (and rebuilds frame_bind_group_)
|
||||
// if it grew. Safe to call every frame; idempotent when already sized.
|
||||
void ensureSelectionFlagsBuffer();
|
||||
// Repack the CPU selection into bit-flags and wgpuQueueWriteBuffer to
|
||||
// the GPU. Called from render() when selection_.dirty().
|
||||
void uploadSelectionFlagsIfDirty();
|
||||
void ensurePickAttachments(int w, int h);
|
||||
void releasePickResources();
|
||||
// Synchronous pick: encodes a one-shot R32UInt render of the current
|
||||
@@ -214,6 +223,15 @@ private:
|
||||
WGPUBuffer frame_uniform_buffer_ = nullptr;
|
||||
WGPUBindGroup frame_bind_group_ = nullptr;
|
||||
|
||||
// Selection flags storage buffer at group=0 binding=1. u32-per-object_id,
|
||||
// bit 0 = selected, bit 1 = active. Sized to next_object_id_ rounded up;
|
||||
// grows when a load pushes past the current capacity. Bound in the
|
||||
// frame bind group because object_ids are globally unique across models.
|
||||
WGPUBuffer selection_flags_buffer_ = nullptr;
|
||||
uint32_t selection_flags_capacity_ = 0; // number of u32 entries
|
||||
WgpuSelectionState selection_;
|
||||
std::vector<uint32_t> selection_flags_scratch_;
|
||||
|
||||
// Depth attachment (4× MSAA), recreated on surface resize.
|
||||
WGPUTexture depth_texture_ = nullptr;
|
||||
WGPUTextureView depth_view_ = nullptr;
|
||||
@@ -334,7 +352,11 @@ private:
|
||||
|
||||
// Per-model state, keyed by viewport-assigned model_id.
|
||||
std::unordered_map<uint32_t, WgpuModelGpuData> models_gpu_;
|
||||
uint32_t next_model_id_ = 1;
|
||||
uint32_t next_model_id_ = 1;
|
||||
// Globally-unique object_id allocator. Each applyCachedModel rebases
|
||||
// the sidecar's local object_ids by base_object_id_so_far so picks
|
||||
// are unambiguous across models. Selection flags index this range.
|
||||
uint32_t next_object_id_ = 1;
|
||||
|
||||
// Sidecar paths queued before init completes.
|
||||
std::deque<QString> pending_sidecars_;
|
||||
|
||||
Reference in New Issue
Block a user