Revert "Squashed commit of the following:"

This reverts commit 465b481.
readyplayerme · Sep 26, 2024 · c06ad60 · c06ad60
1 parent 465b481
commit c06ad60
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 90 deletions.
diff --git a/src/components/Avatar/Avatar.component.tsx b/src/components/Avatar/Avatar.component.tsx
@@ -9,8 +9,7 @@ import {
   SpawnState,
   EffectConfiguration,
   LightingProps,
-  AnimationConfiguration,
-  MaterialConfiguration
+  AnimationConfiguration
 } from 'src/types';
 import { BaseCanvas } from 'src/components/BaseCanvas';
 import { AnimationModel, HalfBodyModel, StaticModel, PoseModel } from 'src/components/Models';
@@ -157,10 +156,6 @@ export interface AvatarProps extends LightingProps, EnvironmentProps, Omit<BaseM
   animations?: Record<string, string>;
   activeAnimation?: string;
   animationConfig?: AnimationConfiguration;
-  /**
-   * Control properties of materials.
-   */
-  materialConfig?: MaterialConfiguration;
 }
 
 /**
@@ -205,8 +200,7 @@ const Avatar: FC<AvatarProps> = ({
   backLightPosition,
   lightTarget,
   fov = 50,
-  animationConfig,
-  materialConfig
+  animationConfig
 }) => {
   const setSpawnState = useSetAtom(spawnState);
 
@@ -230,7 +224,6 @@ const Avatar: FC<AvatarProps> = ({
           onLoaded={onLoaded}
           bloom={effects?.bloom}
           animationConfig={animationConfig}
-          materialConfig={materialConfig}
         />
       );
     }
@@ -246,7 +239,6 @@ const Avatar: FC<AvatarProps> = ({
           onLoaded={onLoaded}
           headMovement={headMovement}
           bloom={effects?.bloom}
-          materialConfig={materialConfig}
         />
       );
     }
@@ -261,7 +253,6 @@ const Avatar: FC<AvatarProps> = ({
           onLoaded={onLoaded}
           headMovement={headMovement}
           bloom={effects?.bloom}
-          materialConfig={materialConfig}
         />
       );
     }
@@ -275,20 +266,12 @@ const Avatar: FC<AvatarProps> = ({
           poseSrc={poseSrc!}
           onLoaded={onLoaded}
           bloom={effects?.bloom}
-          materialConfig={materialConfig}
         />
       );
     }
 
     return (
-      <StaticModel
-        modelSrc={modelSrc}
-        scale={scale}
-        onLoaded={onLoaded}
-        emotion={emotion}
-        bloom={effects?.bloom}
-        materialConfig={materialConfig}
-      />
+      <StaticModel modelSrc={modelSrc} scale={scale} onLoaded={onLoaded} emotion={emotion} bloom={effects?.bloom} />
     );
   }, [
     modelSrc,
@@ -303,8 +286,7 @@ const Avatar: FC<AvatarProps> = ({
     effects?.bloom,
     idleRotation,
     headMovement,
-    animationConfig,
-    materialConfig
+    animationConfig
   ]);
 
   useEffect(() => triggerCallback(onLoading), [modelSrc, animationSrc, onLoading]);

diff --git a/src/components/Avatar/Avatar.stories.tsx b/src/components/Avatar/Avatar.stories.tsx
@@ -44,7 +44,6 @@ Static.args = {
     color: 'rgb(9,20,26)'
   },
   style: {},
-  materialConfig: { emissiveIntensity: 3.3 },
   /* eslint-disable no-console */
   onLoaded: () => console.info('EVENT: static avatar loaded'),
   onLoading: () => console.info('EVENT: loading static avatar'),

