Merge branch 'main' into data-driven

This commit is contained in:
tresabhi committed 2026-10-25 18:49:49 -05:00
commit 89d272166f
89 files changed
+2018 -719

No files matched your search

@@ -0,0 +1,39 @@
import type { APIContext, GetStaticPathsItem } from "astro";
import sharp from "sharp";
import {
docImageId,
externalDocImages,
} from "../../../../core/blitzkit/docImages";
import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths";
import { getStaticPaths as _getStaticPaths } from "../../_index";
export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => {
const documents = import.meta.glob<string>(
"../../../../../../../docs/**/*.md",
{ eager: true, query: "?raw", import: "default" },
);
const urls = new Set(Object.values(documents).flatMap(externalDocImages));
return Array.from(
urls,
(url) =>
({
params: { id: docImageId(url) },
props: { url },
}) satisfies GetStaticPathsItem,
);
});
export async function GET({ props }: APIContext<{ url: string }>) {
const response = await fetch(props.url);
if (!response.ok) {
throw new Error(`Failed to fetch ${props.url}: ${response.status}`);
}
const image = await sharp(Buffer.from(await response.arrayBuffer()))
.webp()
.toBuffer();
return new Response(new Uint8Array(image));
}
@@ -0,0 +1,53 @@
import type { CamouflagesXml } from "@blitzkit/core";
import type { APIContext, GetStaticPathsItem } from "astro";
import sharp from "sharp";
import { extractPackedIcon } from "../../../../core/blitz/extractPackedIcon";
import { parsePackedSpriteRect } from "../../../../core/blitz/parsePackedSpriteRect";
import { api } from "../../../../core/blitzkit/api";
import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths";
import { vfs } from "../../../../core/blitzkit/vfs";
import { getStaticPaths as _getStaticPaths } from "../../_index";
export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => {
const camouflageDefinitions = await api.camouflageDefinitions();
const camouflagesXml = await vfs.xml<{ root: CamouflagesXml }>(
"Data/XML/item_defs/vehicles/common/camouflages.xml",
);
const icons = new Map(
Object.values(camouflagesXml.root.camouflages).map((camouflage) => [
camouflage.id,
camouflage.icon,
]),
);
const paths: GetStaticPathsItem[] = [];
for (const camouflage of Object.values(camouflageDefinitions.camouflages)) {
const icon = icons.get(camouflage.id);
if (camouflage.tank_id === undefined || !icon) continue;
paths.push({
params: { id: camouflage.id },
props: {
path: icon.replace("~res:/", "Data/").replace(/\.txt$/, ""),
},
});
}
return paths;
});
export async function GET({ props }: APIContext<{ path: string }>) {
const path = (await vfs.resolve(`${props.path}@2x.packed.webp`))
? `${props.path}@2x.packed.webp`
: `${props.path}.packed.webp`;
const packed = await vfs.file(path);
const texture = sharp(packed);
const sizes = parsePackedSpriteRect(packed);
const image = sizes
? sharp(await extractPackedIcon(texture, sizes))
: texture;
const bytes = await image.webp().toBuffer();
return new Response(new Uint8Array(bytes));
}
@@ -0,0 +1,13 @@
---
import CreditsPromo from "../../../../components/CreditsPromo.astro";
import { tools } from "../../../../constants/tools";
import ToolLayout from "../../../../layouts/ToolLayout.astro";
export { getStaticPaths } from "../index.astro";
const { locale } = Astro.props;
---
<ToolLayout tool={tools.credits} {locale}>
<CreditsPromo {locale} />
</ToolLayout>
@@ -0,0 +1,237 @@
import {
parseHierarchies,
Sc2ReadStream,
type CamouflagesXml,
type CamouflagesYaml,
type TankParameters,
} from "@blitzkit/core";
import {
Document,
Node,
NodeIO,
PropertyType,
Scene,
} from "@gltf-transform/core";
import { ALL_EXTENSIONS } from "@gltf-transform/extensions";
import { dedup, mergeDocuments, unpartition } from "@gltf-transform/functions";
import type { APIContext } from "astro";
import type { Vector3Tuple, Vector4Tuple } from "three";
import { SKIN_NUMBER } from "../../../../constants/skinNumber";
import { api } from "../../../../core/blitzkit/api";
import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths";
import { vfs } from "../../../../core/blitzkit/vfs";
import {
extractMaterials,
extractModel,
} from "../../../[...chunk_models_tanks]/[id]/model.glb";
import { getStaticPaths as _getStaticPaths } from "../../_index";
const SKIN_NUMBER_SLOTS = 5;
const DIGIT_COLUMNS = 5;
const DIGIT_ROWS = 2;
export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => {
const camouflages = await api.camouflageDefinitions();
return Object.values(camouflages.camouflages)
.filter((camouflage) => camouflage.tank_id)
.map((camouflage) => ({
params: { id: camouflage.tank_id!, skin: camouflage.id },
props: { skin: camouflage.id },
}));
});
const camouflagesXml = await vfs.xml<{ root: CamouflagesXml }>(
"Data/XML/item_defs/vehicles/common/camouflages.xml",
);
const camouflagesYaml = await vfs.yaml<CamouflagesYaml>(
"Data/camouflages.yaml",
);
const customization = await vfs.yaml<
Record<string, { Name: string; Path: string }>
>("Data/3d/Customization.yaml");
export async function GET({ props }: APIContext<{ skin: number }>) {
const nodeIO = new NodeIO().registerExtensions(ALL_EXTENSIONS);
const items = new Map(
Object.values(customization).map(({ Name, Path }) => [
Name,
Path.replace("~res:/3d/", "").replace(/\.sc2$/, ""),
]),
);
const key = Object.keys(camouflagesXml.root.camouflages).find(
(key) => camouflagesXml.root.camouflages[key].id === props.skin,
)!;
const include = camouflagesXml.root.camouflages[key].vehicleFilter.include;
const [nation, tankKey] = (
include as { vehicle: { name: string } }
).vehicle.name.split(":");
const { preset, customEntities } = camouflagesYaml[key];
const skinNumber = Number(preset?.match(/(\d+)$/)?.[1] ?? 1);
const parameters = await vfs.yaml<TankParameters>(
`Data/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`,
);
const basePath = parameters.resourcesPath.blitzModelPath.replace(
/\.sc2$/,
"",
);
const sc2 = new Sc2ReadStream(
(await vfs.file(`Data/3d/${basePath}.sc2`)).buffer as ArrayBuffer,
).sc2();
const slots: Record<
string,
{
target: string;
position: Vector3Tuple;
rotation: Vector4Tuple;
scale: Vector3Tuple;
}
> = {};
const states: Record<string, string | null> = {};
parseHierarchies(sc2["#hierarchy"], null, (hierarchy, components) => {
for (const component of components) {
if (component["comp.typename"] === "NewSlotComponent") {
for (const slot of Object.values(component.slots)) {
slots[slot.name] = {
target: hierarchy.name,
position: slot.transform.position,
rotation: slot.transform.rotation,
scale: slot.transform.scale,
};
}
}
if (component["comp.typename"] === "SlotComponent") {
slots[component["sc.slotName"]] = {
target: hierarchy.name,
position: component["sc.attachmentTranslation"] as Vector3Tuple,
rotation: component["sc.attachmentRotation"] as Vector4Tuple,
scale: component["sc.attachmentScale"] as Vector3Tuple,
};
}
if (component["comp.typename"] !== "StateSwitcherComponent") continue;
const active = component[`ssc.state${component["ssc.activeState"]}`];
// camos without their own variant keep the default piece, but groups
// of elements to hide stay hidden
let state: string | null =
active && !/skin\d*/.test(active) && !active.includes("hide")
? active
: null;
for (let index = 0; index < component["ssc.statesCount"]; index++) {
const name = component[`ssc.state${index}`];
const match = name.match(/skin(\d*)/);
if (
match &&
!name.includes("hide") &&
Number(match[1] || 1) === skinNumber
) {
state = name;
}
}
states[hierarchy.name] = state;
}
return null;
});
const document = new Document();
const scene = document.createScene().setExtras({ states });
const targets = new Map<string, Node>();
document.createBuffer();
if (preset) await extractMaterials(document, sc2, basePath, preset);
for (const name in customEntities) {
const slot = slots[name];
const path = items.get(customEntities[name].item);
if (
!slot ||
!path ||
!(await vfs.resolve(`Data/3d/${path}.sc2`)) ||
!(await vfs.resolve(`Data/3d/${path}.scg`))
) {
continue;
}
const part = await extractModel(vfs, path, true);
const map = mergeDocuments(document, part);
const partScene = map.get(part.getRoot().listScenes()[0]) as Scene;
const node = document
.createNode(name)
.setTranslation(slot.position)
.setRotation(slot.rotation)
.setScale(slot.scale);
let target = targets.get(slot.target);
if (!target) {
target = document.createNode(slot.target);
targets.set(slot.target, target);
scene.addChild(target);
}
for (const child of partScene.listChildren()) {
node.addChild(child as Node);
}
partScene.dispose();
target.addChild(node);
}
applySkinNumber(document, SKIN_NUMBER);
await document.transform(
dedup({ propertyTypes: [PropertyType.ACCESSOR, PropertyType.TEXTURE] }),
unpartition(),
);
return new Response(await nodeIO.writeBinary(document));
}
function applySkinNumber(document: Document, number: string) {
const start = Math.ceil((SKIN_NUMBER_SLOTS - number.length) / 2) + 1;
for (const node of document.getRoot().listNodes()) {
const match = node.getName().match(/_number_\d+_(\d+)$/);
if (!match) continue;
const digit = number[Number(match[1]) - start];
if (digit === undefined) {
node.dispose();
continue;
}
const cell = (Number(digit) + 9) % 10;
const column = cell % DIGIT_COLUMNS;
const row = Math.floor(cell / DIGIT_COLUMNS);
node.traverse((child) => {
for (const primitive of child.getMesh()?.listPrimitives() ?? []) {
const uvs = primitive.getAttribute("TEXCOORD_0")?.clone();
if (!uvs) continue;
for (let index = 0; index < uvs.getCount(); index++) {
const [u, v] = uvs.getElement(index, [0, 0]) as [number, number];
uvs.setElement(index, [
(column + u) / DIGIT_COLUMNS,
(row + v) / DIGIT_ROWS,
]);
}
primitive.setAttribute("TEXCOORD_0", uvs);
}
});
}
}
@@ -0,0 +1,3 @@
import { chunkedStaticPaths } from "../../core/blitzkit/chunkedStaticPaths";
export const getStaticPaths = chunkedStaticPaths("models_legendary");
Whitespace-only changes.
@@ -0,0 +1,12 @@
import { api } from "../../../core/blitzkit/api";
import { mixStaticPaths } from "../../../core/blitzkit/mixStaticPaths";
import { getStaticPaths as _getStaticPaths } from "../_index";
export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => {
const tanks = await api.tankDefinitions();
return Object.values(tanks.tanks).map((tank) => ({
params: { id: tank.id },
props: { id: tank.id },
}));
});
@@ -1,17 +1,16 @@
import {
parseHierarchies,
Sc2ReadStream,
ScgReadStream,
toUniqueId,
VertexAttribute,
vertexAttributeVectorSizes,
type Hierarchy,
type VehicleDefinitionList,
} from "@blitzkit/core";
import type { AbstractVFS } from "@blitzkit/core/src/blitzkit/vfs/abstract";
import { Accessor, Document, Node, NodeIO, Scene } from "@gltf-transform/core";
import type { APIContext } from "astro";
import { times } from "lodash-es";
import { vfs } from "../../../../core/blitzkit/vfs";
import { vfs } from "../../../core/blitzkit/vfs";
export { getStaticPaths } from "./_index";
@@ -56,13 +55,10 @@ async function extractArmor(vfs: AbstractVFS, fileName: string) {
const scene = document.createScene();
const buffer = document.createBuffer();
function parseHierarchies(hierarchies: Hierarchy[], parent: Scene | Node) {
hierarchies.forEach((hierarchy) => {
const components = times(
hierarchy.components.count,
(index) => hierarchy.components[index.toString().padStart(4, "0")],
);
parseHierarchies<Scene | Node>(
sc2["#hierarchy"],
scene,
(hierarchy, components, parent) => {
components.forEach((component) => {
switch (component["comp.typename"]) {
case "TransformComponent":
@@ -163,13 +159,9 @@ async function extractArmor(vfs: AbstractVFS, fileName: string) {
}
});
if (hierarchy["#hierarchy"]) {
parseHierarchies(hierarchy["#hierarchy"], parent);
}
});
}
parseHierarchies(sc2["#hierarchy"], scene);
return parent;
},
);
return document;
}
@@ -1,13 +1,13 @@
import {
bufferToBigInt,
DdsReadStream,
parseHierarchies,
PvrReadStream,
Sc2ReadStream,
ScgReadStream,
toUniqueId,
VertexAttribute,
type ConfigArchive,
type Hierarchy,
type TankParameters,
type Textures,
type VehicleDefinitionList,
@@ -17,10 +17,10 @@ import { Document, Material, Node, NodeIO, Scene } from "@gltf-transform/core";
import { ALL_EXTENSIONS } from "@gltf-transform/extensions";
import { dedup, prune } from "@gltf-transform/functions";
import type { APIContext } from "astro";
import { times } from "lodash-es";
import { isEqual, times } from "lodash-es";
import { dirname } from "path";
import sharp from "sharp";
import { vfs } from "../../../../core/blitzkit/vfs";
import { vfs } from "../../../core/blitzkit/vfs";
import {
vertexAttributeGLTFName,
vertexAttributeGltfVectorSizes,
@@ -69,7 +69,11 @@ const omitMeshNames = {
end: ["_POINT"],
};
async function extractModel(vfs: AbstractVFS, path: string) {
export async function extractModel(
vfs: AbstractVFS,
path: string,
isPart = false,
) {
const sc2Path = `Data/3d/${path}.sc2`;
const scgPath = `Data/3d/${path}.scg`;
const sc2 = new Sc2ReadStream(
@@ -81,6 +85,153 @@ async function extractModel(vfs: AbstractVFS, path: string) {
const document = new Document();
const scene = document.createScene();
const buffer = document.createBuffer();
const materials = await extractMaterials(document, sc2, path);
parseHierarchies<Scene | Node>(
sc2["#hierarchy"],
scene,
(hierarchy, components, parent) => {
if (
omitMeshNames.start.some((omit) => hierarchy.name.startsWith(omit)) ||
omitMeshNames.end.some((omit) => hierarchy.name.endsWith(omit))
)
return;
const node = document.createNode(hierarchy.name);
components.forEach((component) => {
switch (component["comp.typename"]) {
case "LodComponent":
// found and used later by transform component
// TODO: lod component always shows up before transform component; cache it before parsing transform
break;
case "TransformComponent": {
const localTranslation = component["tc.localTranslation"];
// The game resets top-level node translation to [0, 0, 0] on load.
// Child nodes and customization parts must keep their authored
// local offsets.
node.setTranslation(
parent instanceof Scene && !isPart ? [0, 0, 0] : localTranslation,
);
node.setRotation(component["tc.localRotation"]);
node.setScale(component["tc.localScale"]);
break;
}
case "StateSwitcherComponent":
node.setExtras({
state: component[`ssc.state${component["ssc.activeState"]}`],
});
break;
case "RenderComponent": {
const renderObject = component["rc.renderObj"];
times(renderObject["ro.batchCount"], (batchIndex): void => {
const lodIndex = renderObject[`rb${batchIndex}.lodIndex`];
if (lodIndex !== 0) return;
const batchKey = batchIndex.toString().padStart(4, "0");
const batch = renderObject["ro.batches"][batchKey];
const material = materials.get(batch["rb.nmatname"]);
const polygonGroup = scg.get(batch["rb.datasource"]);
if (!(material instanceof Material)) {
// probably shadow material
return;
}
if (polygonGroup === undefined) {
throw new Error(
`Missing polygon group ${batch["rb.datasource"]}`,
);
}
const lodNode = document.createNode(batchKey);
const indicesAccessor = document
.createAccessor()
.setType("SCALAR")
.setArray(new Uint16Array(polygonGroup.indices))
.setBuffer(buffer);
const primitive = document
.createPrimitive()
.setIndices(indicesAccessor)
.setMaterial(material)
.setName(batchKey);
const attributes = new Map<VertexAttribute, number[][]>();
polygonGroup.vertices.forEach((vertex) => {
vertex.forEach(({ attribute, value }) => {
if (!attributes.has(attribute)) {
attributes.set(attribute, []);
}
attributes.get(attribute)!.push(value);
});
});
attributes.forEach((value, attribute) => {
const name = vertexAttributeGLTFName[attribute];
if (
name === undefined ||
primitive.getAttribute(name) !== null
) {
return;
}
const vertexSize = vertexAttributeGltfVectorSizes[attribute];
const attributeAccessor = document
.createAccessor(name)
.setType(vertexSize === 1 ? "SCALAR" : `VEC${vertexSize}`)
.setArray(new Float32Array(value.flat()))
.setBuffer(buffer);
primitive.setAttribute(name, attributeAccessor);
});
const mesh = document
.createMesh(batch["##name"])
.addPrimitive(primitive);
lodNode.setMesh(mesh);
node.addChild(lodNode);
});
break;
}
default: {
if (ERROR_ON_UNKNOWN_COMPONENT) {
throw new Error(
`Unhandled component type: ${component["comp.typename"]}`,
);
}
}
}
});
parent.addChild(node);
return node;
},
);
scene.addChild(document.createNode("test"));
await document.transform(prune({ keepAttributes: true }), dedup());
return document;
}
export async function extractMaterials(
document: Document,
sc2: ReturnType<Sc2ReadStream["sc2"]>,
path: string,
config?: string,
) {
const materials = new Map<bigint, Material | bigint | undefined>();
for (const node of sc2["#dataNodes"]) {
@@ -95,15 +246,32 @@ async function extractModel(vfs: AbstractVFS, path: string) {
continue;
}
const material = document.createMaterial(node.materialName);
let textures: Textures | undefined = undefined;
if (node.textures) {
if (config !== undefined) {
if (typeof node.configCount !== "number") continue;
const archive = times(
node.configCount,
(index) => node[`configArchive_${index}`],
).find((archive) => archive.configName === config);
if (
!archive ||
isEqual(archive.textures, node.configArchive_0.textures)
) {
continue;
}
textures = archive.textures;
} else if (node.textures) {
textures = node.textures;
} else if (typeof node.configCount === "number") {
textures = node.configArchive_0.textures;
}
const material = document.createMaterial(node.materialName);
if (textures) {
const baseColor = await readBaseColor(
`Data/3d/${dirname(path)}/${textures.baseColorMap ?? textures.albedo}`,
@@ -240,157 +408,7 @@ async function extractModel(vfs: AbstractVFS, path: string) {
materials.set(id, resolvedMaterial);
});
function parseHierarchies(hierarchies: Hierarchy[], parent: Scene | Node) {
hierarchies.forEach((hierarchy) => {
if (
omitMeshNames.start.some((omit) => hierarchy.name.startsWith(omit)) ||
omitMeshNames.end.some((omit) => hierarchy.name.endsWith(omit))
)
return;
const node = document.createNode(hierarchy.name);
const components = times(
hierarchy.components.count,
(index) => hierarchy.components[index.toString().padStart(4, "0")],
);
components.forEach((component) => {
switch (component["comp.typename"]) {
case "LodComponent":
// found and used later by transform component
// TODO: lod component always shows up before transform component; cache it before parsing transform
break;
case "TransformComponent": {
const t = component["tc.localTranslation"];
const r = component["tc.localRotation"];
node.setTranslation([t[0], t[2], -t[1]]);
node.setRotation([r[0], r[2], -r[1], r[3]]);
node.setScale(component["tc.localScale"]);
break;
}
case "RenderComponent": {
const renderObject = component["rc.renderObj"];
times(renderObject["ro.batchCount"], (batchIndex): void => {
const lodIndex = renderObject[`rb${batchIndex}.lodIndex`];
if (lodIndex !== 0) return;
const batchKey = batchIndex.toString().padStart(4, "0");
const batch = renderObject["ro.batches"][batchKey];
const material = materials.get(batch["rb.nmatname"]);
const polygonGroup = scg.get(batch["rb.datasource"]);
if (!(material instanceof Material)) {
// probably shadow material
return;
}
if (polygonGroup === undefined) {
throw new Error(
`Missing polygon group ${batch["rb.datasource"]}`,
);
}
const lodNode = document.createNode(batchKey);
const indicesAccessor = document
.createAccessor()
.setType("SCALAR")
.setArray(new Uint16Array(polygonGroup.indices))
.setBuffer(buffer);
const primitive = document
.createPrimitive()
.setIndices(indicesAccessor)
.setMaterial(material)
.setName(batchKey);
const attributes = new Map<VertexAttribute, number[][]>();
polygonGroup.vertices.forEach((vertex) => {
vertex.forEach(({ attribute, value }) => {
if (!attributes.has(attribute)) {
attributes.set(attribute, []);
}
attributes.get(attribute)!.push(value);
});
});
attributes.forEach((value, attribute) => {
const name = vertexAttributeGLTFName[attribute];
if (
name === undefined ||
primitive.getAttribute(name) !== null
) {
return;
}
const vertexSize = vertexAttributeGltfVectorSizes[attribute];
const processed = new Float32Array(value.flat());
if (
attribute === VertexAttribute.VERTEX ||
attribute === VertexAttribute.NORMAL ||
attribute === VertexAttribute.TANGENT ||
attribute === VertexAttribute.BINORMAL
) {
for (let i = 0; i < processed.length; i += 3) {
const y = processed[i + 1];
const z = processed[i + 2];
processed[i + 1] = z;
processed[i + 2] = -y;
}
}
const attributeAccessor = document
.createAccessor(name)
.setType(vertexSize === 1 ? "SCALAR" : `VEC${vertexSize}`)
.setArray(processed)
.setBuffer(buffer);
primitive.setAttribute(name, attributeAccessor);
});
const mesh = document
.createMesh(batch["##name"])
.addPrimitive(primitive);
lodNode.setMesh(mesh);
node.addChild(lodNode);
});
break;
}
default: {
if (ERROR_ON_UNKNOWN_COMPONENT) {
throw new Error(
`Unhandled component type: ${component["comp.typename"]}`,
);
}
}
}
});
if (hierarchy["#hierarchy"]) {
parseHierarchies(hierarchy["#hierarchy"], node);
}
parent.addChild(node);
});
}
parseHierarchies(sc2["#hierarchy"], scene);
scene.addChild(document.createNode("test"));
await document.transform(prune({ keepAttributes: true }), dedup());
return document;
return materials;
}
async function readBaseColor(path: string) {
@@ -0,0 +1,3 @@
import { chunkedStaticPaths } from "../../core/blitzkit/chunkedStaticPaths";
export const getStaticPaths = chunkedStaticPaths("models_tanks");