small fixes
This commit is contained in:
@@ -72,6 +72,7 @@ export default{
|
|||||||
async loadAsset() {
|
async loadAsset() {
|
||||||
if (this.forRendering) {
|
if (this.forRendering) {
|
||||||
engine.resetScene();
|
engine.resetScene();
|
||||||
|
engine.ambientLight.intensity = 25;
|
||||||
if (this.obj.type == 'panorama2d') {
|
if (this.obj.type == 'panorama2d') {
|
||||||
await engine.loadPanorama(this.obj.asset.name);
|
await engine.loadPanorama(this.obj.asset.name);
|
||||||
// let t = await engine.loadTexture(`/asset/default/${this.obj.asset.name}`);
|
// let t = await engine.loadTexture(`/asset/default/${this.obj.asset.name}`);
|
||||||
@@ -89,7 +90,7 @@ export default{
|
|||||||
autoScale(gltf.scene);
|
autoScale(gltf.scene);
|
||||||
let bb = new engine.$.Box3().setFromObject(gltf.scene);
|
let bb = new engine.$.Box3().setFromObject(gltf.scene);
|
||||||
//console.log(bb)
|
//console.log(bb)
|
||||||
engine.camera.position.set(bb.max.x, bb.max.y, bb.max.z);
|
engine.camera.position.set(bb.max.x, bb.max.y, bb.max.z*3);
|
||||||
engine.orbitControls.target.set((bb.max.x + bb.min.x) / 2, (bb.max.y + bb.min.y) / 2, (bb.max.z + bb.min.z) / 2)
|
engine.orbitControls.target.set((bb.max.x + bb.min.x) / 2, (bb.max.y + bb.min.y) / 2, (bb.max.z + bb.min.z) / 2)
|
||||||
engine.orbitControls.update();
|
engine.orbitControls.update();
|
||||||
engine.activeObjects.add(gltf.scene);
|
engine.activeObjects.add(gltf.scene);
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
@mouseup="targetPointer($event, 'end')" ></div>
|
@mouseup="targetPointer($event, 'end')" ></div>
|
||||||
</div>
|
</div>
|
||||||
<v-navigation-drawer width="133" rail location="right" class="mt-3">
|
<v-navigation-drawer width="133" rail location="right" class="mt-3">
|
||||||
<v-menu>
|
<v-menu open-on-hover>
|
||||||
<template v-slot:activator="{ props }">
|
<template v-slot:activator="{ props }">
|
||||||
<v-btn icon="mdi-panorama-outline" color="primary" v-bind="props" v-tooltip="'Select scene'"></v-btn>
|
<v-btn icon="mdi-panorama-outline" color="primary" v-bind="props"></v-btn>
|
||||||
</template>
|
</template>
|
||||||
<v-list selectable color="primary" @update:selected="loadScene($event[0])" :items="scenes"></v-list>
|
<v-list selectable color="primary" @update:selected="loadScene($event[0])" :items="scenes"></v-list>
|
||||||
</v-menu>
|
</v-menu>
|
||||||
@@ -63,6 +63,7 @@ export default {
|
|||||||
|
|
||||||
methods:{
|
methods:{
|
||||||
loadScene(sceneId){
|
loadScene(sceneId){
|
||||||
|
this.debug('Loading scene', sceneId)
|
||||||
manager.loadScene(sceneId)
|
manager.loadScene(sceneId)
|
||||||
},
|
},
|
||||||
targetClick(e){
|
targetClick(e){
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import { clearObject } from './MeshUtils.js';
|
|||||||
THREE.Cache.enabled = true
|
THREE.Cache.enabled = true
|
||||||
|
|
||||||
const assetPath = '/asset/default/';
|
const assetPath = '/asset/default/';
|
||||||
const defaultLightIntensity = 22;
|
const defaultLightIntensity = 11;
|
||||||
|
|
||||||
class GameEngine extends EventManager{
|
class GameEngine extends EventManager{
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ class GameManager{
|
|||||||
|
|
||||||
this.loadScene = async function(sceneId){
|
this.loadScene = async function(sceneId){
|
||||||
let scene = scenarioData.scenes.find(sc=>sc.data.id == sceneId);
|
let scene = scenarioData.scenes.find(sc=>sc.data.id == sceneId);
|
||||||
let sceneObjects = gameData.scenes[sceneId].objects || {};
|
let sceneObjects = gameData.scenes?.[sceneId]?.objects || {};
|
||||||
engine.tm?.setGame(gameData.id);
|
engine.tm?.setGame(gameData.id);
|
||||||
let intro;
|
let intro;
|
||||||
await engine.resetScene();
|
await engine.resetScene();
|
||||||
|
|||||||
Reference in New Issue
Block a user