|
@@ -73,13 +73,20 @@ const associationModels = (sdk: SDK) => {
|
|
|
}
|
|
|
|
|
|
const itemRaw = toRaw(item)
|
|
|
+ let sceneModel: SceneModel
|
|
|
console.error('loaded', itemRaw)
|
|
|
- const sceneModel = sdk.addModel({
|
|
|
- ...itemRaw,
|
|
|
- ...modelRange,
|
|
|
- type: item.type === SceneType.SWSS ? 'laser' : item.modelType,
|
|
|
- url: item.type === SceneType.SWSS ? item.url : getResource(item.url)
|
|
|
- })
|
|
|
+ try {
|
|
|
+ sceneModel = sdk.addModel({
|
|
|
+ ...itemRaw,
|
|
|
+ ...modelRange,
|
|
|
+ type: item.type === SceneType.SWSS ? 'laser' : item.modelType,
|
|
|
+ url: item.type === SceneType.SWSS ? item.url : getResource(item.url)
|
|
|
+ })
|
|
|
+ } catch(e) {
|
|
|
+ console.error('模型加载失败', e)
|
|
|
+ item.error = true
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
sceneModelMap.set(itemRaw, sceneModel)
|
|
|
|
|
@@ -103,9 +110,10 @@ const associationModels = (sdk: SDK) => {
|
|
|
z: round(transform.position.z, 5),
|
|
|
}
|
|
|
}
|
|
|
- if (transform.bottom) {
|
|
|
- transform.bottom = round(transform.bottom, 2)
|
|
|
- }
|
|
|
+ delete transform.bottom
|
|
|
+ // if (transform.bottom) {
|
|
|
+ // transform.bottom = round(transform.bottom, 2)
|
|
|
+ // }
|
|
|
if (transform.scale) {
|
|
|
transform.scale = round(transform.scale, 2)
|
|
|
}
|
|
@@ -117,8 +125,6 @@ const associationModels = (sdk: SDK) => {
|
|
|
}
|
|
|
|
|
|
if (deepIsRevise(update, transform)) {
|
|
|
-
|
|
|
- console.error(update, transform)
|
|
|
unSet(() => Object.assign(item, transform))
|
|
|
}
|
|
|
}, 16)
|
|
@@ -139,6 +145,7 @@ const associationModels = (sdk: SDK) => {
|
|
|
sceneModel.bus.on('loadError', () => {
|
|
|
item.error = true
|
|
|
item.show = false
|
|
|
+
|
|
|
custom.showModelsMap.delete(item)
|
|
|
hideLoad()
|
|
|
})
|
|
@@ -175,7 +182,6 @@ const associationModels = (sdk: SDK) => {
|
|
|
() => item.position,
|
|
|
() => {
|
|
|
if (!isUnSet) {
|
|
|
- console.log('set position', item.position)
|
|
|
getSceneModel(item)?.changePosition(item.position)
|
|
|
}
|
|
|
},
|
|
@@ -185,7 +191,6 @@ const associationModels = (sdk: SDK) => {
|
|
|
() => item.rotation,
|
|
|
() => {
|
|
|
if (!isUnSet) {
|
|
|
- console.log('set rotation', item.rotation)
|
|
|
getSceneModel(item)?.changeRotation(item.rotation)
|
|
|
}
|
|
|
},
|
|
@@ -193,7 +198,13 @@ const associationModels = (sdk: SDK) => {
|
|
|
)
|
|
|
watch(
|
|
|
() => modelShow.value,
|
|
|
- () => isUnSet || getSceneModel(item)?.changeShow(modelShow.value),
|
|
|
+ () => {
|
|
|
+ const sceneModel = getSceneModel(item)
|
|
|
+ if (!isUnSet && sceneModel) {
|
|
|
+ sceneModel.changeSelect(false)
|
|
|
+ sceneModel.changeShow(modelShow.value)
|
|
|
+ }
|
|
|
+ },
|
|
|
{ immediate: true }
|
|
|
)
|
|
|
|