integrate game1 and game2

This commit is contained in:
2025-11-05 09:43:12 +02:00
parent 4236927537
commit 4b722750c3
12 changed files with 354 additions and 278 deletions
+4 -10
View File
@@ -102,13 +102,7 @@ export default {
})
for (let i of scene.data.items || []) {
if (i.data.io){
if (i.data.io.go){
promises.push(this.$api.gameObject.load(i.data.io.go).then(r=>i.data.io.$go = r.data));
}
}else{
promises.push(this.$api.gameObject.load(i.data.go).then(r=>i.data.$go = r.data));
}
promises.push(this.$api.gameObject.load(i.data.go).then(r=>i.data.$go = r.data));
}
await Promise.all(promises);
},
@@ -128,10 +122,10 @@ export default {
target.objects = target.objects || {};
let l = target.objects;
if (this.scene.data.$environment){
await gameEngine.loadPanorama(`/asset/default/${this.scene.data.$environment.asset.name}`);
await gameEngine.loadPanorama(this.scene.data.$environment.asset.name);
}
if (this.scene.data.$scene){
let env = await gameEngine.load(`/asset/default/${this.scene.data.$scene.asset.name}`);
let env = await gameEngine.load(this.scene.data.$scene.asset.name);
//console.log('ENV', env)
this.setObjectAttributes(l, this.scene.data, env.scene, env, 100);
gameEngine.activeObjects.add(env.scene);
@@ -193,7 +187,7 @@ export default {
['position', 'scale', 'rotation'].forEach(p=>{
object[p].copy(l[data.id][p])
})
}else{
}else if (!data.type || data.type == 'GenericObject'){
gameEngine.autoScale(object, autoScaleFactor);
}
l[data.id] = l[data.id] || {};