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

fix: external modules not contributong to spaced armor detph buffer

Browse Source
This commit is contained in:
TrèsAbhi committed 2024-02-22 17:28:53 -06:00
1 parent 7e92f8ac50
commit 73fccbb2bb
3 files changed
+83 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/ExternalModuleMask.tsx
+5 -4
View File
@@ -221,11 +221,10 @@ export const ExternalModuleMask = memo<ExternalModuleMaskProps>(
if (!isVisible || thickness === undefined || spaced) return null;
return (
<group position={turretOrigin}>
<group key={node.uuid} position={turretOrigin}>
<ArmorMeshExternalModuleMask
ornamental={ornamental}
exclude
key={node.uuid}
node={node}
/>
</group>
@@ -248,11 +247,13 @@ export const ExternalModuleMask = memo<ExternalModuleMaskProps>(
if (!isVisible || thickness === undefined || spaced) return null;
return (
<group position={turretOrigin.clone().add(gunOrigin)}>
<group
key={node.uuid}
position={turretOrigin.clone().add(gunOrigin)}
>
<ArmorMeshExternalModuleMask
ornamental={ornamental}
exclude
key={node.uuid}
node={node}
/>
</group>
src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/SpacedArmorDepth.tsx
+25 -22
View File
@@ -1,5 +1,5 @@
import { memo, useEffect, useRef } from 'react';
import { Euler, Group, Mesh, Vector3 } from 'three';
import { Euler, Group, Vector3 } from 'three';
import { degToRad } from 'three/src/math/MathUtils';
import { ArmorMeshSpacedArmorDepth } from '../../../../../../../../../components/ArmorMesh/components/SpacedArmorDepth';
import { I_HAT, J_HAT, K_HAT } from '../../../../../../../../../constants/axis';
@@ -190,7 +190,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(
thickness={thickness}
maxThickness={maxThickness}
key={node.uuid}
geometry={(node as Mesh).geometry}
node={node}
/>
);
})}
@@ -207,7 +207,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(
ornamental={ornamental}
isExternalModule
key={node.uuid}
geometry={(node as Mesh).geometry}
node={node}
/>
);
})}
@@ -228,16 +228,16 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(
if (!isVisible || thickness === undefined) return null;
return (
<ArmorMeshSpacedArmorDepth
ornamental={ornamental}
include={spaced}
isExternalModule={false}
thickness={thickness}
maxThickness={maxThickness}
key={node.uuid}
geometry={(node as Mesh).geometry}
position={turretOrigin}
/>
<group key={node.uuid} position={turretOrigin}>
<ArmorMeshSpacedArmorDepth
ornamental={ornamental}
include={spaced}
isExternalModule={false}
thickness={thickness}
maxThickness={maxThickness}
node={node}
/>
</group>
);
})}
</group>
@@ -257,16 +257,19 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(
if (!isVisible || thickness === undefined) return null;
return (
<ArmorMeshSpacedArmorDepth
ornamental={ornamental}
include={spaced}
isExternalModule={false}
thickness={thickness}
maxThickness={maxThickness}
<group
key={node.uuid}
geometry={(node as Mesh).geometry}
position={turretOrigin.clone().add(gunOrigin)}
/>
>
<ArmorMeshSpacedArmorDepth
ornamental={ornamental}
include={spaced}
isExternalModule={false}
thickness={thickness}
maxThickness={maxThickness}
node={node}
/>
</group>
);
})}
</group>
@@ -284,7 +287,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(
ornamental={ornamental}
isExternalModule
key={node.uuid}
geometry={(node as Mesh).geometry}
node={node}
/>
);
})}