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

improve build size once more

Browse Source
This commit is contained in:
Yeicor
2024-02-20 23:09:46 +01:00
parent d56c924710
commit cc5b96877a
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/Selection.vue
View File

@@ -3,11 +3,11 @@ import {defineModel, ref} from "vue";
import {VBtn} from "vuetify/lib/components"; import {VBtn} from "vuetify/lib/components";
import SvgIcon from '@jamescoyle/vue-icon'; import SvgIcon from '@jamescoyle/vue-icon';
import type {ModelViewerElement} from '@google/model-viewer'; import type {ModelViewerElement} from '@google/model-viewer';
import type {ModelScene} from "@google/model-viewer/lib/three-components/ModelScene";
import {mdiCursorDefaultClick} from '@mdi/js'; import {mdiCursorDefaultClick} from '@mdi/js';
import {$scene} from "@google/model-viewer/lib/model-viewer-base";
import type {Intersection, Material, Object3D} from "three"; import type {Intersection, Material, Object3D} from "three";
let props = defineProps<{ viewer: ModelViewerElement }>(); let props = defineProps<{ viewer: ModelViewerElement, scene: ModelScene }>();
let selectionEnabled = ref(false); let selectionEnabled = ref(false);
type MObject3D = Object3D & { type MObject3D = Object3D & {
material: Material & { color: { r: number, g: number, b: number }, __prevBaseColorFactor?: [number, number, number] } material: Material & { color: { r: number, g: number, b: number }, __prevBaseColorFactor?: [number, number, number] }
@@ -34,16 +34,14 @@ let selectionListener = (event: MouseEvent) => {
} }
mouseDownAt = undefined; mouseDownAt = undefined;
} }
let viewer: ModelViewerElement = props.viewer; let scene: ModelScene = props.scene;
// FIXME: Clicking near edges does not work...
// FIXME: Clicking with ORTHO camera does not work...
//const material = viewer.materialFromPoint(event.clientX, event.clientY);
// NOTE: Need to access internal as the API has issues with small faces surrounded by edges // NOTE: Need to access internal as the API has issues with small faces surrounded by edges
let scene = viewer[$scene]
const ndcCoords = scene.getNDC(event.clientX, event.clientY); const ndcCoords = scene.getNDC(event.clientX, event.clientY);
const hit = scene.hitFromPoint(ndcCoords) as Intersection<MObject3D> | undefined; const hit = scene.hitFromPoint(ndcCoords) as Intersection<MObject3D> | undefined;
console.log(hit) console.log(hit)
// TODO: Multiple hits to differenciate edges and faces // TODO: Multiple hits to differentiate edges and faces
// TODO: Edge collisions too big?
// FIXME: Clicking with ORTHO camera does not work...
if (!hit) return; if (!hit) return;
const wasSelected = selectedMaterials.value.find((m) => m.object.name === hit.object.name) !== undefined; const wasSelected = selectedMaterials.value.find((m) => m.object.name === hit.object.name) !== undefined;
if (wasSelected) { if (wasSelected) {

2
src/tools/Tools.vue
View File

@@ -72,7 +72,7 @@ async function downloadSceneGlb() {
<v-btn icon="" @click="centerCamera"> <v-btn icon="" @click="centerCamera">
<svg-icon type="mdi" :path="mdiCrosshairsGps"/> <svg-icon type="mdi" :path="mdiCrosshairsGps"/>
</v-btn> </v-btn>
<selection :viewer="props.refSData.viewer"/> <selection :viewer="props.refSData.viewer" :scene="props.refSData.viewerScene"/>
<v-btn icon="" @click="downloadSceneGlb"> <v-btn icon="" @click="downloadSceneGlb">
<svg-icon type="mdi" :path="mdiDownload"/> <svg-icon type="mdi" :path="mdiDownload"/>
</v-btn> </v-btn>