fix: hull origin

This commit is contained in:
TrèsAbhi committed 2024-07-27 13:46:36 -05:00
1 parent 3071c887cc
commit a0612b2beb
3 files changed
+63 -51

No files matched your search

@@ -88,12 +88,14 @@ export const CoreArmorScene = memo(() => {
if (!isVisible || spaced || thickness === undefined) return null; if (!isVisible || spaced || thickness === undefined) return null;
return ( return (
<group key={node.uuid} position={turretOrigin}> <group position={hullOrigin}>
<CoreArmorSceneComponent <group key={node.uuid} position={turretOrigin}>
key={node.uuid} <CoreArmorSceneComponent
thickness={thickness} key={node.uuid}
node={node} thickness={thickness}
/> node={node}
/>
</group>
</group> </group>
); );
})} })}
@@ -113,11 +115,13 @@ export const CoreArmorScene = memo(() => {
if (!isVisible || spaced || thickness === undefined) return null; if (!isVisible || spaced || thickness === undefined) return null;
return ( return (
<group <group position={hullOrigin}>
key={node.uuid} <group
position={turretOrigin.clone().add(gunOrigin)} key={node.uuid}
> position={turretOrigin.clone().add(gunOrigin)}
<CoreArmorSceneComponent thickness={thickness} node={node} /> >
<CoreArmorSceneComponent thickness={thickness} node={node} />
</group>
</group> </group>
); );
})} })}
@@ -109,14 +109,16 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
if (!isVisible || thickness === undefined) return null; if (!isVisible || thickness === undefined) return null;
return ( return (
<group key={node.uuid} position={turretOrigin}> <group position={hullOrigin}>
<SpacedArmorSceneComponent <group key={node.uuid} position={turretOrigin}>
scene={scene} <SpacedArmorSceneComponent
key={node.uuid} scene={scene}
type={spaced ? ArmorType.Spaced : ArmorType.Core} key={node.uuid}
thickness={thickness} type={spaced ? ArmorType.Spaced : ArmorType.Core}
node={node} thickness={thickness}
/> node={node}
/>
</group>
</group> </group>
); );
})} })}
@@ -136,16 +138,18 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
if (!isVisible || thickness === undefined) return null; if (!isVisible || thickness === undefined) return null;
return ( return (
<group <group position={hullOrigin}>
key={node.uuid} <group
position={turretOrigin.clone().add(gunOrigin)} key={node.uuid}
> position={turretOrigin.clone().add(gunOrigin)}
<SpacedArmorSceneComponent >
scene={scene} <SpacedArmorSceneComponent
type={spaced ? ArmorType.Spaced : ArmorType.Core} scene={scene}
thickness={thickness} type={spaced ? ArmorType.Spaced : ArmorType.Core}
node={node} thickness={thickness}
/> node={node}
/>
</group>
</group> </group>
); );
})} })}
@@ -178,16 +178,18 @@ export const StaticArmorScene = memo<StaticArmorSceneProps>(
if (!isVisible || thickness === undefined) return null; if (!isVisible || thickness === undefined) return null;
return ( return (
<group key={node.uuid} position={turretOrigin}> <group position={hullOrigin}>
<SpacedArmorSceneComponent <group key={node.uuid} position={turretOrigin}>
thicknessRange={thicknessRange} <SpacedArmorSceneComponent
static thicknessRange={thicknessRange}
scene={scene} static
key={node.uuid} scene={scene}
type={spaced ? ArmorType.Spaced : ArmorType.Core} key={node.uuid}
thickness={thickness} type={spaced ? ArmorType.Spaced : ArmorType.Core}
node={node} thickness={thickness}
/> node={node}
/>
</group>
</group> </group>
); );
})} })}
@@ -207,18 +209,20 @@ export const StaticArmorScene = memo<StaticArmorSceneProps>(
if (!isVisible || thickness === undefined) return null; if (!isVisible || thickness === undefined) return null;
return ( return (
<group <group position={hullOrigin}>
key={node.uuid} <group
position={turretOrigin.clone().add(gunOrigin)} key={node.uuid}
> position={turretOrigin.clone().add(gunOrigin)}
<SpacedArmorSceneComponent >
thicknessRange={thicknessRange} <SpacedArmorSceneComponent
static thicknessRange={thicknessRange}
scene={scene} static
type={spaced ? ArmorType.Spaced : ArmorType.Core} scene={scene}
thickness={thickness} type={spaced ? ArmorType.Spaced : ArmorType.Core}
node={node} thickness={thickness}
/> node={node}
/>
</group>
</group> </group>
); );
})} })}