diff --git a/src/components/Models/AnimationModel/AnimationModel.component.tsx b/src/components/Models/AnimationModel/AnimationModel.component.tsx
@@ -30,8 +30,7 @@ export const AnimationModel: FC<AnimationModelProps> = ({
   onLoaded,
   headMovement = false,
   emotion,
-  bloom,
-  materialConfig
+  bloom
 }) => {
   const ref = useRef<Group>(null);
   const [animationRunning, setAnimationRunning] = useState(true);
@@ -85,7 +84,6 @@ export const AnimationModel: FC<AnimationModelProps> = ({
       onLoaded={onLoaded}
       onSpawnAnimationFinish={onSpawnAnimationFinish}
       bloom={bloom}
-      materialConfig={materialConfig}
     />
   );
 };
diff --git a/src/components/Models/HalfBodyModel/HalfBodyModel.component.tsx b/src/components/Models/HalfBodyModel/HalfBodyModel.component.tsx
@@ -26,8 +26,7 @@ export const HalfBodyModel: FC<HalfBodyModelProps> = ({
   setModelFallback,
   onLoaded,
   headMovement = false,
-  bloom,
-  materialConfig
+  bloom
 }) => {
   const ref = useRef<Group>(null);
   const { scene } = useGltfLoader(modelSrc);
@@ -64,14 +63,5 @@ export const HalfBodyModel: FC<HalfBodyModelProps> = ({
   useEmotion(nodes, emotion);
   useFallback(nodes, setModelFallback);
 
-  return (
-    <Model
-      modelRef={ref}
-      scene={scene}
-      scale={scale}
-      onLoaded={onLoaded}
-      bloom={bloom}
-      materialConfig={materialConfig}
-    />
-  );
+  return <Model modelRef={ref} scene={scene} scale={scale} onLoaded={onLoaded} bloom={bloom} />;
 };
diff --git a/src/components/Models/Model/Model.component.tsx b/src/components/Models/Model/Model.component.tsx
@@ -15,15 +15,7 @@ interface ModelProps extends BaseModelProps {
 
 const ROTATION_STEP = 0.005;
 
-export const Model: FC<ModelProps> = ({
-  scene,
-  scale = 1,
-  modelRef,
-  onLoaded,
-  onSpawnAnimationFinish,
-  bloom,
-  materialConfig
-}) => {
+export const Model: FC<ModelProps> = ({ scene, scale = 1, modelRef, onLoaded, onSpawnAnimationFinish, bloom }) => {
   const { materials } = useGraph(scene);
   const { gl } = useThree();
   const [isTouching, setIsTouching] = useState(false);
@@ -61,7 +53,7 @@ export const Model: FC<ModelProps> = ({
     [isTouching, touchEvent, scene]
   );
 
-  normaliseMaterialsConfig(materials, bloom, materialConfig);
+  normaliseMaterialsConfig(materials, bloom);
   scene.traverse((object) => {
     const node = object;
 

diff --git a/src/components/Models/MultipleAnimationModel/MultipleAnimationModel.component.tsx b/src/components/Models/MultipleAnimationModel/MultipleAnimationModel.component.tsx
@@ -26,8 +26,7 @@ export const MultipleAnimationModel: FC<MultipleAnimationModelProps> = ({
   onLoaded,
   emotion,
   bloom,
-  animationConfig,
-  materialConfig
+  animationConfig
 }) => {
   const mixerRef = useRef<AnimationMixer | null>(null);
   const activeActionRef = useRef<AnimationAction | null>(null);
@@ -104,5 +103,5 @@ export const MultipleAnimationModel: FC<MultipleAnimationModelProps> = ({
   useIdleExpression('blink', nodes);
   useFallback(nodes, setModelFallback);
 
-  return <Model scene={scene} scale={scale} onLoaded={onLoaded} bloom={bloom} materialConfig={materialConfig} />;
+  return <Model scene={scene} scale={scale} onLoaded={onLoaded} bloom={bloom} />;
 };
diff --git a/src/components/Models/PoseModel/PoseModel.component.tsx b/src/components/Models/PoseModel/PoseModel.component.tsx
@@ -22,8 +22,7 @@ export const PoseModel: FC<PoseModelProps> = ({
   emotion,
   setModelFallback,
   onLoaded,
-  bloom,
-  materialConfig
+  bloom
 }) => {
   const { scene } = useGltfLoader(modelSrc);
   const { nodes } = useGraph(scene);
@@ -34,14 +33,5 @@ export const PoseModel: FC<PoseModelProps> = ({
   useEmotion(nodes, emotion);
   useFallback(nodes, setModelFallback);
 
-  return (
-    <Model
-      modelRef={modelRef}
-      scene={scene}
-      scale={scale}
-      onLoaded={onLoaded}
-      bloom={bloom}
-      materialConfig={materialConfig}
-    />
-  );
+  return <Model modelRef={modelRef} scene={scene} scale={scale} onLoaded={onLoaded} bloom={bloom} />;
 };
diff --git a/src/components/Models/StaticModel/StaticModel.component.tsx b/src/components/Models/StaticModel/StaticModel.component.tsx
@@ -20,23 +20,13 @@ export const StaticModel: FC<StaticModelProps> = ({
   setModelFallback,
   onLoaded,
   emotion,
-  bloom,
-  materialConfig
+  bloom
 }) => {
   const { scene } = useGltfLoader(modelSrc);
   const { nodes } = useGraph(scene);
 
   useEmotion(nodes, emotion);
   useFallback(nodes, setModelFallback);
 
-  return (
-    <Model
-      modelRef={modelRef}
-      scene={scene}
-      scale={scale}
-      onLoaded={onLoaded}
-      bloom={bloom}
-      materialConfig={materialConfig}
-    />
-  );
+  return <Model modelRef={modelRef} scene={scene} scale={scale} onLoaded={onLoaded} bloom={bloom} />;
 };
diff --git a/src/services/Models.service.tsx b/src/services/Models.service.tsx
@@ -17,7 +17,7 @@ import type { ObjectMap, SkinnedMeshProps } from '@react-three/fiber';
 import { GLTF, GLTFLoader, DRACOLoader } from 'three-stdlib';
 import { suspend } from 'suspend-react';
 import { Emotion } from 'src/components/Avatar/Avatar.component';
-import { BloomConfiguration, MaterialConfiguration } from 'src/types';
+import { BloomConfiguration } from 'src/types';
 import { MeshoptDecoder } from './meshopt_decoder';
 
 export interface CustomNode extends Object3D {
@@ -75,11 +75,7 @@ export const lerp = (start: number, end: number, time = 0.05): number => start *
 /**
  * Avoid texture pixelation and add depth effect.
  */
-export const normaliseMaterialsConfig = (
-  materials: Record<string, Material>,
-  bloomConfig?: BloomConfiguration,
-  materialConfig?: MaterialConfiguration
-) => {
+export const normaliseMaterialsConfig = (materials: Record<string, Material>, bloomConfig?: BloomConfiguration) => {
   Object.values(materials).forEach((material) => {
     const mat = material as MeshStandardMaterial;
     if (mat.map) {
@@ -92,7 +88,7 @@ export const normaliseMaterialsConfig = (
     }
 
     if (mat.emissiveMap) {
-      mat.emissiveIntensity = bloomConfig?.materialIntensity ?? materialConfig?.emissiveIntensity ?? 3.3;
+      mat.emissiveIntensity = bloomConfig?.materialIntensity || 3.3;
     }
   });
 };

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -52,7 +52,6 @@ export interface BaseModelProps {
   onLoading?: () => void;
   setModelFallback?: (fallback: JSX.Element) => void;
   bloom?: BloomConfiguration;
-  materialConfig?: MaterialConfiguration;
 }
 
 export type HeadBlendShapeType =
@@ -187,10 +186,3 @@ export interface SpawnState {
     loop?: number | null;
   } | null;
 }
-
-export type MaterialConfiguration = {
-  /**
-   * Emissive material intensity.
-   */
-  emissiveIntensity?: number;
-};