|
|
@ -12,6 +12,7 @@ import { |
|
|
|
HemisphericLight, |
|
|
|
HemisphericLight, |
|
|
|
HighlightLayer, |
|
|
|
HighlightLayer, |
|
|
|
IParticleSystem, |
|
|
|
IParticleSystem, |
|
|
|
|
|
|
|
ISceneLoaderProgressEvent, |
|
|
|
Mesh, |
|
|
|
Mesh, |
|
|
|
MeshBuilder, |
|
|
|
MeshBuilder, |
|
|
|
Observable, |
|
|
|
Observable, |
|
|
@ -46,18 +47,18 @@ import { ModelInfo_mark } from '../model/info/mark/model-info-mark'; |
|
|
|
import { MarkData, MarkType } from '../model/data/mark/mark-data'; |
|
|
|
import { MarkData, MarkType } from '../model/data/mark/mark-data'; |
|
|
|
import { Event_KeyboardInput } from './event-manager/events/event-keyboard-input'; |
|
|
|
import { Event_KeyboardInput } from './event-manager/events/event-keyboard-input'; |
|
|
|
import { ModelInfo_mark_area } from '../model/info/mark/other/mark-plan-area-info'; |
|
|
|
import { ModelInfo_mark_area } from '../model/info/mark/other/mark-plan-area-info'; |
|
|
|
import { classToClass, plainToClass } from 'class-transformer'; |
|
|
|
import { plainToClass } from 'class-transformer'; |
|
|
|
import { MarkData_Area } from '../model/data/mark/other/mark-data-area'; |
|
|
|
import { MarkData_Area } from '../model/data/mark/other/mark-data-area'; |
|
|
|
import { MarkData_Line } from '../model/data/mark/other/mark-data-line'; |
|
|
|
import { MarkData_Line } from '../model/data/mark/other/mark-data-line'; |
|
|
|
import { ModelInfo_mark_line } from '../model/info/mark/other/mark-plan-line-info'; |
|
|
|
import { ModelInfo_mark_line } from '../model/info/mark/other/mark-plan-line-info'; |
|
|
|
import { MarkData_multiLine } from '../model/data/mark/other/mark-data-multi-line'; |
|
|
|
|
|
|
|
import { ModelInfo_mark_multiLine } from '../model/info/mark/other/mark-plan-multi-line-info'; |
|
|
|
|
|
|
|
import { MarkData_multiArrow_CT, MarkData_multiArrow_JG } from '../model/data/mark/other/mark-data-multi-arrow'; |
|
|
|
import { MarkData_multiArrow_CT, MarkData_multiArrow_JG } from '../model/data/mark/other/mark-data-multi-arrow'; |
|
|
|
import { ModelInfo_mark_multiArrow } from '../model/info/mark/other/mark-plan-multi-arrow'; |
|
|
|
import { ModelInfo_mark_multiArrow } from '../model/info/mark/other/mark-plan-multi-arrow'; |
|
|
|
import { ModelInfo_mark_particle } from '../model/info/mark/other/mark-plan-particle-info'; |
|
|
|
import { ModelInfo_mark_particle } from '../model/info/mark/other/mark-plan-particle-info'; |
|
|
|
import { FacilityPosType, ModelData_facility } from '../model/data/model-data/model-data-facility'; |
|
|
|
import { FacilityPosType, ModelData_facility } from '../model/data/model-data/model-data-facility'; |
|
|
|
import { LoadTool } from '../tool/load-tool'; |
|
|
|
import { LoadTool } from '../tool/load-tool'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//场景管理器
|
|
|
|
//场景管理器
|
|
|
|
export class SceneManager { |
|
|
|
export class SceneManager { |
|
|
|
//----------------Camera-----------------\\
|
|
|
|
//----------------Camera-----------------\\
|
|
|
@ -595,7 +596,11 @@ export class SceneManager { |
|
|
|
let box = SceneManager.importMeshSuccess(newMeshes, particleSystems, skeletons, animationGroups, modelInfo, needBox, modelData); |
|
|
|
let box = SceneManager.importMeshSuccess(newMeshes, particleSystems, skeletons, animationGroups, modelInfo, needBox, modelData); |
|
|
|
//console.log("加载模型完成", modelData.resName);
|
|
|
|
//console.log("加载模型完成", modelData.resName);
|
|
|
|
onSuccess(newMeshes, box, modelInfo); |
|
|
|
onSuccess(newMeshes, box, modelInfo); |
|
|
|
}, null, |
|
|
|
}, function (event: ISceneLoaderProgressEvent) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//console.log(modelData.resName + "加载中", event, new Date().getTime());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
function (scene: Scene, message: string, exception?: any) { |
|
|
|
function (scene: Scene, message: string, exception?: any) { |
|
|
|
|
|
|
|
|
|
|
|
if (index < 5) { |
|
|
|
if (index < 5) { |
|
|
@ -930,6 +935,8 @@ class ImportMeshSyncData { |
|
|
|
|
|
|
|
|
|
|
|
onsuccessObservable: Observable<ImportMeshSyncCallBack>; |
|
|
|
onsuccessObservable: Observable<ImportMeshSyncCallBack>; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
constructor(path: string, |
|
|
|
constructor(path: string, |
|
|
|
name: string) { |
|
|
|
name: string) { |
|
|
|
this.isBreak = false; |
|
|
|
this.isBreak = false; |
|
|
@ -938,8 +945,13 @@ class ImportMeshSyncData { |
|
|
|
this.onsuccessObservable = new Observable(); |
|
|
|
this.onsuccessObservable = new Observable(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 异步导入模型的回调 |
|
|
|
* 异步导入模型的回调 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|