Merge branch 'main' of https://github.com/ProjektAdLer/2D_3D_AdLer

ProjektAdLer · Jan 9, 2024 · a45e16e · a45e16e
2 parents 5bf42a0 + a57cfc5
commit a45e16e
Show file tree

Hide file tree

Showing 42 changed files with 1,322 additions and 1,044 deletions.
diff --git a/src/Components/Core/Adapters/BackendAdapter/MockBackendAdapter.ts b/src/Components/Core/Adapters/BackendAdapter/MockBackendAdapter.ts
@@ -1086,7 +1086,7 @@ export default class MockBackendAdapter implements IBackendPort {
           spaceDescription: "rdescription4",
           spaceGoals: ["rgoals4"],
           spaceSlotContents: [4],
-          requiredPointsToComplete: 3,
+          requiredPointsToComplete: 0,
           requiredSpacesToEnter: "(3)v((2)^(1))",
           spaceTemplate: "arcade",
           spaceTemplateStyle: "",
@@ -1101,7 +1101,7 @@ export default class MockBackendAdapter implements IBackendPort {
           spaceDescription: "rdescription5",
           spaceGoals: ["rgoals5"],
           spaceSlotContents: [5],
-          requiredPointsToComplete: 1,
+          requiredPointsToComplete: 0,
           requiredSpacesToEnter: "4",
           spaceTemplate: "suburb",
           spaceTemplateStyle: "",

diff --git a/src/Components/Core/DependencyInjection/Builders/BUILDER_TYPES.ts b/src/Components/Core/DependencyInjection/Builders/BUILDER_TYPES.ts
@@ -38,6 +38,7 @@ const BUILDER_TYPES = {
   IBreakTimeNotificationBuilder: Symbol("IBreakTimeNotificationBuilder"),
   ILoadingScreenBuilder: Symbol("ILoadingScreenBuilder"),
   IStoryElementBuilder: Symbol("IStoryElementBuilder"),
+  IStoryNPCBuilder: Symbol("IStoryNPCBuilder"),
 };
 
 export default BUILDER_TYPES;
diff --git a/src/Components/Core/DependencyInjection/Builders/BuilderDIContainer.ts b/src/Components/Core/DependencyInjection/Builders/BuilderDIContainer.ts
@@ -36,6 +36,7 @@ import HelpDeskButtonBuilder from "~ReactComponents/GeneralComponents/HelpDeskBu
 import AdaptivityElementBuilder from "../../Presentation/Adaptivity/AdaptivityElement/AdaptivityElementBuilder";
 import BreakTimeNotificationBuilder from "../../Presentation/Adaptivity/BreakTimeNotification/BreakTimeNotificationBuilder";
 import LoadingScreenBuilder from "~ReactComponents/GeneralComponents/LoadingScreen/LoadingScreenBuilder";
+import StoryNPCBuilder from "../../Presentation/Babylon/StoryNPC/StoryNPCBuilder";
 import StoryElementBuilder from "~ReactComponents/LearningSpaceDisplay/StoryElement/StoryElementBuilder";
 
 const BuilderDIContainer = new ContainerModule((bind) => {
@@ -137,6 +138,9 @@ const BuilderDIContainer = new ContainerModule((bind) => {
   bind<IPresentationBuilder>(BUILDER_TYPES.IStoryElementBuilder).to(
     StoryElementBuilder
   );
+  bind<IPresentationBuilder>(BUILDER_TYPES.IStoryNPCBuilder).to(
+    StoryNPCBuilder
+  );
 });
 
 export default BuilderDIContainer;
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,32 +53,33 @@ 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,
+        this.onMovementTargetReached
+      );
     } 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.pointerMovementTarget
-        );
         this.viewModel.movementTarget.Value = this.pointerMovementTarget;
-
-        this.debug_drawPath(this.pointerMovementTarget);
+        this.viewModel.characterNavigator.startMovement(
+          this.pointerMovementTarget,
+          this.onMovementTargetReached
+        );
       }
     }
     this.pointerMovementTarget = null;
     this.keyMovementTarget = null;
   }
 
+  @bind
+  private onMovementTargetReached(): void {
+    this.viewModel.movementTarget.Value = null;
+  }
+
   @bind
   private processKeyboardEvent(
     eventData: KeyboardInfo,
@@ -152,18 +149,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
     );
   }
 }