h3n3/yet-another-cad-viewer
1
0
Fork 0
mirror of https://github.com/yeicor-3d/yet-another-cad-viewer.git synced 2025-12-19 22:24:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

better selection persistence

Browse Source
This commit is contained in:
Yeicor
2024-02-18 19:51:46 +01:00
parent 76a636f400
commit 9d429de804
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/tools/Tools.vue
View File

@@ -53,6 +53,7 @@ function centerCamera() {
let selectionEnabled = ref(false); let selectionEnabled = ref(false);
let selectedMaterials: Array<Material> = [] let selectedMaterials: Array<Material> = []
let hasListener = false; let hasListener = false;
let selectionListener = (event: MouseEvent) => { let selectionListener = (event: MouseEvent) => {
if (!selectionEnabled.value) return; if (!selectionEnabled.value) return;
let viewer: ModelViewerElement = props.refSData.viewer; let viewer: ModelViewerElement = props.refSData.viewer;
@@ -60,15 +61,23 @@ let selectionListener = (event: MouseEvent) => {
if (material === null) return; if (material === null) return;
const wasSelected = selectedMaterials.find((m) => m === material) !== undefined; const wasSelected = selectedMaterials.find((m) => m === material) !== undefined;
if (wasSelected) { if (wasSelected) {
selectedMaterials = selectedMaterials.filter((m) => m !== material); deselect(material)
material.pbrMetallicRoughness.setBaseColorFactor(
(material as any).__prevBaseColorFactor);
} else { } else {
selectedMaterials.push(material); select(material)
}
};
function select(material: Material) {
if(selectedMaterials.find((m) => m === material) === undefined) selectedMaterials.push(material);
(material as any).__prevBaseColorFactor = [...material.pbrMetallicRoughness.baseColorFactor]; (material as any).__prevBaseColorFactor = [...material.pbrMetallicRoughness.baseColorFactor];
material.pbrMetallicRoughness.setBaseColorFactor([1, 0, 0, 1] as RGBA); material.pbrMetallicRoughness.setBaseColorFactor([1, 0, 0, 1] as RGBA);
} }
};
function deselect(material: Material, alsoRemove = true) {
if (alsoRemove) selectedMaterials = selectedMaterials.filter((m) => m !== material);
material.pbrMetallicRoughness.setBaseColorFactor(
(material as any).__prevBaseColorFactor);
}
function toggleSelection() { function toggleSelection() {
let viewer: ModelViewerElement = props.refSData.viewer; let viewer: ModelViewerElement = props.refSData.viewer;
@@ -79,11 +88,12 @@ function toggleSelection() {
viewer.addEventListener('click', selectionListener); viewer.addEventListener('click', selectionListener);
hasListener = true; hasListener = true;
} }
for (let material of selectedMaterials) {
select(material);
}
} else { } else {
for (let material of selectedMaterials) { for (let material of selectedMaterials) {
console.log("clearing selection", material); deselect(material, false);
material.pbrMetallicRoughness.setBaseColorFactor(
(material as any).__prevBaseColorFactor);
} }
} }
} }