diff --git a/src/designer/Viewport.ts b/src/designer/Viewport.ts index 3bb69c2..fbecc70 100644 --- a/src/designer/Viewport.ts +++ b/src/designer/Viewport.ts @@ -4,7 +4,7 @@ import { AxesHelper, GridHelper, OrthographicCamera, Raycaster, Scene, Vector3, import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls' import EsDragControls from './model2DEditor/EsDragControls' import Stats from 'three/examples/jsm/libs/stats.module' -import type WorldModel from '@/designer/WorldModel.ts' +import type WorldModel from '@/model/WorldModel.ts' import $ from 'jquery' import { reactive, watch } from 'vue' import MouseMoveInspect from '@/designer/model2DEditor/tools/MouseMoveInspect.ts' diff --git a/src/designer/WorldModel.ts b/src/model/WorldModel.ts similarity index 100% rename from src/designer/WorldModel.ts rename to src/model/WorldModel.ts diff --git a/src/designer/example1.js b/src/model/example1.js similarity index 68% rename from src/designer/example1.js rename to src/model/example1.js index b7ac2da..77c3e94 100644 --- a/src/designer/example1.js +++ b/src/model/example1.js @@ -15,8 +15,33 @@ export default { }, item: [ { - name: 'f1', - items: [] + name: 'f1', type: 'floor', uuid: 'f1', + items: [ + { + uuid: 'measure-group', type: 'group', items: [ + { + uuid: 'p1', + type: 'measure', + category: 'line', + pos: [], + rotation: [0, 0, 0], + scale: [1, 1, 1], + link: ['p2'] + }, + { + uuid: 'p2', + type: 'measure', + category: 'line', + pos: [], + rotation: [0, 0, 0], + scale: [1, 1, 1], + link: ['p3'] + }, + { uuid: 'p3', type: 'measure', category: 'line', pos: [], rotation: [0, 0, 0], scale: [1, 1, 1], link: [] } + ] + } + + ] } ], elevator: [], diff --git a/src/modelItem/line/LineMeta.ts b/src/model/itemTypeDefine/line/LineMeta.ts similarity index 100% rename from src/modelItem/line/LineMeta.ts rename to src/model/itemTypeDefine/line/LineMeta.ts diff --git a/src/model/itemTypeDefine/measure/MeasureMeta.ts b/src/model/itemTypeDefine/measure/MeasureMeta.ts new file mode 100644 index 0000000..195915c --- /dev/null +++ b/src/model/itemTypeDefine/measure/MeasureMeta.ts @@ -0,0 +1,7 @@ +import { defineItemType } from '@/runtime/DefineItem.ts' + +export default defineItemType({ + name: 'measure', + label: '测量工具', + category: 'line' +}) \ No newline at end of file diff --git a/src/modelItem/point/PointMeta.ts b/src/model/itemTypeDefine/point/PointMeta.ts similarity index 100% rename from src/modelItem/point/PointMeta.ts rename to src/model/itemTypeDefine/point/PointMeta.ts diff --git a/src/modelItem/store/QueueMeta.ts b/src/model/itemTypeDefine/store/QueueMeta.ts similarity index 100% rename from src/modelItem/store/QueueMeta.ts rename to src/model/itemTypeDefine/store/QueueMeta.ts diff --git a/src/runtime/DefineItem.ts b/src/runtime/DefineItem.ts index cfc9ab6..56de6bb 100644 --- a/src/runtime/DefineItem.ts +++ b/src/runtime/DefineItem.ts @@ -1,7 +1,7 @@ /** * 定义一个 物流单元 */ -export class ItemDefine { +export class ItemTypeDefine { option!: ItemOption constructor(option: ItemOption) { @@ -20,9 +20,9 @@ export interface ItemOption { /** * 定义一个 物流单元 */ -export function defineItem(option: ItemOption): Promise { +export function defineItemType(option: ItemOption): Promise { return new Promise((resolve, reject) => { - const item = new ItemDefine(option) + const item = new ItemTypeDefine(option) resolve(item) }) } \ No newline at end of file diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 7dac369..092c219 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -1,7 +1,7 @@ import _ from 'lodash' import $ from 'jquery' import type System from '@/runtime/System' -import type WorldModel from '@/designer/WorldModel' +import type WorldModel from '@/model/WorldModel' declare global { const $: $ diff --git a/src/views/ModelMainInit.ts b/src/views/ModelMainInit.ts index d996274..15e00f7 100644 --- a/src/views/ModelMainInit.ts +++ b/src/views/ModelMainInit.ts @@ -15,7 +15,7 @@ import ToolsMenu from '@/designer/menus/Tools.ts' import Model3DView from '@/designer/menus/Model3DView.ts' import { forEachMenu } from '@/runtime/DefineMenu.ts' import { normalizeShortKey } from '@/utils/webutils.ts' -import WorldModel from '@/designer/WorldModel.ts' +import WorldModel from '@/model/WorldModel.ts' /** * 初始化模型编辑器的基础控件