feat: simplified duel state

This commit is contained in:
TrèsAbhi committed 2024-01-15 15:02:04 -06:00
1 parent 7314f1d9b1
commit 66016dedf0
13 files changed
+276 -246

No files matched your search

@@ -10,6 +10,7 @@ import mutateTankopedia, {
useTankopedia,
} from '../../../../../../stores/tankopedia';
import { Loader } from '../../../../components/Loader';
import { Duel } from '../../page';
import { Controls } from '../Control';
import { Lighting } from '../Lighting';
import { RotationInputs } from '../RotationInputs';
@@ -18,16 +19,16 @@ import { Options } from './components/Options';
import { TankArmor } from './components/TankArmor';
import { TankModel } from './components/TankModel';
export function TankDisplay() {
interface TankDisplayProps {
duel: Duel;
}
export function TankDisplay({ duel }: TankDisplayProps) {
const canvas = useRef<HTMLCanvasElement>(null);
const awaitedModelDefinitions = use(modelDefinitions);
const canvasWrapper = useRef<HTMLDivElement>(null);
const [isFullScreen, setIsFullScreen] = useState(false);
const mode = useTankopedia((state) => state.mode);
const protagonist = useTankopedia((state) => {
if (!state.areTanksAssigned) return;
return state.protagonist;
});
function handlePointerDown() {
window.addEventListener('pointermove', handlePointerMove);
@@ -56,12 +57,14 @@ export function TankDisplay() {
});
useEffect(() => {
if (!protagonist) return void 0;
if (!duel.protagonist) return void 0;
const tankModelDefinition = awaitedModelDefinitions[protagonist.tank.id];
const tankModelDefinition =
awaitedModelDefinitions[duel.protagonist.tank.id];
const turretModelDefinition =
tankModelDefinition.turrets[protagonist.turret.id];
const gunModelDefinition = turretModelDefinition.guns[protagonist.gun.id];
tankModelDefinition.turrets[duel.protagonist.turret.id];
const gunModelDefinition =
turretModelDefinition.guns[duel.protagonist.gun.id];
mutateTankopedia((draft) => {
[draft.model.physical.pitch, draft.model.physical.yaw] =
@@ -72,9 +75,7 @@ export function TankDisplay() {
turretModelDefinition.yaw,
);
});
}, [protagonist?.gun, protagonist?.turret]);
if (!protagonist) return null;
}, [duel.protagonist.gun, duel.protagonist.turret]);
return (
<Theme radius={isFullScreen ? 'none' : undefined}>
@@ -130,15 +131,15 @@ export function TankDisplay() {
</Html>
}
>
<TankModel />
<TankArmor />
<TankModel duel={duel} />
<TankArmor duel={duel} />
</Suspense>
</Canvas>
</div>
<Options canvas={canvasWrapper} isFullScreen={isFullScreen} />
<RotationInputs />
<RotationInputs duel={duel} />
</Flex>
</Theme>
</Card>
@@ -1,5 +1,5 @@
import { useLoader } from '@react-three/fiber';
import { memo, useEffect, useRef, useState } from 'react';
import { memo, useEffect, useRef } from 'react';
import { Euler, Group, Mesh, Vector3 } from 'three';
import { GLTFLoader } from 'three-stdlib';
import { degToRad } from 'three/src/math/MathUtils';
@@ -7,27 +7,23 @@ import { ArmorMesh } from '../../../../../../../components/ArmorMesh';
import { HeadsUpDisplay } from '../../../../../../../components/HeadsUpDisplay';
import { X_AXIS, Y_AXIS, Z_AXIS } from '../../../../../../../constants/axis';
import { asset } from '../../../../../../../core/blitzkrieg/asset';
import {
ModelDefinitions,
modelDefinitions,
} from '../../../../../../../core/blitzkrieg/modelDefinitions';
import {
ModelTransformEventData,
modelTransformEvent,
} from '../../../../../../../core/blitzkrieg/modelTransform';
import { nameToArmorId } from '../../../../../../../core/blitzkrieg/nameToArmorId';
import { resolveArmor } from '../../../../../../../core/blitzkrieg/resolveThickness';
import { useModelDefinitions } from '../../../../../../../core/hooks/useModelDefinitions';
import { useTankopedia } from '../../../../../../../stores/tankopedia';
import { Duel } from '../../../page';
export const TankArmor = memo(() => {
interface TankArmorProps {
duel: Duel;
}
export const TankArmor = memo<TankArmorProps>(({ duel }) => {
const wrapper = useRef<Group>(null);
const [awaitedModelDefinitions, setAwaitedModelDefinitions] = useState<
ModelDefinitions | undefined
>(undefined);
const protagonist = useTankopedia((state) => {
if (!state.areTanksAssigned) return;
return state.protagonist;
});
const awaitedModelDefinitions = useModelDefinitions();
const showSpacedArmor = useTankopedia(
(state) => state.model.visual.showSpacedArmor,
);
@@ -35,12 +31,6 @@ export const TankArmor = memo(() => {
const gunContainer = useRef<Group>(null);
const initialTankopediaState = useTankopedia.getState();
useEffect(() => {
(async () => {
setAwaitedModelDefinitions(await modelDefinitions);
})();
}, []);
useEffect(() => {
if (!awaitedModelDefinitions) return;
@@ -118,25 +108,22 @@ export const TankArmor = memo(() => {
return unsubscribe;
});
if (!protagonist) return null;
const armorGltf = useLoader(
GLTFLoader,
asset(`3d/tanks/armor/${protagonist.tank.id}.glb`),
asset(`3d/tanks/armor/${duel.protagonist.tank.id}.glb`),
);
const modelGltf = useLoader(
GLTFLoader,
asset(`3d/tanks/models/${protagonist.tank.id}.glb`),
asset(`3d/tanks/models/${duel.protagonist.tank.id}.glb`),
);
if (!awaitedModelDefinitions) return null;
const armorNodes = Object.values(armorGltf.nodes);
const modelNodes = Object.values(modelGltf.nodes);
const tankModelDefinition = awaitedModelDefinitions[protagonist.tank.id];
const tankModelDefinition = awaitedModelDefinitions[duel.protagonist.tank.id];
const turretModelDefinition =
tankModelDefinition.turrets[protagonist.turret.id];
const gunModelDefinition = turretModelDefinition.guns[protagonist.gun.id];
tankModelDefinition.turrets[duel.protagonist.turret.id];
const gunModelDefinition =
turretModelDefinition.guns[duel.protagonist.gun.id];
const turretOrigin = new Vector3(
tankModelDefinition.turretOrigin[0],
tankModelDefinition.turretOrigin[1],
@@ -173,6 +160,7 @@ export const TankArmor = memo(() => {
return (
<ArmorMesh
duel={duel}
key={node.uuid}
geometry={(node as Mesh).geometry}
isSpaced={spaced ?? false}
@@ -191,6 +179,7 @@ export const TankArmor = memo(() => {
return (
<ArmorMesh
duel={duel}
key={node.uuid}
geometry={(node as Mesh).geometry}
isSpaced
@@ -223,6 +212,7 @@ export const TankArmor = memo(() => {
return (
<ArmorMesh
duel={duel}
key={node.uuid}
geometry={(node as Mesh).geometry}
position={turretOrigin}
@@ -252,6 +242,7 @@ export const TankArmor = memo(() => {
return (
<ArmorMesh
duel={duel}
key={node.uuid}
geometry={(node as Mesh).geometry}
position={turretOrigin.clone().add(gunOrigin)}
@@ -272,6 +263,7 @@ export const TankArmor = memo(() => {
return (
<ArmorMesh
duel={duel}
key={node.uuid}
geometry={(node as Mesh).geometry}
isSpaced
@@ -26,17 +26,16 @@ import { normalizeAnglePI } from '../../../../../../../core/math/normalizeAngle1
import mutateTankopedia, {
useTankopedia,
} from '../../../../../../../stores/tankopedia';
import { Duel } from '../../../page';
export const TankModel = memo(() => {
interface TankModelProps {
duel: Duel;
}
export const TankModel = memo(({ duel: { protagonist } }: TankModelProps) => {
const [awaitedModelDefinitions, setAwaitedModelDefinitions] = useState<
ModelDefinitions | undefined
>(undefined);
const protagonist = useTankopedia((state) => {
if (!state.areTanksAssigned) return;
return state.protagonist;
});
if (!protagonist) return null;
const canvas = useThree((state) => state.gl.domElement);
const physical = useTankopedia((state) => state.model.physical);