diff --git a/src/assets/images/three/sample.glb b/src/assets/images/three/sample.glb new file mode 100644 index 0000000..a8eae0c Binary files /dev/null and b/src/assets/images/three/sample.glb differ diff --git a/src/components/Canvas/DepthCanvas/depth-canvas.vue b/src/components/Canvas/DepthCanvas/depth-canvas.vue index c4a086f..112f3db 100644 --- a/src/components/Canvas/DepthCanvas/depth-canvas.vue +++ b/src/components/Canvas/DepthCanvas/depth-canvas.vue @@ -106,6 +106,7 @@ isReady.value = true // 准备就绪 }) onBeforeUnmount(() => { + observer.value.disconnect() canvasManager.dispose() stateManager.dispose() layerManager.dispose() diff --git a/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts b/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts index 1838b1d..0b24676 100644 --- a/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts +++ b/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts @@ -153,6 +153,9 @@ export class CanvasManager { getObjectById(id: string) { return this.getObjects().find((item: any) => item?.info?.id === id) } + getActiveObject() { + return this.getObjectById(this.layerManager.activeID.value) + } renderAll() { this.canvas.renderAll() } diff --git a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts index 67f6b39..babacdb 100644 --- a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts +++ b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts @@ -22,6 +22,9 @@ export class LayerManager { this.stateManager.toolManager.setTool(OperationType.SELECT) } } + getActiveLayer() { + return this.getLayerById(this.activeID.value) + } getLayerById(id) { return this.layers.value.find((item: any) => item.info.id === id) } diff --git a/src/components/Canvas/FlowCanvas/components/node.vue b/src/components/Canvas/FlowCanvas/components/node-el.vue similarity index 86% rename from src/components/Canvas/FlowCanvas/components/node.vue rename to src/components/Canvas/FlowCanvas/components/node-el.vue index 6b65ca6..3754d87 100644 --- a/src/components/Canvas/FlowCanvas/components/node.vue +++ b/src/components/Canvas/FlowCanvas/components/node-el.vue @@ -1,5 +1,5 @@