diff --git a/index.html b/index.html index 5860039..468c412 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 0000000..ab0871d --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/api/flow-canvas.ts b/src/api/flow-canvas.ts index 13ce0fe..069b0e4 100644 --- a/src/api/flow-canvas.ts +++ b/src/api/flow-canvas.ts @@ -205,11 +205,13 @@ export const sketchAddPrintApi = (data:sketchAddPrintData) => { * @param data 图片转3d的参数 * @param data.sketchId sketch id * @param data.imageUrls 进行生成的图片。minio地址和正常地址都可以 + * @param data.mode 选择的模型 * @returns 图片转3d */ export interface sketchToThreeData { sketchId?: string imageUrls?: Array + mode?: string } export const sketchToThreeApi = (data:sketchToThreeData) => { return request({ @@ -218,6 +220,7 @@ export const sketchToThreeApi = (data:sketchToThreeData) => { data:{ sketchId: data.sketchId, imageUrls: data.imageUrls, + mode: data.mode, } }) } diff --git a/src/assets/icons/captureView.svg b/src/assets/icons/captureView.svg new file mode 100644 index 0000000..6a519d3 --- /dev/null +++ b/src/assets/icons/captureView.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/three/hdri.hdr b/src/assets/images/three/hdri.hdr index 4a4a4dd..1a71215 100644 Binary files a/src/assets/images/three/hdri.hdr and b/src/assets/images/three/hdri.hdr differ diff --git a/src/assets/images/three/sample.glb b/src/assets/images/three/sample.glb index f6c551f..fa9cbb2 100644 Binary files a/src/assets/images/three/sample.glb and b/src/assets/images/three/sample.glb differ diff --git a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts index db02e9e..fcfca62 100644 --- a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts +++ b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts @@ -279,7 +279,7 @@ export class LayerManager { }) this.setLayerPosition(rectObject, options) await this.canvasManager.add(rectObject, isRecord) - if (isActive) this.setActiveID(rectObject.info.id) + if (isActive) this.setActiveID(rectObject.info.id, false) return rectObject } /** 创建直线图层 */ @@ -303,7 +303,7 @@ export class LayerManager { }); this.setLayerPosition(arrowObject, options) await this.canvasManager.add(arrowObject, isRecord) - if (isActive) this.setActiveID(arrowObject.info.id) + if (isActive) this.setActiveID(arrowObject.info.id, false) return arrowObject } /** 创建椭圆图层 */ @@ -320,7 +320,7 @@ export class LayerManager { }) this.setLayerPosition(ellipseObject, options) await this.canvasManager.add(ellipseObject) - if (isActive) this.setActiveID(ellipseObject.info.id) + if (isActive) this.setActiveID(ellipseObject.info.id, false) return ellipseObject } /** 创建三角形图层 */ @@ -339,7 +339,7 @@ export class LayerManager { }) this.setLayerPosition(triangleObject, options) await this.canvasManager.add(triangleObject, isRecord) - if (isActive) this.setActiveID(triangleObject.info.id) + if (isActive) this.setActiveID(triangleObject.info.id, false) return triangleObject } /** 创建五角星图层 */ @@ -360,7 +360,7 @@ export class LayerManager { }) this.setLayerPosition(starObject, options) await this.canvasManager.add(starObject, isRecord) - if (isActive) this.setActiveID(starObject.info.id) + if (isActive) this.setActiveID(starObject.info.id, false) return starObject } /** 创建箭头图层 */ @@ -384,7 +384,7 @@ export class LayerManager { }); this.setLayerPosition(arrowObject, options) await this.canvasManager.add(arrowObject, isRecord) - if (isActive) this.setActiveID(arrowObject.info.id) + if (isActive) this.setActiveID(arrowObject.info.id, false) return arrowObject } diff --git a/src/components/Canvas/DepthCanvas/manager/ObjectManager.ts b/src/components/Canvas/DepthCanvas/manager/ObjectManager.ts index 8266181..c9f5160 100644 --- a/src/components/Canvas/DepthCanvas/manager/ObjectManager.ts +++ b/src/components/Canvas/DepthCanvas/manager/ObjectManager.ts @@ -217,11 +217,12 @@ export class ObjectManager { const object = this.canvasManager.getObjectById(id) if (!object) return null const type = object.type - const isWidth = object.hasOwnProperty('width') - const isHeight = object.hasOwnProperty('height') + const isWidth = options.hasOwnProperty('width') + const isHeight = options.hasOwnProperty('height') if (isWidth || isHeight) { const width = isWidth ? options.width : object.width const height = isHeight ? options.height : object.height + console.log(width, height) if (type === "polygon") { if (object.points.length === 10) {// 五角星 options.points = getStarArr(width, height) diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue index e64bc60..6c23925 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue @@ -176,6 +176,7 @@ ] let tier = (tritList.includes(currentComponent.value.tier) && typeList.includes(currentComponent.value.type))?currentComponent.value.tier - 1:currentComponent.value.tier if(NODE_DATATYPE.TO_REAL_STYLE == currentComponent.value.type && false){ + //一个结果节点里面多个子节点 let imageProcessTasks = taskList nodeManager.createResultNode({ data: { diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue index af223a2..f55f059 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue @@ -5,20 +5,28 @@
+

Mode

+