fix(avatar): blendshape type moved to types.ts

readyplayerme · Jul 25, 2022 · c83b26e · c83b26e
1 parent d4219f1
commit c83b26e
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 66 deletions.
diff --git a/src/components/Avatar/Avatar.component.tsx b/src/components/Avatar/Avatar.component.tsx
@@ -4,7 +4,7 @@ import { PresetsType } from '@react-three/drei/helpers/environment-assets';
 import { Vector3 } from 'three';
 import { CameraLighting } from 'src/components/SceneControls/CameraLighting.component';
 import { AnimationModel } from 'src/components/Models/AnimationModel/AnimationModel.component';
-import { LightingProps } from 'src/types';
+import { HeadBlendShapeType, LightingProps } from 'src/types';
 import { BaseCanvas } from 'src/components/BaseCanvas';
 import { HalfBodyModel, StaticModel, PoseModel } from 'src/components/Models';
 import { isValidGlbUrl } from 'src/services';
@@ -32,71 +32,6 @@ export const CAMERA = {
   }
 };
 
-export type HeadBlendShapeType =
-  | 'browDownLeft'
-  | 'browDownRight'
-  | 'browInnerUp'
-  | 'browOuterUpLeft'
-  | 'browOuterUpRight'
-  | 'cheekPuff'
-  | 'cheekSquintLeft'
-  | 'cheekSquintRight'
-  | 'eyeBlinkLeft'
-  | 'eyeBlinkRight'
-  | 'eyeSquintLeft'
-  | 'eyeSquintRight'
-  | 'eyeWideLeft'
-  | 'eyeWideRight'
-  | 'eyesClosed'
-  | 'eyesLookDown'
-  | 'eyesLookUp'
-  | 'jawForward'
-  | 'jawLeft'
-  | 'jawOpen'
-  | 'jawRight'
-  | 'mouthClose'
-  | 'mouthDimpleLeft'
-  | 'mouthDimpleRight'
-  | 'mouthFrownLeft'
-  | 'mouthFrownRight'
-  | 'mouthFunnel'
-  | 'mouthLeft'
-  | 'mouthLowerDownLeft'
-  | 'mouthLowerDownRight'
-  | 'mouthOpen'
-  | 'mouthPressLeft'
-  | 'mouthPressRight'
-  | 'mouthPucker'
-  | 'mouthRight'
-  | 'mouthRollLower'
-  | 'mouthRollUpper'
-  | 'mouthShrugLower'
-  | 'mouthShrugUpper'
-  | 'mouthSmile'
-  | 'mouthSmileLeft'
-  | 'mouthSmileRight'
-  | 'mouthStretchLeft'
-  | 'mouthStretchRight'
-  | 'mouthUpperUpLeft'
-  | 'mouthUpperUpRight'
-  | 'noseSneerLeft'
-  | 'noseSneerRight'
-  | 'viseme_CH'
-  | 'viseme_DD'
-  | 'viseme_E'
-  | 'viseme_FF'
-  | 'viseme_I'
-  | 'viseme_O'
-  | 'viseme_PP'
-  | 'viseme_RR'
-  | 'viseme_SS'
-  | 'viseme_TH'
-  | 'viseme_U'
-  | 'viseme_aa'
-  | 'viseme_kk'
-  | 'viseme_nn'
-  | 'viseme_sil';
-
 export type Emotion = Record<HeadBlendShapeType, number>;
 
 export interface AvatarProps extends LightingProps {

diff --git a/src/types.ts b/src/types.ts
@@ -20,3 +20,68 @@ export interface LightingProps {
   spotLightColor?: string;
   spotLightAngle?: number;
 }
+
+export type HeadBlendShapeType =
+  | 'browDownLeft'
+  | 'browDownRight'
+  | 'browInnerUp'
+  | 'browOuterUpLeft'
+  | 'browOuterUpRight'
+  | 'cheekPuff'
+  | 'cheekSquintLeft'
+  | 'cheekSquintRight'
+  | 'eyeBlinkLeft'
+  | 'eyeBlinkRight'
+  | 'eyeSquintLeft'
+  | 'eyeSquintRight'
+  | 'eyeWideLeft'
+  | 'eyeWideRight'
+  | 'eyesClosed'
+  | 'eyesLookDown'
+  | 'eyesLookUp'
+  | 'jawForward'
+  | 'jawLeft'
+  | 'jawOpen'
+  | 'jawRight'
+  | 'mouthClose'
+  | 'mouthDimpleLeft'
+  | 'mouthDimpleRight'
+  | 'mouthFrownLeft'
+  | 'mouthFrownRight'
+  | 'mouthFunnel'
+  | 'mouthLeft'
+  | 'mouthLowerDownLeft'
+  | 'mouthLowerDownRight'
+  | 'mouthOpen'
+  | 'mouthPressLeft'
+  | 'mouthPressRight'
+  | 'mouthPucker'
+  | 'mouthRight'
+  | 'mouthRollLower'
+  | 'mouthRollUpper'
+  | 'mouthShrugLower'
+  | 'mouthShrugUpper'
+  | 'mouthSmile'
+  | 'mouthSmileLeft'
+  | 'mouthSmileRight'
+  | 'mouthStretchLeft'
+  | 'mouthStretchRight'
+  | 'mouthUpperUpLeft'
+  | 'mouthUpperUpRight'
+  | 'noseSneerLeft'
+  | 'noseSneerRight'
+  | 'viseme_CH'
+  | 'viseme_DD'
+  | 'viseme_E'
+  | 'viseme_FF'
+  | 'viseme_I'
+  | 'viseme_O'
+  | 'viseme_PP'
+  | 'viseme_RR'
+  | 'viseme_SS'
+  | 'viseme_TH'
+  | 'viseme_U'
+  | 'viseme_aa'
+  | 'viseme_kk'
+  | 'viseme_nn'
+  | 'viseme_sil';