TresAbhi/blitzkit
1
0 Fork 0
mirror of https://github.com/blitzkit/blitzkit.git synced 2026-10-23 19:49:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: ea and cs

Browse Source
This commit is contained in:
TrèsAbhi committed 2024-01-21 22:11:01 -06:00
1 parent a0c9895122
commit 9488602f5b
17 files changed
+134 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/tools/tankopedia/[id]/components/Control.tsx
+2 -5
View File
@@ -1,12 +1,12 @@
import { OrbitControls } from '@react-three/drei';
import { useThree } from '@react-three/fiber';
import { useEffect, useRef } from 'react';
import usePromise from 'react-promise-suspense';
import { Vector3 } from 'three';
import { OrbitControls as OrbitControlsClass } from 'three-stdlib';
import { applyPitchYawLimits } from '../../../../../core/blitz/applyPitchYawLimits';
import { modelDefinitions } from '../../../../../core/blitzkrieg/modelDefinitions';
import { Pose, poseEvent } from '../../../../../core/blitzkrieg/pose';
import { useAwait } from '../../../../../hooks/useAwait';
import { useTankopediaTemporary } from '../../../../../stores/tankopedia';
import { Duel } from '../page';
@@ -23,10 +23,7 @@ interface ControlsProps {
export function Controls({ duel }: ControlsProps) {
const camera = useThree((state) => state.camera);
const orbitControls = useRef<OrbitControlsClass>(null);
const awaitedModelDefinitions = usePromise(
async () => await modelDefinitions,
[],
);
const awaitedModelDefinitions = useAwait(modelDefinitions);
const protagonistModelDefinition =
awaitedModelDefinitions[duel.protagonist.tank.id];
const antagonistModelDefinition =
src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
+12 -11
View File
@@ -16,6 +16,7 @@ import { Loader } from '../../../../components/Loader';
import { Duel } from '../../page';
import { Controls } from '../Control';
import { Lighting } from '../Lighting';
import { QuickEquipments } from '../QuickEquipments';
import { RotationInputs } from '../RotationInputs';
import { SceneProps } from '../SceneProps';
import { Options } from './components/Options';
@@ -69,8 +70,8 @@ export function TankSandbox({ duel }: TankSandboxProps) {
);
modelTransformEvent.emit({ pitch, yaw });
draft.model.physical.pitch = pitch;
draft.model.physical.yaw = yaw;
draft.model.pose.pitch = pitch;
draft.model.pose.yaw = yaw;
});
break;
@@ -86,8 +87,8 @@ export function TankSandbox({ duel }: TankSandboxProps) {
);
modelTransformEvent.emit({ pitch, yaw });
draft.model.physical.pitch = pitch;
draft.model.physical.yaw = yaw;
draft.model.pose.pitch = pitch;
draft.model.pose.yaw = yaw;
});
break;
@@ -111,13 +112,12 @@ export function TankSandbox({ duel }: TankSandboxProps) {
if (!duel.protagonist) return void 0;
mutateTankopediaTemporary((draft) => {
[draft.model.physical.pitch, draft.model.physical.yaw] =
applyPitchYawLimits(
draft.model.physical.pitch,
draft.model.physical.yaw,
gunModelDefinition.pitch,
turretModelDefinition.yaw,
);
[draft.model.pose.pitch, draft.model.pose.yaw] = applyPitchYawLimits(
draft.model.pose.pitch,
draft.model.pose.yaw,
gunModelDefinition.pitch,
turretModelDefinition.yaw,
);
});
}, [duel.protagonist.gun, duel.protagonist.turret]);
@@ -183,6 +183,7 @@ export function TankSandbox({ duel }: TankSandboxProps) {
<Options canvas={canvasWrapper} isFullScreen={isFullScreen} />
<RotationInputs duel={duel} />
<QuickEquipments />
</Flex>
</Theme>
</Card>
src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ArmorHighlighting.tsx
+1 -1
View File
@@ -86,7 +86,7 @@ export function ArmorHighlighting({ duel }: ArmorHighlightingProps) {
turretContainer.current?.rotation.copy(turretRotation);
}
handleModelTransform(useTankopediaTemporary.getState().model.physical);
handleModelTransform(useTankopediaTemporary.getState().model.pose);
modelTransformEvent.on(handleModelTransform);
return () => {
src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ExternalModuleMask.tsx
+1 -1
View File
@@ -94,7 +94,7 @@ export const ExternalModuleMask = memo<ExternalModuleMaskProps>(({ duel }) => {
turretContainer.current?.rotation.copy(turretRotation);
}
handleModelTransform(useTankopediaTemporary.getState().model.physical);
handleModelTransform(useTankopediaTemporary.getState().model.pose);
modelTransformEvent.on(handleModelTransform);
return () => {
src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/SpacedArmorDepth.tsx
+1 -1
View File
@@ -100,7 +100,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(({ duel }) => {
turretContainer.current?.rotation.copy(turretRotation);
}
handleModelTransform(useTankopediaTemporary.getState().model.physical);
handleModelTransform(useTankopediaTemporary.getState().model.pose);
modelTransformEvent.on(handleModelTransform);
return () => {
src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx
+5 -5
View File
@@ -38,7 +38,7 @@ export const TankModel = memo(({ duel: { protagonist } }: TankModelProps) => {
>(undefined);
const canvas = useThree((state) => state.gl.domElement);
const physical = useTankopediaTemporary((state) => state.model.physical);
const physical = useTankopediaTemporary((state) => state.model.pose);
const hullContainer = useRef<Group>(null);
const turretContainer = useRef<Group>(null);
const gunContainer = useRef<Group>(null);
@@ -220,8 +220,8 @@ export const TankModel = memo(({ duel: { protagonist } }: TankModelProps) => {
function handlePointerUp() {
mutateTankopediaTemporary((state) => {
state.model.visual.controlsEnabled = true;
state.model.physical.pitch = normalizeAnglePI(pitch);
state.model.physical.yaw = normalizeAnglePI(yaw);
state.model.pose.pitch = normalizeAnglePI(pitch);
state.model.pose.yaw = normalizeAnglePI(yaw);
});
window.removeEventListener('pointermove', handlePointerMove);
window.removeEventListener('pointerup', handlePointerUp);
@@ -283,8 +283,8 @@ export const TankModel = memo(({ duel: { protagonist } }: TankModelProps) => {
function handlePointerUp() {
mutateTankopediaTemporary((state) => {
state.model.visual.controlsEnabled = true;
state.model.physical.pitch = normalizeAnglePI(pitch);
state.model.physical.yaw = normalizeAnglePI(yaw);
state.model.pose.pitch = normalizeAnglePI(pitch);
state.model.pose.yaw = normalizeAnglePI(yaw);
});
window.removeEventListener('pointermove', handlePointerMove);
window.removeEventListener('pointerup', handlePointerUp);
src/app/tools/tankopedia/[id]/components/QuickEquipments.tsx
+50
View File
@@ -0,0 +1,50 @@
import { Flex } from '@radix-ui/themes';
import { ModuleButton } from '../../../../../components/ModuleButton';
import {
mutateTankopediaTemporary,
useTankopediaTemporary,
} from '../../../../../stores/tankopedia';
export function QuickEquipments() {
const equipment = useTankopediaTemporary((state) => state.model.equipment);
return (
<Flex
justify="end"
align="center"
style={{
width: '100%',
position: 'absolute',
right: 12,
top: 62,
}}
>
<ModuleButton
selected={equipment.calibratedShells}
first
type="equipment"
rowChild
equipment={103}
onClick={() => {
mutateTankopediaTemporary((draft) => {
draft.model.equipment.calibratedShells =
!draft.model.equipment.calibratedShells;
});
}}
/>
<ModuleButton
selected={equipment.enhancedArmor}
last
type="equipment"
rowChild
equipment={110}
onClick={() => {
mutateTankopediaTemporary((draft) => {
draft.model.equipment.enhancedArmor =
!draft.model.equipment.enhancedArmor;
});
}}
/>
</Flex>
);
}
src/app/tools/tankopedia/[id]/components/RotationInputs.tsx
+5 -5
View File
@@ -14,7 +14,7 @@ interface RotationInputsProps {
}
export function RotationInputs({ duel: { protagonist } }: RotationInputsProps) {
const physical = useTankopediaTemporary((state) => state.model.physical);
const physical = useTankopediaTemporary((state) => state.model.pose);
const awaitedModelDefinitions = use(modelDefinitions);
const turretYawInput = useRef<HTMLInputElement>(null);
const gunPitchInput = useRef<HTMLInputElement>(null);
@@ -69,8 +69,8 @@ export function RotationInputs({ duel: { protagonist } }: RotationInputsProps) {
);
modelTransformEvent.emit({ pitch, yaw });
mutateTankopediaTemporary((state) => {
state.model.physical.pitch = pitch;
state.model.physical.yaw = yaw;
state.model.pose.pitch = pitch;
state.model.pose.yaw = yaw;
});
turretYawInput.current!.value = `${Math.round(
yaw * (180 / Math.PI),
@@ -105,8 +105,8 @@ export function RotationInputs({ duel: { protagonist } }: RotationInputsProps) {
);
modelTransformEvent.emit({ pitch, yaw });
mutateTankopediaTemporary((state) => {
state.model.physical.pitch = pitch;
state.model.physical.yaw = yaw;
state.model.pose.pitch = pitch;
state.model.pose.yaw = yaw;
});
gunPitchInput.current!.value = `${Math.round(
pitch * (180 / Math.PI),
src/app/tools/tankopedia/[id]/page.tsx
+2 -2
View File
@@ -39,8 +39,8 @@ export default function Page({ params }: { params: { id: string } }) {
useEffect(() => {
mutateTankopediaTemporary((draft) => {
draft.model.physical.yaw = 0;
draft.model.physical.pitch = 0;
draft.model.pose.yaw = 0;
draft.model.pose.pitch = 0;
draft.mode = 'model';
});