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

fix: shell and quick equipment frame invalidations

Browse Source
This commit is contained in:
tresabhi committed 2024-11-10 21:54:20 -06:00
1 parent 3e2bfc453a
commit 5cf8e48747
13 files changed
+77 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/website/src/components/Armor/components/PrimaryArmorScene.tsx
+2 -2
View File
@@ -14,7 +14,7 @@ export const PrimaryArmorScene = memo(() => {
const wrapper = useRef<Group>(null);
const turretContainer = useRef<Group>(null);
const gunContainer = useRef<Group>(null);
const protagonist = Duel.use((draft) => draft.protagonist);
// const protagonist = Duel.use((draft) => draft.protagonist);
const tank = Duel.use((state) => state.protagonist.tank);
const track = Duel.use((state) => state.protagonist.track);
const turret = Duel.use((state) => state.protagonist.turret);
@@ -33,7 +33,7 @@ export const PrimaryArmorScene = memo(() => {
state.protagonist.consumables.includes(73),
);
useTankTransform(protagonist, turretContainer, gunContainer);
useTankTransform(track, turret, turretContainer, gunContainer);
return (
<ModelTankWrapper ref={wrapper}>
packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx
+7 -4
View File
@@ -78,15 +78,18 @@ export function PrimaryArmorSceneComponent({
await handleProtagonistEquipmentChange(duel.protagonist.equipmentMatrix);
await handleAntagonistEquipmentChange(duel.antagonist.equipmentMatrix);
// console.log('handleShellChange');
invalidate();
}
function handleGreenPenetrationChange(greenPenetration: boolean) {
material.uniforms.greenPenetration.value = greenPenetration;
invalidate();
}
function handleOpaqueChange(opaque: boolean) {
material.uniforms.opaque.value = opaque;
invalidate();
// invalidate();
}
function handleWireframeChange(wireframe: boolean) {
material.wireframe = wireframe;
@@ -104,7 +107,7 @@ export function PrimaryArmorSceneComponent({
? thickness * 1.03
: thickness;
invalidate();
// invalidate();
}
async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
const duel = duelStore.getState();
@@ -173,7 +176,7 @@ export function PrimaryArmorSceneComponent({
material.uniforms.inverseProjectionMatrix.value =
camera.projectionMatrixInverse;
invalidate();
// invalidate();
});
return (
packages/website/src/components/Armor/components/ShotDisplay.tsx
+3 -3
View File
@@ -1,7 +1,7 @@
import { J_HAT, K_HAT } from '@blitzkit/core';
import { Box, Flex, Text } from '@radix-ui/themes';
import { Html } from '@react-three/drei';
import { invalidate, useFrame } from '@react-three/fiber';
import { useFrame } from '@react-three/fiber';
import { clamp } from 'lodash-es';
import { useEffect, useRef, type ComponentProps } from 'react';
import {
@@ -105,7 +105,7 @@ export function ShotDisplay() {
outTracer.current.position.set(0, tracerT2 * outLength, 0);
}
invalidate();
// invalidate();
}
if (
@@ -122,7 +122,7 @@ export function ShotDisplay() {
splashRadiusWrapper.current.scale.set(scale, scale, scale);
splashRadiusMaterial.current.opacity = opacity;
invalidate();
// invalidate();
}
});
packages/website/src/components/Armor/components/SpacedArmorScene.tsx
+1 -2
View File
@@ -25,7 +25,6 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
const wrapper = useRef<Group>(null);
const turretContainer = useRef<Group>(null);
const gunContainer = useRef<Group>(null);
const protagonist = Duel.use((draft) => draft.protagonist);
const tank = Duel.use((state) => state.protagonist.tank);
const track = Duel.use((state) => state.protagonist.track);
const turret = Duel.use((state) => state.protagonist.turret);
@@ -50,7 +49,7 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
state.protagonist.consumables.includes(73),
);
useTankTransform(protagonist, turretContainer, gunContainer);
useTankTransform(track, turret, turretContainer, gunContainer);
return (
<ModelTankWrapper ref={wrapper}>
packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx
+3 -4
View File
@@ -1,5 +1,4 @@
import { resolvePenetrationCoefficient } from '@blitzkit/core';
import { invalidate } from '@react-three/fiber';
import { useEffect } from 'react';
import {
AdditiveBlending,
@@ -54,7 +53,7 @@ export function SpacedArmorSubExternal({
const tankopediaEphemeral = tankopediaEphemeralStore.getState();
const shell = tankopediaEphemeral.customShell ?? duel.antagonist.shell;
material.uniforms.penetration.value = shell.penetration.near;
invalidate();
// invalidate();
}
async function handleProtagonistEquipmentChange(
equipment: EquipmentMatrix,
@@ -69,7 +68,7 @@ export function SpacedArmorSubExternal({
? thickness * 1.03
: thickness;
invalidate();
// invalidate();
}
async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
const duel = duelStore.getState();
@@ -86,7 +85,7 @@ export function SpacedArmorSubExternal({
penetration *
resolvePenetrationCoefficient(hasCalibratedShells, shell.type);
invalidate();
// invalidate();
}
handleShellChange();
packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx
+2 -5
View File
@@ -1,5 +1,4 @@
import { isExplosive, resolvePenetrationCoefficient } from '@blitzkit/core';
import { invalidate } from '@react-three/fiber';
import { useEffect } from 'react';
import {
AdditiveBlending,
@@ -65,7 +64,7 @@ export function SpacedArmorSubSpaced({
shell.normalization ?? 0,
);
invalidate();
// invalidate();
}
async function handleProtagonistEquipmentChange(
equipment: EquipmentMatrix,
@@ -80,7 +79,7 @@ export function SpacedArmorSubSpaced({
? thickness * 1.03
: thickness;
invalidate();
// invalidate();
}
async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
const duel = duelStore.getState();
@@ -96,8 +95,6 @@ export function SpacedArmorSubSpaced({
material.uniforms.penetration.value =
penetration *
resolvePenetrationCoefficient(hasCalibratedShells, shell.type);
invalidate();
}
handleShellChange();
packages/website/src/components/Armor/components/StaticArmor.tsx
+1 -1
View File
@@ -69,7 +69,7 @@ export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
state.protagonist.consumables.includes(73),
);
useTankTransform(protagonist, turretContainer, gunContainer);
useTankTransform(track, turret, turretContainer, gunContainer);
return (
<ModelTankWrapper ref={wrapper}>