Browse Source

fix: 添加b3dm文件格式

bill 2 years ago
parent
commit
312c0e977d
2 changed files with 12 additions and 5 deletions
  1. 6 4
      src/api/model.ts
  2. 6 1
      src/sdk/association.ts

+ 6 - 4
src/api/model.ts

@@ -12,6 +12,7 @@ export enum ModelType {
   SWKJ = 'swkj',
   SWMX = 'glb',
   SWSS = 'laser',
+  OSGB = 'obsg'
 }
 
 export const ModelTypeDesc: Record<ModelType, string>  = {
@@ -19,6 +20,7 @@ export const ModelTypeDesc: Record<ModelType, string>  = {
   [ModelType.SWKJ]: '四维看见',
   [ModelType.SWSS]: '四维深时',
   [ModelType.SWMX]: '三维模型',
+  [ModelType.OSGB]: 'osgb模型'
 }
 
 export interface ModelAttrs {
@@ -44,7 +46,7 @@ interface ServiceModel {
   id: number,
   hide: number,
   modelDateType: string
-  modelGlbUrl: string
+  modelUrl: string
   fusionId?: number,
   modelSize: number
   modelTitle: string
@@ -66,10 +68,10 @@ const serviceToLocal = (serviceModel: ServiceModel): Model => ({
   position: serviceModel.transform.position,
   rotation: serviceModel.transform.rotation,
   id: serviceModel.id.toString(),
-  url: serviceModel.modelGlbUrl,
+  url: serviceModel.modelUrl,
   title: serviceModel.modelTitle,
   fusionId: serviceModel.fusionId,
-  type:  serviceModel.type === 2 ? ModelType.SWSS : ModelType.SWMX,
+  type:  serviceModel.modelDateType === 'osgb' ? ModelType.OSGB : serviceModel.type === 2 ? ModelType.SWMX : ModelType.SWMX,
   size: serviceModel.modelSize,
   time: serviceModel.createTime
 })
@@ -80,7 +82,7 @@ const localToService = (model: Model): ServiceModel => ({
   hide: Number(!model.show),
   fusionId: model.fusionId,
   modelDateType: model.type,
-  modelGlbUrl: model.url,
+  modelUrl: model.url,
   type: model.type === ModelType.SWSS ? 2 : 3,
   modelSize: model.size,
   modelTitle: model.title,

+ 6 - 1
src/sdk/association.ts

@@ -36,10 +36,15 @@ const associationModels = (sdk: SDK) => {
       }
 
       const itemRaw = toRaw(item)
+      console.log('加载模型', {
+        ...itemRaw,
+        ...modelRange,
+        url: getResource(item.url)
+      })
       const sceneModel = sdk.addModel({
         ...itemRaw,
         ...modelRange,
-        type: ModelType.SWMX,
+        // type: ModelType.SWMX,
         url: getResource(item.url)
       })
       sceneModelMap.set(itemRaw, sceneModel)