fix - prevent addPerson duplicate

Console-buche · Jul 26, 2023 · 8c368c1 · 8c368c1
1 parent cd226f9
commit 8c368c1
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 56 deletions.
diff --git a/src/components/gl/House/HotSpots/AppartmentHotspot.tsx b/src/components/gl/House/HotSpots/AppartmentHotspot.tsx
@@ -1,7 +1,7 @@
 import { a, easings, useSpring } from '@react-spring/three';
-import { useCursor } from '@react-three/drei';
+import { Text, useCursor } from '@react-three/drei';
 import { type MeshProps } from '@react-three/fiber';
-import { useInterpret } from '@xstate/react';
+import { useInterpret, useSelector } from '@xstate/react';
 import { useRef, useState } from 'react';
 import type { Mesh } from 'three';
 import { shallow } from 'zustand/shallow';
@@ -19,6 +19,8 @@ export const AppartmentHotspot = ({
   const service = useInterpret(hotSpotMachine);
   useCursor(isHovered);
 
+  const { persons } = useSelector(service, (s) => s.context);
+
   const {
     setIsDragging,
     isDragging,
@@ -89,7 +91,11 @@ export const AppartmentHotspot = ({
         material-map={materials.map}
         material-emissiveMap={materials.map}
         name="hotspot"
-      />
+      >
+        <Text color="blue" position-y={6} fontSize={5}>
+          {persons.length}
+        </Text>
+      </a.mesh>
     </a.group>
   );
 };
diff --git a/src/machines/hotspot.machine.ts b/src/machines/hotspot.machine.ts
@@ -70,7 +70,7 @@ export const hotspotMachine = createMachine(
         });
         return {
           ...context,
-          persons: [...context.persons, event.person],
+          persons: Array.from(new Set([...context.persons, event.person])),
         };
       }),
       removePerson: assign((context, event) => {

diff --git a/src/machines/person.machine.typegen.ts b/src/machines/person.machine.typegen.ts
@@ -1,53 +1,76 @@
+// This file was automatically generated. Edits will be overwritten
 
-  // This file was automatically generated. Edits will be overwritten
-
-  export interface Typegen0 {
-        '@@xstate/typegen': true;
-        internalEvents: {
-          "": { type: "" };
-"xstate.after(1000)#Person.actionFlow.Doing.Drinking": { type: "xstate.after(1000)#Person.actionFlow.Doing.Drinking" };
-"xstate.after(1000)#Person.actionFlow.Doing.Pissing": { type: "xstate.after(1000)#Person.actionFlow.Doing.Pissing" };
-"xstate.after(1000)#Person.actionFlow.Resting.Idle": { type: "xstate.after(1000)#Person.actionFlow.Resting.Idle" };
-"xstate.after(500)#Person.meterFlow.Active": { type: "xstate.after(500)#Person.meterFlow.Active" };
-"xstate.init": { type: "xstate.init" };
-        };
-        invokeSrcNameMap: {
-
-        };
-        missingImplementations: {
-          actions: never;
-          delays: never;
-          guards: never;
-          services: never;
-        };
-        eventsCausingActions: {
-          "decreaseHype": "xstate.after(1000)#Person.actionFlow.Doing.Drinking" | "xstate.after(1000)#Person.actionFlow.Resting.Idle";
-"drink": "xstate.after(1000)#Person.actionFlow.Doing.Drinking";
-"emptyPee": "xstate.after(1000)#Person.actionFlow.Doing.Drinking";
-"increaseHype": "xstate.after(1000)#Person.actionFlow.Doing.Drinking";
-"pee": "xstate.after(1000)#Person.actionFlow.Doing.Pissing";
-"registerHotspot": "onRegisterHotspot";
-"unregisterHotspot": "onUnregisterHotspot";
-"updateNeeds": "xstate.after(500)#Person.meterFlow.Active";
-        };
-        eventsCausingDelays: {
-
-        };
-        eventsCausingGuards: {
-          "canPee": "xstate.after(1000)#Person.actionFlow.Doing.Pissing";
-"isActionDrink": "onDrop";
-"isActionPiss": "onDrop";
-"isPeeEmpty": "xstate.after(1000)#Person.actionFlow.Doing.Pissing";
-"isPeeFull": "xstate.after(1000)#Person.actionFlow.Doing.Drinking";
-"isThirsty": "xstate.after(1000)#Person.actionFlow.Doing.Drinking";
-        };
-        eventsCausingServices: {
-
-        };
-        matchesStates: "actionFlow" | "actionFlow.Blocking" | "actionFlow.Blocking.PissingHimself" | "actionFlow.Doing" | "actionFlow.Doing.Drinking" | "actionFlow.Doing.Pissing" | "actionFlow.Resting" | "actionFlow.Resting.Dragging" | "actionFlow.Resting.Idle" | "meterFlow" | "meterFlow.Active" | "meterFlow.Inactive" | { "actionFlow"?: "Blocking" | "Doing" | "Resting" | { "Blocking"?: "PissingHimself";
-"Doing"?: "Drinking" | "Pissing";
-"Resting"?: "Dragging" | "Idle"; };
-"meterFlow"?: "Active" | "Inactive"; };
-        tags: never;
-      }
-
+export interface Typegen0 {
+  '@@xstate/typegen': true;
+  internalEvents: {
+    '': { type: '' };
+    'xstate.after(1000)#Person.actionFlow.Doing.Drinking': {
+      type: 'xstate.after(1000)#Person.actionFlow.Doing.Drinking';
+    };
+    'xstate.after(1000)#Person.actionFlow.Doing.Pissing': {
+      type: 'xstate.after(1000)#Person.actionFlow.Doing.Pissing';
+    };
+    'xstate.after(1000)#Person.actionFlow.Resting.Idle': {
+      type: 'xstate.after(1000)#Person.actionFlow.Resting.Idle';
+    };
+    'xstate.after(500)#Person.meterFlow.Active': {
+      type: 'xstate.after(500)#Person.meterFlow.Active';
+    };
+    'xstate.init': { type: 'xstate.init' };
+  };
+  invokeSrcNameMap: {};
+  missingImplementations: {
+    actions: never;
+    delays: never;
+    guards: never;
+    services: never;
+  };
+  eventsCausingActions: {
+    decreaseHype:
+      | 'xstate.after(1000)#Person.actionFlow.Doing.Drinking'
+      | 'xstate.after(1000)#Person.actionFlow.Resting.Idle';
+    drink: 'xstate.after(1000)#Person.actionFlow.Doing.Drinking';
+    emptyPee: 'xstate.after(1000)#Person.actionFlow.Doing.Drinking';
+    increaseHype: 'xstate.after(1000)#Person.actionFlow.Doing.Drinking';
+    pee: 'xstate.after(1000)#Person.actionFlow.Doing.Pissing';
+    registerHotspot: 'onRegisterHotspot';
+    unregisterHotspot: 'onUnregisterHotspot';
+    updateNeeds: 'xstate.after(500)#Person.meterFlow.Active';
+  };
+  eventsCausingDelays: {};
+  eventsCausingGuards: {
+    canPee: 'xstate.after(1000)#Person.actionFlow.Doing.Pissing';
+    isActionDrink: 'onDrop';
+    isActionPiss: 'onDrop';
+    isPeeEmpty: 'xstate.after(1000)#Person.actionFlow.Doing.Pissing';
+    isPeeFull: 'xstate.after(1000)#Person.actionFlow.Doing.Drinking';
+    isThirsty: 'xstate.after(1000)#Person.actionFlow.Doing.Drinking';
+  };
+  eventsCausingServices: {};
+  matchesStates:
+    | 'actionFlow'
+    | 'actionFlow.Blocking'
+    | 'actionFlow.Blocking.PissingHimself'
+    | 'actionFlow.Doing'
+    | 'actionFlow.Doing.Drinking'
+    | 'actionFlow.Doing.Pissing'
+    | 'actionFlow.Resting'
+    | 'actionFlow.Resting.Dragging'
+    | 'actionFlow.Resting.Idle'
+    | 'meterFlow'
+    | 'meterFlow.Active'
+    | 'meterFlow.Inactive'
+    | {
+        actionFlow?:
+          | 'Blocking'
+          | 'Doing'
+          | 'Resting'
+          | {
+              Blocking?: 'PissingHimself';
+              Doing?: 'Drinking' | 'Pissing';
+              Resting?: 'Dragging' | 'Idle';
+            };
+        meterFlow?: 'Active' | 'Inactive';
+      };
+  tags: never;
+}