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

Merge pull request #254 from Hitjack007/he-crash-fix

Browse Source
This commit is contained in:
TrèsAbhi authored and GitHub committed 2026-07-11 17:10:49 -05:00
2 parents dc6c528167 46937693a0
commit 3a170202ca
1 file changed
+24 -18
Download Patch File Download Diff File Expand all files Collapse all files
packages/website/src/components/Armor/components/ShotDisplay.tsx
+24 -18
View File
@@ -42,10 +42,10 @@ const TRACER_THIN = TRACER_THICK / 2;
export function ShotDisplay() { export function ShotDisplay() {
const shot = Tankopedia.use((state) => state.shot); const shot = Tankopedia.use((state) => state.shot);
const inTracer = useRef<Mesh>(null!); const inTracer = useRef<Mesh>(null);
const outTracer = useRef<Mesh>(null!); const outTracer = useRef<Mesh>(null);
const splashRadiusWrapper = useRef<Group>(null!); const splashRadiusWrapper = useRef<Group>(null);
const splashRadiusMaterial = useRef<MeshBasicMaterial>(null!); const splashRadiusMaterial = useRef<MeshBasicMaterial>(null);
const { locale } = useLocale(); const { locale } = useLocale();
useEffect(() => { useEffect(() => {
@@ -63,10 +63,10 @@ export function ShotDisplay() {
outlineMaterial, outlineMaterial,
).computeLineDistances(); ).computeLineDistances();
splashRadiusWrapper.current.add(outline); splashRadiusWrapper.current?.add(outline);
return () => { return () => {
splashRadiusWrapper.current.remove(outline); splashRadiusWrapper.current?.remove(outline);
}; };
} }
}); });
@@ -255,11 +255,11 @@ export function ShotDisplay() {
} }
interface AnimatorProps { interface AnimatorProps {
inTracer: RefObject<Mesh>; inTracer: RefObject<Mesh | null>;
outTracer: RefObject<Mesh>; outTracer: RefObject<Mesh | null>;
splashRadiusWrapper: RefObject<Group>; splashRadiusWrapper: RefObject<Group | null>;
splashRadiusMaterial: RefObject<MeshBasicMaterial>; splashRadiusMaterial: RefObject<MeshBasicMaterial | null>;
inLength: number; inLength: number;
outLength: number; outLength: number;
@@ -283,17 +283,23 @@ function Animator({
const tracerT1 = t % 1; const tracerT1 = t % 1;
const tracerT2 = (t + 0.5) % 1; const tracerT2 = (t + 0.5) % 1;
inTracer.current.scale.set(1, 1 - 2 * Math.abs(tracerT1 - 0.5), 1); if (inTracer.current) {
inTracer.current.position.set(0, (1 - tracerT1) * inLength, 0); inTracer.current.scale.set(1, 1 - 2 * Math.abs(tracerT1 - 0.5), 1);
inTracer.current.position.set(0, (1 - tracerT1) * inLength, 0);
if (outTracer.current) { if (outTracer.current) {
outTracer.current.scale.set(1, 1 - 2 * Math.abs(tracerT2 - 0.5), 1); outTracer.current.scale.set(1, 1 - 2 * Math.abs(tracerT2 - 0.5), 1);
outTracer.current.position.set(0, tracerT2 * outLength, 0); outTracer.current.position.set(0, tracerT2 * outLength, 0);
}
invalidate();
} }
invalidate(); if (
shot.splashRadius !== undefined &&
if (shot.splashRadius !== undefined) { splashRadiusWrapper.current &&
splashRadiusMaterial.current
) {
if (animationStartTime === null) animationStartTime = t; if (animationStartTime === null) animationStartTime = t;
const scale = const scale =