diff --git a/packages/core/src/blitzkit/asset.ts b/packages/core/src/blitzkit/asset.ts index 0d35a0dab..f4b06452b 100644 --- a/packages/core/src/blitzkit/asset.ts +++ b/packages/core/src/blitzkit/asset.ts @@ -1,8 +1,7 @@ -import { assertSecret } from '@blitzkit/core/src/blitzkit/assertSecret'; -import { ASSETS_REPO } from '../../../../src/constants/assets'; +import { assertSecret } from './assertSecret'; export function asset(path: string) { - return `https://raw.githubusercontent.com/tresabhi/${ASSETS_REPO}/${assertSecret( - process.env.NEXT_PUBLIC_ASSET_BRANCH, - )}/${path}`; + return `https://raw.githubusercontent.com/${assertSecret( + process.env.NEXT_PUBLIC_ASSET_REPO, + )}/${assertSecret(process.env.NEXT_PUBLIC_ASSET_BRANCH)}/${path}`; } diff --git a/packages/website/src/core/blitzkit/degressiveStat.ts b/packages/core/src/blitzkit/degressiveStat.ts similarity index 100% rename from packages/website/src/core/blitzkit/degressiveStat.ts rename to packages/core/src/blitzkit/degressiveStat.ts diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts index 8497b3a23..9c8895eef 100644 --- a/packages/core/src/blitzkit/index.ts +++ b/packages/core/src/blitzkit/index.ts @@ -7,6 +7,7 @@ export * from './checkConsumableProvisionInclusivity'; export * from './coefficient'; export * from './consumableDefinitions'; export * from './createDefaultSkills'; +export * from './degressiveStat'; export * from './equipmentDefinitions'; export * from './eventManager'; export * from './fetchCdonLz4'; @@ -14,8 +15,10 @@ export * from './filterTank'; export * from './gameDefinitions'; export * from './isExplosive'; export * from './modelDefinitions'; -export * from './pose'; +export * from './normalizeBoundingBox'; +export * from './progressiveStat'; export * from './provisionDefinitions'; +export * from './resolveDpm'; export * from './resolvePenetrationCoefficient'; export * from './reviews'; export * from './skillDefinitions'; @@ -26,5 +29,6 @@ export * from './tankCharacteristics'; export * from './tankDefinitions'; export * from './tankIcon'; export * from './tankNames'; +export * from './unionBoundingBox'; export * from './uniqueGuns'; export * from './youtubers'; diff --git a/packages/website/src/core/blitzkit/normalizeBoundingBox.ts b/packages/core/src/blitzkit/normalizeBoundingBox.ts similarity index 73% rename from packages/website/src/core/blitzkit/normalizeBoundingBox.ts rename to packages/core/src/blitzkit/normalizeBoundingBox.ts index 0df64fab6..d9cce42cc 100644 --- a/packages/website/src/core/blitzkit/normalizeBoundingBox.ts +++ b/packages/core/src/blitzkit/normalizeBoundingBox.ts @@ -1,4 +1,4 @@ -import { BoundingBox } from '@blitzkit/core/src/blitzkit/modelDefinitions'; +import { BoundingBox } from '@blitzkit/core'; import { Vector3Tuple } from 'three'; export function normalizeBoundingBox(boundingBox: BoundingBox) { diff --git a/packages/website/src/core/blitzkit/progressiveStat.ts b/packages/core/src/blitzkit/progressiveStat.ts similarity index 100% rename from packages/website/src/core/blitzkit/progressiveStat.ts rename to packages/core/src/blitzkit/progressiveStat.ts diff --git a/packages/website/src/core/blitzkit/resolveDpm.ts b/packages/core/src/blitzkit/resolveDpm.ts similarity index 100% rename from packages/website/src/core/blitzkit/resolveDpm.ts rename to packages/core/src/blitzkit/resolveDpm.ts diff --git a/packages/core/src/blitzkit/tankCharacteristics.ts b/packages/core/src/blitzkit/tankCharacteristics.ts index 7b3a5b945..d2395eaa3 100644 --- a/packages/core/src/blitzkit/tankCharacteristics.ts +++ b/packages/core/src/blitzkit/tankCharacteristics.ts @@ -4,7 +4,11 @@ import { ProvisionDefinitions } from '@blitzkit/core/src/blitzkit/provisionDefin import { EquipmentMatrix } from '../../../website/src/stores/duel'; import { resolveNearPenetration } from '../blitz/resolveNearPenetration'; import { coefficient } from './coefficient'; +import { degressiveStat } from './degressiveStat'; import { isExplosive } from './isExplosive'; +import { normalizeBoundingBox } from './normalizeBoundingBox'; +import { progressiveStat } from './progressiveStat'; +import { resolveDpm } from './resolveDpm'; import { resolvePenetrationCoefficient } from './resolvePenetrationCoefficient'; import { sum } from './sum'; import { @@ -15,6 +19,7 @@ import { TrackDefinition, TurretDefinition, } from './tankDefinitions'; +import { unionBoundingBox } from './unionBoundingBox'; export type TankCharacteristics = ReturnType; diff --git a/packages/website/src/core/blitzkit/unionBoundingBox.ts b/packages/core/src/blitzkit/unionBoundingBox.ts similarity index 100% rename from packages/website/src/core/blitzkit/unionBoundingBox.ts rename to packages/core/src/blitzkit/unionBoundingBox.ts diff --git a/packages/core/src/types/tanksStats.ts b/packages/core/src/types/tanksStats.ts index 053d4440a..1940bb55d 100644 --- a/packages/core/src/types/tanksStats.ts +++ b/packages/core/src/types/tanksStats.ts @@ -1,5 +1,5 @@ -import { emptyAllStats } from '@blitzkit/core/src/blitzstars/getStatsInPeriod/constants'; -import { BlitzStats } from '../core/statistics/compositeStats/constants'; +import { emptyAllStats } from '../blitz'; +import { BlitzStats } from '../statistics'; export interface IndividualTankStats { all: BlitzStats; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx index 728734372..609533f1e 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx @@ -24,6 +24,7 @@ import { debounce } from 'lodash'; import { Fragment, use, useEffect, useRef, useState } from 'react'; import { lerp } from 'three/src/math/MathUtils'; import { Ad, AdType } from '../../../../../../components/Ad'; +import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits'; import { useAdExempt } from '../../../../../../hooks/useAdExempt'; import { useEquipment } from '../../../../../../hooks/useEquipment'; import { useTankModelDefinition } from '../../../../../../hooks/useTankModelDefinition'; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Control.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Control.tsx index c92f61c5c..1e28018a1 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Control.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Control.tsx @@ -1,9 +1,12 @@ -import { Pose } from '@blitzkit/core'; +import { modelDefinitions } from '@blitzkit/core'; import { OrbitControls } from '@react-three/drei'; import { useThree } from '@react-three/fiber'; import { useEffect, useRef, useState } from 'react'; import { Vector3 } from 'three'; import { OrbitControls as OrbitControlsClass } from 'three-stdlib'; +import { applyPitchYawLimits } from '../../../../../core/blitz/applyPitchYawLimits'; +import { hasEquipment } from '../../../../../core/blitzkit/hasEquipment'; +import { Pose, poseEvent } from '../../../../../core/blitzkit/pose'; import { useAwait } from '../../../../../hooks/useAwait'; import * as Duel from '../../../../../stores/duel'; import * as TankopediaEphemeral from '../../../../../stores/tankopediaEphemeral'; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx index dbbaf08d6..9883c309b 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx @@ -9,7 +9,13 @@ import { import { Armor } from '../../../../../../components/Armor'; import { ArmorPlateDisplay } from '../../../../../../components/Armor/components/ArmorPlateDisplay'; import { ShotDisplay } from '../../../../../../components/Armor/components/ShotDisplay'; -import { StaticArmor } from '../../../../../../components/Armor/components/StaticArmor'; +import { + StaticArmor, + ThicknessRange, +} from '../../../../../../components/Armor/components/StaticArmor'; +import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits'; +import { modelTransformEvent } from '../../../../../../core/blitzkit/modelTransform'; +import { Pose, poseEvent } from '../../../../../../core/blitzkit/pose'; import { useEquipment } from '../../../../../../hooks/useEquipment'; import useOnScreen from '../../../../../../hooks/useOnScreen'; import { useTankModelDefinition } from '../../../../../../hooks/useTankModelDefinition'; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/Options/index.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/Options/index.tsx index d9f83fb46..936776f61 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/Options/index.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/Options/index.tsx @@ -1,4 +1,4 @@ -import { imgur, uniqueGuns } from '@blitzkit/core'; +import { asset, imgur, resolveNearPenetration, resolvePenetrationCoefficient, TIER_ROMAN_NUMERALS, uniqueGuns } from '@blitzkit/core'; import { CameraIcon, CopyIcon, @@ -35,6 +35,10 @@ import { ENVIRONMENTS } from '../../../Lighting'; import { QuickInputs } from '../../../QuickInputs'; import { Thicknesses } from '../../../Thicknesses'; import { DynamicArmorSwitcher } from './components/DynamicArmorSwitcher'; +import { ThicknessRange } from '../../../../../../../../components/Armor/components/StaticArmor'; +import { ModuleButton } from '../../../../../../../../components/ModuleButtons/ModuleButton'; +import { SmallTankIcon } from '../../../../../../../../components/SmallTankIcon'; +import { poseEvent, Pose } from '../../../../../../../../core/blitzkit/pose'; interface OptionsProps { thicknessRange: ThicknessRange; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx index 6273816e0..e2a108bd7 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx @@ -1,6 +1,12 @@ +import { normalizeAngleRad } from '@blitzkit/core'; import { invalidate, ThreeEvent, useThree } from '@react-three/fiber'; import { memo, useRef } from 'react'; import { Group, Mesh, MeshStandardMaterial, Vector2 } from 'three'; +import { ModelTankWrapper } from '../../../../../../../components/Armor/components/ModelTankWrapper'; +import { applyPitchYawLimits } from '../../../../../../../core/blitz/applyPitchYawLimits'; +import { hasEquipment } from '../../../../../../../core/blitzkit/hasEquipment'; +import { jsxTree } from '../../../../../../../core/blitzkit/jsxTree'; +import { modelTransformEvent } from '../../../../../../../core/blitzkit/modelTransform'; import { useModel } from '../../../../../../../hooks/useModel'; import { useTankModelDefinition } from '../../../../../../../hooks/useTankModelDefinition'; import { useTankTransform } from '../../../../../../../hooks/useTankTransform'; diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/QuickInputs/index.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/QuickInputs/index.tsx index c1bd067c4..9dbad1b40 100644 --- a/packages/website/src/app/tools/tankopedia/[id]/components/QuickInputs/index.tsx +++ b/packages/website/src/app/tools/tankopedia/[id]/components/QuickInputs/index.tsx @@ -1,8 +1,9 @@ -import { modelTransformEvent, ModelTransformEventData } from '@blitzkit/core'; import { HeightIcon, WidthIcon } from '@radix-ui/react-icons'; import { Flex, TextField } from '@radix-ui/themes'; import { useEffect, useRef } from 'react'; import { degToRad, radToDeg } from 'three/src/math/MathUtils'; +import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits'; +import { modelTransformEvent } from '../../../../../../core/blitzkit/modelTransform'; import { useEquipment } from '../../../../../../hooks/useEquipment'; import { useTankModelDefinition } from '../../../../../../hooks/useTankModelDefinition'; import * as Duel from '../../../../../../stores/duel'; diff --git a/packages/website/src/components/Armor/components/PrimaryArmorScene.tsx b/packages/website/src/components/Armor/components/PrimaryArmorScene.tsx index 330bfd3ab..378e54227 100644 --- a/packages/website/src/components/Armor/components/PrimaryArmorScene.tsx +++ b/packages/website/src/components/Armor/components/PrimaryArmorScene.tsx @@ -1,5 +1,8 @@ import { memo, useRef } from 'react'; import { Group } from 'three'; +import { correctZYTuple } from '../../../core/blitz/correctZYTuple'; +import { nameToArmorId } from '../../../core/blitzkit/nameToArmorId'; +import { resolveArmor } from '../../../core/blitzkit/resolveThickness'; import { useArmor } from '../../../hooks/useArmor'; import { useTankModelDefinition } from '../../../hooks/useTankModelDefinition'; import { useTankTransform } from '../../../hooks/useTankTransform'; diff --git a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx index d993e9dea..0ffcbb1d6 100644 --- a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx @@ -1,9 +1,13 @@ +import { ShellDefinition, resolveNearPenetration } from '@blitzkit/core'; import { isExplosive } from '@blitzkit/core/src/blitzkit/isExplosive'; import { resolvePenetrationCoefficient } from '@blitzkit/core/src/blitzkit/resolvePenetrationCoefficient'; import { useFrame } from '@react-three/fiber'; import { useEffect } from 'react'; import { MeshBasicMaterial, Object3D, ShaderMaterial, Vector2 } from 'three'; import { degToRad } from 'three/src/math/MathUtils'; +import { canSplash } from '../../../../core/blitz/canSplash'; +import { hasEquipment } from '../../../../core/blitzkit/hasEquipment'; +import { jsxTree } from '../../../../core/blitzkit/jsxTree'; import * as Duel from '../../../../stores/duel'; import * as TankopediaPersistent from '../../../../stores/tankopediaPersistent'; import fragmentShader from './shaders/fragment.glsl'; diff --git a/packages/website/src/components/Armor/components/ShotDisplay.tsx b/packages/website/src/components/Armor/components/ShotDisplay.tsx index 42ecbb769..322f8ecdc 100644 --- a/packages/website/src/components/Armor/components/ShotDisplay.tsx +++ b/packages/website/src/components/Armor/components/ShotDisplay.tsx @@ -16,6 +16,7 @@ import { Quaternion, } from 'three'; import { useFullScreen } from '../../../hooks/useFullScreen'; +import * as TankopediaEphemeral from '../../../stores/tankopediaEphemeral'; import { ShotDisplayCard } from './ShotDisplayCard'; export const shotStatusColors: Record< diff --git a/packages/website/src/components/Armor/components/SpacedArmorScene.tsx b/packages/website/src/components/Armor/components/SpacedArmorScene.tsx index 48d25db64..b691debb2 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorScene.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorScene.tsx @@ -1,5 +1,8 @@ import { memo, useRef } from 'react'; import { Group, Plane, Scene, Vector3 } from 'three'; +import { correctZYTuple } from '../../../core/blitz/correctZYTuple'; +import { nameToArmorId } from '../../../core/blitzkit/nameToArmorId'; +import { resolveArmor } from '../../../core/blitzkit/resolveThickness'; import { useArmor } from '../../../hooks/useArmor'; import { useModel } from '../../../hooks/useModel'; import { useTankModelDefinition } from '../../../hooks/useTankModelDefinition'; diff --git a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx index c5a372335..b233118c5 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx @@ -1,3 +1,4 @@ +import { ShellDefinition, resolveNearPenetration } from '@blitzkit/core'; import { resolvePenetrationCoefficient } from '@blitzkit/core/src/blitzkit/resolvePenetrationCoefficient'; import { useEffect } from 'react'; import { @@ -8,6 +9,8 @@ import { ShaderMaterial, } from 'three'; import { ArmorUserData, ExternalModuleVariant } from '../..'; +import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment'; +import { jsxTree } from '../../../../../../core/blitzkit/jsxTree'; import * as Duel from '../../../../../../stores/duel'; import { ArmorType } from '../../../SpacedArmorScene'; import fragmentShader from './shaders/fragment.glsl'; diff --git a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx index 53a3db8fb..a95694609 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx @@ -1,3 +1,4 @@ +import { ShellDefinition, resolveNearPenetration } from '@blitzkit/core'; import { isExplosive } from '@blitzkit/core/src/blitzkit/isExplosive'; import { resolvePenetrationCoefficient } from '@blitzkit/core/src/blitzkit/resolvePenetrationCoefficient'; import { useEffect } from 'react'; @@ -9,6 +10,8 @@ import { } from 'three'; import { degToRad } from 'three/src/math/MathUtils'; import { ArmorUserData } from '../..'; +import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment'; +import { jsxTree } from '../../../../../../core/blitzkit/jsxTree'; import * as Duel from '../../../../../../stores/duel'; import { ArmorType } from '../../../SpacedArmorScene'; import fragmentShader from './shaders/fragment.glsl'; diff --git a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx index 54bad06e4..d1a917525 100644 --- a/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx +++ b/packages/website/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx @@ -1,3 +1,4 @@ +import { ShellType, resolveNearPenetration } from '@blitzkit/core'; import { isExplosive } from '@blitzkit/core/src/blitzkit/isExplosive'; import { resolvePenetrationCoefficient } from '@blitzkit/core/src/blitzkit/resolvePenetrationCoefficient'; import { useThree } from '@react-three/fiber'; @@ -13,6 +14,9 @@ import { Vector3, } from 'three'; import { degToRad } from 'three/src/math/MathUtils'; +import { hasEquipment } from '../../../../core/blitzkit/hasEquipment'; +import { jsxTree } from '../../../../core/blitzkit/jsxTree'; +import { discardClippingPlane } from '../../../../core/three/discardClippingPlane'; import * as Duel from '../../../../stores/duel'; import * as TankopediaEphemeral from '../../../../stores/tankopediaEphemeral'; import { ArmorType } from '../SpacedArmorScene'; diff --git a/packages/website/src/components/ModuleButtons/ModuleButton.tsx b/packages/website/src/components/ModuleButtons/ModuleButton.tsx index f8f94ff14..c6de2bfff 100644 --- a/packages/website/src/components/ModuleButtons/ModuleButton.tsx +++ b/packages/website/src/components/ModuleButtons/ModuleButton.tsx @@ -1,4 +1,4 @@ -import { asset } from '../../core/blitzkit/asset'; +import { asset } from '@blitzkit/core'; import { GenericTankComponentButton } from './GenericTankComponentButton'; import { TankComponentButtonProps } from './TankComponentButton'; diff --git a/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx b/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx index aede4325e..25818329f 100644 --- a/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx +++ b/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx @@ -1,6 +1,5 @@ -import { assertSecret } from '@blitzkit/core'; +import { assertSecret, REGIONS } from '@blitzkit/core'; import strings from '@blitzkit/core/lang/en-US.json'; -import { REGIONS } from '@blitzkit/core/src/blitzkit/regions'; import { Button, ButtonProps, Dialog, Flex } from '@radix-ui/themes'; import { Link } from '../../Link'; import { WargamingIcon } from '../../WargamingIcon'; diff --git a/packages/website/src/components/SmallTankIcon.tsx b/packages/website/src/components/SmallTankIcon.tsx index aeea40447..9bf36d757 100644 --- a/packages/website/src/components/SmallTankIcon.tsx +++ b/packages/website/src/components/SmallTankIcon.tsx @@ -1,4 +1,4 @@ -import { asset } from '../core/blitzkit/asset'; +import { asset } from '@blitzkit/core'; interface SmallTankIconProps { id: number; diff --git a/packages/core/src/blitzkit/pose.ts b/packages/website/src/core/blitzkit/pose.ts similarity index 59% rename from packages/core/src/blitzkit/pose.ts rename to packages/website/src/core/blitzkit/pose.ts index 00f4e93a0..78671158a 100644 --- a/packages/core/src/blitzkit/pose.ts +++ b/packages/website/src/core/blitzkit/pose.ts @@ -1,4 +1,4 @@ -import { EventManager } from './eventManager'; +import { EventManager } from '@blitzkit/core/src/blitzkit/eventManager'; export enum Pose { HullDown, diff --git a/packages/website/src/hooks/useArmor.ts b/packages/website/src/hooks/useArmor.ts index e199a57ef..4dd0b160d 100644 --- a/packages/website/src/hooks/useArmor.ts +++ b/packages/website/src/hooks/useArmor.ts @@ -1,3 +1,4 @@ +import { asset } from '@blitzkit/core'; import { ObjectMap, useLoader } from '@react-three/fiber'; import { GLTF, GLTFLoader } from 'three-stdlib'; diff --git a/packages/website/src/hooks/useModel.ts b/packages/website/src/hooks/useModel.ts index ef0d8ded7..d698c98f3 100644 --- a/packages/website/src/hooks/useModel.ts +++ b/packages/website/src/hooks/useModel.ts @@ -1,3 +1,4 @@ +import { asset } from '@blitzkit/core'; import { ObjectMap, useLoader } from '@react-three/fiber'; import { Mesh, MeshStandardMaterial } from 'three'; import { GLTF, GLTFLoader } from 'three-stdlib'; diff --git a/packages/website/src/hooks/useTankTransform.ts b/packages/website/src/hooks/useTankTransform.ts index 11a0897b9..271d6eed8 100644 --- a/packages/website/src/hooks/useTankTransform.ts +++ b/packages/website/src/hooks/useTankTransform.ts @@ -1,6 +1,13 @@ +import { I_HAT, J_HAT, K_HAT } from '@blitzkit/core'; import { RefObject, useEffect } from 'react'; import { Euler, Group, Vector3 } from 'three'; import { degToRad } from 'three/src/math/MathUtils'; +import { correctZYTuple } from '../core/blitz/correctZYTuple'; +import { + ModelTransformEventData, + modelTransformEvent, +} from '../core/blitzkit/modelTransform'; +import { DuelMember } from '../stores/duel'; import { useTankModelDefinition } from './useTankModelDefinition'; export function useTankTransform( diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 4d9cc2d89..8fe71658b 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -25,6 +25,6 @@ "**/*.tsx", "../core/src/blitz/permanentSkills.tsx", "../core/src/types/proto.d.ts" - ], +, "../core/src/blitzkit/degressiveStat.ts", "../core/src/blitzkit/progressiveStat.ts", "../core/src/blitzkit/normalizeBoundingBox.ts", "../core/src/blitzkit/unionBoundingBox.ts", "../core/src/blitzkit/resolveDpm.ts" ], "exclude": ["node_modules"] }