diff --git a/src/components/InteractiveObjects/GenenricObject.js b/src/components/InteractiveObjects/GenenricObject.js index 29c7b5c..767e590 100644 --- a/src/components/InteractiveObjects/GenenricObject.js +++ b/src/components/InteractiveObjects/GenenricObject.js @@ -27,7 +27,9 @@ class GenericObject{ z: scale*this.object.scale.z } } - await engine.dashboard.attach(this.object, placement, true, true); + await engine.dashboard.attach(this.object, { + placement, rotate: true, plane: true + }); } } if (data.description){ diff --git a/src/components/InteractiveObjects/InteractiveObject.js b/src/components/InteractiveObjects/InteractiveObject.js index 5dd0d60..7218a0d 100644 --- a/src/components/InteractiveObjects/InteractiveObject.js +++ b/src/components/InteractiveObjects/InteractiveObject.js @@ -16,8 +16,9 @@ import { Particles } from "./Particles"; import { assignMaterial, assignParams } from "@/lib/MeshUtils"; const InteractiveObjectsImports = { - PuzzleGame1, PuzzleGame2, PuzzleGame4, - GenericObject, CharacterObject, MazeQuizGame, Particles }; + PuzzleGame1, PuzzleGame2, PuzzleGame4, VideoPlayer, + GenericObject, CharacterObject, MazeQuizGame, Particles +}; class InteractiveObject { constructor(gameEngine, obj) { @@ -77,9 +78,6 @@ class InteractiveObject { this.object.game = game; break; case 'VideoPlayer': - this.source = await new VideoPlayer(gameEngine, obj.$go.asset.name, gameEngine.assetPath); - this.object = this.source.object; - break; case 'PuzzleGame1': case 'PuzzleGame2': case 'MazeQuizGame': diff --git a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js index b501762..311b9b6 100644 --- a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js +++ b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.js @@ -47,7 +47,7 @@ class MazeQuizGame { let ud = {...ud1, ...ud2} if (ud?.finish){ if (e.started){ - engine.dashboard.updateProgress(1) + engine.dashboard.levelProgress.update(1) engine.hero.animationsMap._idle = engine.hero.animationsMap.idle if ( engine.hero.animationsMap?.win){ engine.hero.animationsMap.idle = engine.hero.animationsMap.win @@ -65,7 +65,7 @@ class MazeQuizGame { } if (ud.qid !== undefined && e.started){ engine.dashboard.updateText(ud.question.q) - engine.dashboard.updateProgress(ud.qid / questions.length) + engine.dashboard.levelProgress.update(ud.qid / questions.length) } //console.log(e, ud, engine.hero?.animationsMap); }) diff --git a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue index 7fd1305..7b72bdd 100644 --- a/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue +++ b/src/components/InteractiveObjects/MazeQuizGame/MazeQuizGame.vue @@ -1,5 +1,4 @@