integrated character animator and navigator into avatar

ProjektAdLer · Dec 21, 2023 · b8953d6 · b8953d6
1 parent d7eaf5d
commit b8953d6
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 386 deletions.
diff --git a/src/Components/Core/Presentation/Babylon/Avatar/AvatarController.ts b/src/Components/Core/Presentation/Babylon/Avatar/AvatarController.ts
@@ -3,8 +3,6 @@ import {
   EventState,
   KeyboardEventTypes,
   KeyboardInfo,
-  LinesMesh,
-  MeshBuilder,
   Nullable,
   PointerEventTypes,
   PointerInfo,
@@ -14,7 +12,6 @@ import bind from "bind-decorator";
 import SCENE_TYPES, {
   ScenePresenterFactory,
 } from "~DependencyInjection/Scenes/SCENE_TYPES";
-import { config } from "../../../../../config";
 import CoreDIContainer from "../../../DependencyInjection/CoreDIContainer";
 import CORE_TYPES from "../../../DependencyInjection/CoreTypes";
 import INavigation from "../Navigation/INavigation";
@@ -31,7 +28,6 @@ export default class AvatarController implements IAvatarController {
 
   private scenePresenter: IScenePresenter;
   private navigation: INavigation;
-  private pathLine: LinesMesh;
 
   private keyMovementTarget: Nullable<Vector3> = null;
   private pointerMovementTarget: Nullable<Vector3> = null;
@@ -57,26 +53,18 @@ export default class AvatarController implements IAvatarController {
   @bind
   private applyInputs(): void {
     if (this.keyMovementTarget !== null) {
-      this.navigation.Crowd.agentGoto(
-        this.viewModel.agentIndex,
-        this.keyMovementTarget
-      );
       this.viewModel.movementTarget.Value = this.keyMovementTarget;
-
-      this.debug_drawPath(this.keyMovementTarget);
+      this.viewModel.characterNavigator.startMovement(this.keyMovementTarget);
     } else if (this.pointerMovementTarget !== null) {
       const movementDistance = this.pointerMovementTarget
         .subtract(this.viewModel.parentNode.position)
         .length();
 
       if (movementDistance > this.viewModel.pointerMovementThreshold) {
-        this.navigation.Crowd.agentGoto(
-          this.viewModel.agentIndex,
+        this.viewModel.movementTarget.Value = this.pointerMovementTarget;
+        this.viewModel.characterNavigator.startMovement(
           this.pointerMovementTarget
         );
-        this.viewModel.movementTarget.Value = this.pointerMovementTarget;
-
-        this.debug_drawPath(this.pointerMovementTarget);
       }
     }
     this.pointerMovementTarget = null;
@@ -152,18 +140,4 @@ export default class AvatarController implements IAvatarController {
       this.lastFramePosition = this.viewModel.parentNode.position;
     }
   }
-
-  private debug_drawPath(target: Vector3): void {
-    if (config.isDebug === false) return;
-
-    let pathPoints = this.navigation.Plugin.computePath(
-      this.navigation.Crowd.getAgentPosition(this.viewModel.agentIndex),
-      target
-    );
-    this.pathLine = MeshBuilder.CreateDashedLines(
-      "navigation path",
-      { points: pathPoints, updatable: true, instance: this.pathLine },
-      this.scenePresenter.Scene
-    );
-  }
 }
diff --git a/src/Components/Core/Presentation/Babylon/Avatar/AvatarPresenter.ts b/src/Components/Core/Presentation/Babylon/Avatar/AvatarPresenter.ts
@@ -1,7 +1,8 @@
 import { injectable } from "inversify";
-import AvatarViewModel, { AvatarAnimationAction } from "./AvatarViewModel";
+import AvatarViewModel from "./AvatarViewModel";
 import IAvatarPresenter from "./IAvatarPresenter";
 import LearningElementTO from "src/Components/Core/Application/DataTransferObjects/LearningElementTO";
+import CharacterAnimationActions from "../CharacterAnimator/CharacterAnimationActions";
 
 /**
  * @class AvatarPresenter
@@ -16,8 +17,8 @@ export default class AvatarPresenter implements IAvatarPresenter {
   }
 
   public onLearningElementLoaded(learningElementTO: LearningElementTO): void {
-    this.viewModel.animationStateMachine.applyAction(
-      AvatarAnimationAction.InteractionStarted
+    this.viewModel.characterAnimator.transition(
+      CharacterAnimationActions.InteractionStarted
     );
   }
 }