s3m-three 0.3.0 → 0.3.1

package/dist/core/Draco.d.ts

@@ -0,0 +1,52 @@
+/**
+ * S3M v3 Draco 几何压缩（Skeleton 的 Draco 分支）
+ *
+ * 与 MeshOpt 一样，这里的布局不是照规范写的 —— 规范里的 Draco 分支描述和实际数据
+ * 对不上，字段顺序是从真实瓦片逐字节标定出来的（两个瓦片 5 个骨架完全一致，
+ * 且用 payloadSize / dracoSize / "DRACO" magic / skeletonStreamSize 四重自校验）。
+ *
+ * 二进制布局（v3.01 实测，偏移以 tag 字段之后为 0）：
+ * ```
+ * u32  payloadSize          // 覆盖 [本字段之后 .. 条目末尾 OBB 之前]
+ * u32  unknown = 32         // 实测恒 32，语义未知
+ * i32  posUniqueId          // draco 属性 uid，POSITION；-1 = 无
+ * i32  normalUniqueId       // -1 = 无
+ * i32  colorUniqueId        // -1 = 无
+ * i32  secondColorUniqueId
+ * u32  texCoordCount        // 自定义属性个数，实测 3
+ * i32  texCoordUniqueIds[texCoordCount]   // 各自定义属性的 draco uid
+ * u32  vertexAttrCount      // 实测恒 0
+ * u32  dracoSize
+ * byte draco[dracoSize]     // 标准 draco 比特流，开头 5 字节是 "DRACO" magic
+ * pad4
+ * String descript           // {"PointCloudClassCode":2,"PointCloudIntensity":1,"VertexWeight":0}
+ * pad4
+ * f64  obb[12]              // ← 由调用方 parseSkeletonEntries 统一按条目末尾读
+ * ```
+ *
+ * descript 的 value 是「自定义属性在 texCoordUniqueIds 里的下标」：
+ * VertexWeight→uid2(float 高度)、PointCloudIntensity→uid3、PointCloudClassCode→uid4。
+ * uid1 没被 descript 引用（实测是 0~29 的 uint32，用途不明）。
+ *
+ * 官方 SDK 的 `parseDracoSkeleton` 字段顺序不一样（多了 materialCount，且
+ * `version === 3` 的判定对 3.01 瓦片不成立），实际解析不了这个服务，所以以实测为准。
+ */
+import type { BinaryReader } from './BinaryReader.js';
+import type { IndexPackage, VertexPackage } from './types.js';
+import type { DracoModule } from '../vendor/draco_decoder.module.js';
+/**
+ * 懒加载 Draco 解码器（wasm 内联，约 266KB）。
+ * 只有真正遇到 Draco 瓦片时才会编译，标准 / MeshOpt 瓦片不受影响。
+ */
+export declare function loadDracoDecoder(): Promise<DracoModule>;
+/**
+ * 读取一个 Draco 压缩的 Skeleton。
+ *
+ * 点云没有索引包（顶点即点），但渲染层是「有 indexPackages 才建几何」，
+ * 所以这里合成一个 primitiveType = 1 的空点包，让下游走 THREE.Points 路径。
+ *
+ * 包围盒不在这里读：调用方 parseSkeletonEntries 统一按 skeletonStreamSize
+ * 定位到条目末尾的 OBB，各分支行为保持一致。
+ */
+export declare function parseDracoGeometry(r: BinaryReader, vp: VertexPackage): Promise<IndexPackage[]>;
+//# sourceMappingURL=Draco.d.ts.map

package/dist/core/Draco.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Draco.d.ts","sourceRoot":"","sources":["../../src/core/Draco.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAa,YAAY,EAAmB,aAAa,EAAE,MAAM,YAAY,CAAC;AAC1F,OAAO,KAAK,EAAE,WAAW,EAAwC,MAAM,mCAAmC,CAAC;AAgC3G;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAAC,WAAW,CAAC,CAKvD;AAmGD;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAgLpG"}

package/dist/core/Draco.js

@@ -0,0 +1,323 @@
+/* ------------------------------------------------------------ draco 枚举（本地副本） */
+/** draco::GeometryAttribute::Type */
+const ATTR_POSITION = 0;
+const ATTR_NORMAL = 1;
+const ATTR_COLOR = 2;
+const ATTR_GENERIC = 4;
+/** draco::DataType（DT_INVALID = 0 占位） */
+const DT_UINT8 = 2;
+const DT_UINT16 = 4;
+const DT_UINT32 = 6;
+const DT_FLOAT32 = 9;
+/** draco::EncodedGeometryType */
+const GEOM_POINT_CLOUD = 0;
+const GEOM_TRIANGULAR_MESH = 1;
+const DRACO_MAGIC = 'DRACO';
+/** primitiveType = 1：点云包（渲染层据此走 THREE.Points） */
+const POINT_PRIMITIVE = 1;
+/** 单个 skeleton 的点数上限，防头读错时开出天文数字的缓冲 */
+const MAX_POINTS = 64 * 1024 * 1024;
+/* ------------------------------------------------------------ 解码器 */
+let decoderPromise = null;
+/**
+ * 懒加载 Draco 解码器（wasm 内联，约 266KB）。
+ * 只有真正遇到 Draco 瓦片时才会编译，标准 / MeshOpt 瓦片不受影响。
+ */
+export function loadDracoDecoder() {
+    if (!decoderPromise) {
+        decoderPromise = import('../vendor/draco_decoder.module.js').then((mod) => mod.default());
+    }
+    return decoderPromise;
+}
+/**
+ * 把 draco 的一个属性读成 JS 数组。
+ *
+ * 不能直接把 JS TypedArray 传给 `GetAttribute*ForAllPoints`：embind 会把期望
+ * 对象的参数原样透传，TypedArray 没有 `.ptr` 就变成 undefined，wasm 侧写不进
+ * 数据，函数却照样返回 true（实测取出来全是 0）。只能逐个 GetValue ——
+ * 6 千点 × 3 分量实测 3.5ms，可以接受。
+ *
+ * 量化 / 八面体变换由 draco 解码时自动还原，这里拿到的是最终值。
+ */
+function readAttribute(draco, decoder, geometry, attr) {
+    const comps = Math.max(1, attr.num_components());
+    const n = geometry.num_points() * comps;
+    let src;
+    switch (attr.data_type()) {
+        case DT_FLOAT32:
+            src = new draco.DracoFloat32Array();
+            if (!decoder.GetAttributeFloatForAllPoints(geometry, attr, src))
+                return null;
+            break;
+        case DT_UINT8:
+            src = new draco.DracoUInt8Array();
+            if (!decoder.GetAttributeUInt8ForAllPoints(geometry, attr, src))
+                return null;
+            break;
+        case DT_UINT16:
+            src = new draco.DracoUInt16Array();
+            if (!decoder.GetAttributeUInt16ForAllPoints(geometry, attr, src))
+                return null;
+            break;
+        case DT_UINT32:
+            src = new draco.DracoUInt32Array();
+            if (!decoder.GetAttributeUInt32ForAllPoints(geometry, attr, src))
+                return null;
+            break;
+        default:
+            // int8/int16/int32/float64：真实点云里没见过，对应取值接口也存在，
+            // 需要时按上面同款补一行即可
+            return null;
+    }
+    const size = src.size();
+    const isFloat = attr.data_type() === DT_FLOAT32;
+    let out;
+    if (isFloat)
+        out = new Float32Array(n);
+    else if (attr.data_type() === DT_UINT16)
+        out = new Uint16Array(n);
+    else if (attr.data_type() === DT_UINT32)
+        out = new Uint32Array(n);
+    else
+        out = new Uint8Array(n);
+    for (let i = 0; i < size && i < n; i++)
+        out[i] = src.GetValue(i);
+    // Draco*Array 是 new 出来的，占 wasm 堆；不解引用会一直涨
+    draco.destroy(src);
+    return out;
+}
+/* ------------------------------------------------------------ 分类着色 */
+/**
+ * LAS / ASPRS 标准分类色带（1~18，其余走兜底灰）。
+ *
+ * 点云分类服务（3D-PointCloudClassific 这类）本身不带顶点色，颜色全靠分类码。
+ * 渲染层的点云路径只认 `color` 属性，所以这里直接把分类码烘成 RGBA8 顶点色，
+ * 下游零改动。实测该服务的分类分布是 {5: 高植被, 14: 导线, 15: 输电塔, 18: 高噪声}。
+ */
+const CLASS_COLORS = [
+    [190, 190, 190], // 0 未分类
+    [166, 166, 166], // 1 未分类（旧）
+    [139, 119, 101], // 2 地面
+    [35, 190, 35], // 3 低植被
+    [60, 179, 60], // 4 中植被
+    [30, 160, 30], // 5 高植被
+    [255, 170, 60], // 6 建筑
+    [255, 110, 190], // 7 低噪点
+    [190, 190, 190], // 8 关键点
+    [60, 120, 255], // 9 水面
+    [255, 235, 80], // 10 铁轨
+    [255, 200, 120], // 11 路面
+    [200, 120, 255], // 12 保留
+    [255, 120, 255], // 13 线缆
+    [255, 235, 60], // 14 导线
+    [255, 200, 40], // 15 输电塔
+    [120, 200, 255], // 16 桥面
+    [200, 160, 255], // 17 桥墩
+    [255, 60, 60], // 18 高噪声
+];
+/* ------------------------------------------------------------ 骨架 */
+/**
+ * 读取一个 Draco 压缩的 Skeleton。
+ *
+ * 点云没有索引包（顶点即点），但渲染层是「有 indexPackages 才建几何」，
+ * 所以这里合成一个 primitiveType = 1 的空点包，让下游走 THREE.Points 路径。
+ *
+ * 包围盒不在这里读：调用方 parseSkeletonEntries 统一按 skeletonStreamSize
+ * 定位到条目末尾的 OBB，各分支行为保持一致。
+ */
+export async function parseDracoGeometry(r, vp) {
+    const draco = await loadDracoDecoder();
+    /* ---- 1. 容器头 ---- */
+    const payloadSize = r.u32();
+    const payloadStart = r.offset;
+    r.u32(); // 实测恒 32，语义未知
+    const posUniqueId = r.i32();
+    const normalUniqueId = r.i32();
+    const colorUniqueId = r.i32();
+    r.i32(); // secondColorUniqueId
+    const texCoordCount = r.u32();
+    if (texCoordCount > 16) {
+        throw new Error(`[s3m] Draco 自定义属性个数异常：texCoordCount=${texCoordCount}`);
+    }
+    const texCoordUniqueIds = [];
+    for (let i = 0; i < texCoordCount; i++)
+        texCoordUniqueIds.push(r.i32());
+    r.u32(); // vertexAttrCount，实测恒 0
+    const dracoSize = r.u32();
+    if (dracoSize < 16 || dracoSize > r.remaining) {
+        throw new Error(`[s3m] Draco 流长度异常：dracoSize=${dracoSize}，剩余 ${r.remaining} 字节`);
+    }
+    const data = r.bytes(dracoSize);
+    // 头读错时这里必然对不上，比让 wasm 报一句看不懂的错有用
+    if (String.fromCharCode(...data.subarray(0, 5)) !== DRACO_MAGIC) {
+        throw new Error('[s3m] Draco 流缺少 "DRACO" magic，容器头解析错位');
+    }
+    r.align4();
+    const descript = r.string();
+    r.align4();
+    // 自定义属性 uid → 语义名：{"PointCloudClassCode":2,...} 的 value 是 texCoordUniqueIds 下标
+    const customNames = new Map();
+    try {
+        const map = JSON.parse(descript);
+        for (const [name, idx] of Object.entries(map)) {
+            const uid = texCoordUniqueIds[idx];
+            if (uid !== undefined)
+                customNames.set(uid, name);
+        }
+    }
+    catch {
+        // descript 不是 JSON 也不影响渲染，只是自定义属性没名字
+    }
+    vp.customVertexAttribute = descript ? safeJson(descript) : undefined;
+    if (payloadSize > 0) {
+        const consumed = r.offset - payloadStart;
+        if (consumed !== payloadSize) {
+            // 条目末尾由 streamSize 兜着，错位不会波及后面的骨架，只提示
+            console.warn(`[s3m] Draco 载荷长度不符：声明 ${payloadSize}，实读 ${consumed}`);
+        }
+    }
+    /* ---- 2. 解码 ---- */
+    const decoder = new draco.Decoder();
+    const geometry = new draco.PointCloud();
+    try {
+        const geomType = decoder.GetEncodedGeometryType(data);
+        if (geomType !== GEOM_POINT_CLOUD) {
+            throw new Error(`[s3m] Draco ${geomType === GEOM_TRIANGULAR_MESH ? '三角网格' : '未知'} 几何暂未实现（仅支持点云）`);
+        }
+        const status = decoder.DecodeArrayToPointCloud(data, data.length, geometry);
+        if (!status.ok())
+            throw new Error(`[s3m] Draco 解码失败：${status.error_msg()}`);
+        const numPoints = geometry.num_points();
+        if (!Number.isInteger(numPoints) || numPoints < 0 || numPoints > MAX_POINTS) {
+            throw new Error(`[s3m] Draco 点数异常：${numPoints}`);
+        }
+        if (numPoints === 0) {
+            vp.verticesCount = 0;
+            return [pointPack()];
+        }
+        /* ---- 3. 属性装配 ---- */
+        let classCode = null;
+        for (let i = 0; i < geometry.num_attributes(); i++) {
+            const attr = decoder.GetAttribute(geometry, i);
+            const uid = attr.unique_id();
+            const comps = Math.max(1, attr.num_components());
+            if (uid === posUniqueId || attr.attribute_type() === ATTR_POSITION) {
+                if (attr.data_type() !== DT_FLOAT32) {
+                    throw new Error(`[s3m] Draco 位置属性不是 float32（dt=${attr.data_type()}）`);
+                }
+                const raw = readAttribute(draco, decoder, geometry, attr);
+                if (!raw)
+                    throw new Error('[s3m] Draco 位置属性读取失败');
+                // draco 偶尔按 3 分量以上的格式存位置，取前 3 个
+                const out = new Float32Array(numPoints * 3);
+                for (let p = 0; p < numPoints; p++) {
+                    out[p * 3] = raw[p * comps] ?? 0;
+                    out[p * 3 + 1] = raw[p * comps + 1] ?? 0;
+                    out[p * 3 + 2] = raw[p * comps + 2] ?? 0;
+                }
+                pushAttr(vp, 'position', new Uint8Array(out.buffer), 3, 12, 0, undefined, 'f32');
+                continue;
+            }
+            if (uid === colorUniqueId || attr.attribute_type() === ATTR_COLOR) {
+                const raw = readAttribute(draco, decoder, geometry, attr);
+                if (raw) {
+                    const out = new Uint8Array(numPoints * 4);
+                    const isFloat = raw instanceof Float32Array;
+                    for (let p = 0; p < numPoints; p++) {
+                        const o = p * comps;
+                        if (isFloat) {
+                            out[p * 4] = clamp255(raw[o] ?? 1);
+                            out[p * 4 + 1] = clamp255(raw[o + 1] ?? 1);
+                            out[p * 4 + 2] = clamp255(raw[o + 2] ?? 1);
+                        }
+                        else {
+                            out[p * 4] = raw[o] ?? 255;
+                            out[p * 4 + 1] = raw[o + 1] ?? 255;
+                            out[p * 4 + 2] = raw[o + 2] ?? 255;
+                        }
+                        out[p * 4 + 3] = comps >= 4 && !isFloat ? (raw[o + 3] ?? 255) : 255;
+                    }
+                    pushAttr(vp, 'color', out, 4, 4, 0, undefined, 'u8');
+                }
+                continue;
+            }
+            if (uid === normalUniqueId || attr.attribute_type() === ATTR_NORMAL) {
+                // 点云不需要法线，八面体编码由 draco 解码时自动还原，这里直接跳过
+                continue;
+            }
+            // 自定义属性：只挑分类码，其余（高度 / 强度）渲染层用不上
+            const name = customNames.get(uid);
+            if (name === 'PointCloudClassCode' && comps === 1) {
+                const raw = readAttribute(draco, decoder, geometry, attr);
+                if (raw && !(raw instanceof Float32Array)) {
+                    classCode = new Uint8Array(numPoints);
+                    for (let p = 0; p < numPoints; p++)
+                        classCode[p] = raw[p] ?? 0;
+                }
+            }
+        }
+        if (vp.attrLocation.position === undefined) {
+            throw new Error('[s3m] Draco 点云缺少 position 属性');
+        }
+        // 数据自带顶点色优先；没有色但有分类码时，用分类色带烘一份 RGBA8
+        if (vp.attrLocation.color === undefined && classCode) {
+            const out = new Uint8Array(numPoints * 4);
+            for (let p = 0; p < numPoints; p++) {
+                const c = CLASS_COLORS[classCode[p]] ?? CLASS_COLORS[0];
+                out[p * 4] = c[0];
+                out[p * 4 + 1] = c[1];
+                out[p * 4 + 2] = c[2];
+                out[p * 4 + 3] = 255;
+            }
+            pushAttr(vp, 'color', out, 4, 4, 0, undefined, 'u8');
+        }
+        vp.verticesCount = numPoints;
+        return [pointPack()];
+    }
+    finally {
+        // embind 对象占的是 wasm 堆，不显式释放会一直涨
+        try {
+            draco.destroy(decoder);
+            draco.destroy(geometry);
+        }
+        catch {
+            // 某些构建没有 destroy，忽略
+        }
+    }
+}
+/* ------------------------------------------------------------ 工具 */
+/** 点云包：索引只是点序号，交给渲染层走 drawRange */
+function pointPack() {
+    return {
+        indexCount: 0,
+        indexType: 0,
+        useIndex: 0,
+        primitiveType: POINT_PRIMITIVE,
+        indices: null,
+        passNames: [],
+    };
+}
+function pushAttr(vp, semantic, data, components, stride, offset = 0, divisor, dtype = 'f32') {
+    vp.attrLocation[semantic] = vp.vertexAttributes.length;
+    vp.vertexAttributes.push({
+        semantic,
+        data,
+        components,
+        stride,
+        offsetInBytes: offset,
+        divisor,
+        dtype,
+    });
+}
+function clamp255(v) {
+    return v <= 0 ? 0 : v >= 1 ? 255 : Math.round(v * 255);
+}
+function safeJson(s) {
+    try {
+        return JSON.parse(s);
+    }
+    catch {
+        return s;
+    }
+}
+//# sourceMappingURL=Draco.js.map

package/dist/core/Draco.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Draco.js","sourceRoot":"","sources":["../../src/core/Draco.ts"],"names":[],"mappings":"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"}

package/dist/core/MeshOpt.d.ts

@@ -55,12 +55,13 @@ export interface MeshOptBlockInfo {
     }>;
 }
 /**
- * 读取一个 MeshOpt 压缩的 Skeleton。
+ * 读取一个 MeshOpt 压缩的 Skeleton，以及**内嵌在块之间的索引包**。
  *
  * 二进制布局（v3.01 实测）：
  * ```
  * uint32  compressOptions            // 0x13 = Position | Normal | TexCoord
- * uint32  blockCount                 // 实测恒为 1
+ * uint32  blockCount                 // 实测 1 或 2
+ *   ↑ 下面整段重复 blockCount 次：
  *   uint32  vertexCount
  *   float32 vertCompressConstant
  *   float64 minVerticesValue.xyz
@@ -76,9 +77,19 @@ export interface MeshOptBlockInfo {
  *     pad4
  *   String  descript                // {"TextureCoordMatrix":1,"VertexWeight":0}
  *   pad4
+ *   IndexPackage[]                  // ← 每块各带一份，不是所有块之后再统一放
  * ```
+ *
+ * 注意最后一行：blockCount > 1 时索引包夹在块与块之间。之前按「读完所有块再读索引包」
+ * 处理，会把第一块的索引包当成第二块的块头，读出天文数字的 compressedSize。
+ *
+ * 多块是同一份几何的拆分，这里把各块属性按顺序拼成一条流，并把各块索引加上
+ * 顶点基数偏移，对外仍是一份顶点缓冲 + 多组索引包，下游无需改动。
  */
-export declare function parseMeshOptSkeleton(r: BinaryReader, vp: VertexPackage): Promise<MeshOptBlockInfo>;
+export declare function parseMeshOptGeometry(r: BinaryReader, vp: VertexPackage): Promise<{
+    info: MeshOptBlockInfo;
+    indexPackages: IndexPackage[];
+}>;
 /**
  * MeshOpt 骨架的索引包。
  * 与标准骨架相比只多了一个 `compressedSize`，其余字段顺序一致；

package/dist/core/MeshOpt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MeshOpt.d.ts","sourceRoot":"","sources":["../../src/core/MeshOpt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAmB,aAAa,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAE1E,sBAAsB;AACtB,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAalB,CAAC;AAOX;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,cAAc,CAAC,CAU5D;AAuFD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,wCAAwC;IACxC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB;IACjB,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,cAAc,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACxC,qBAAqB;IACrB,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrE;AAiBD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0JxG;AAID;;;;GAIG;AACH,wBAAsB,yBAAyB,CAAC,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA0CxF"}
+{"version":3,"file":"MeshOpt.d.ts","sourceRoot":"","sources":["../../src/core/MeshOpt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAmB,aAAa,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAE1E,sBAAsB;AACtB,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAalB,CAAC;AAOX;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,cAAc,CAAC,CAU5D;AAuFD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,wCAAwC;IACxC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB;IACjB,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,cAAc,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACxC,qBAAqB;IACrB,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrE;AA4DD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,oBAAoB,CACxC,CAAC,EAAE,YAAY,EACf,EAAE,EAAE,aAAa,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,aAAa,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC,CA8MpE;AAID;;;;GAIG;AACH,wBAAsB,yBAAyB,CAAC,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA0CxF"}

package/dist/core/MeshOpt.js

@@ -116,13 +116,41 @@ const SEMANTIC_NAME = {
     [MeshOptSemantic.GS_SCALE]: 'gsScale',
     [MeshOptSemantic.GS_ROTATION]: 'gsRotation',
 };
+function pushSink(sinks, semantic, dtype, components, chunk) {
+    let sink = sinks.get(semantic);
+    if (!sink) {
+        sink = { dtype, components, chunks: [], length: 0 };
+        sinks.set(semantic, sink);
+    }
+    sink.chunks.push(chunk);
+    sink.length += chunk.length;
+}
 /**
- * 读取一个 MeshOpt 压缩的 Skeleton。
+ * 索引是块内局部编号（实测 max index 恰为所在块的 vertexCount - 1），
+ * 多块合并成一份顶点缓冲后要整体加上该块的顶点基数。
+ *
+ * 用 DataView 而不是 Uint32Array：未压缩索引那段是底层 buffer 的 subarray，
+ * byteOffset 未必 4 字节对齐，直接建 Uint32Array 会抛 RangeError。
+ */
+function offsetIndices(packs, base) {
+    for (const pack of packs) {
+        const buf = pack.indices;
+        if (!buf || pack.indexCount <= 0 || buf.byteLength < pack.indexCount * 4)
+            continue;
+        const dv = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
+        for (let i = 0; i < pack.indexCount; i++) {
+            dv.setUint32(i * 4, dv.getUint32(i * 4, true) + base, true);
+        }
+    }
+}
+/**
+ * 读取一个 MeshOpt 压缩的 Skeleton，以及**内嵌在块之间的索引包**。
  *
  * 二进制布局（v3.01 实测）：
  * ```
  * uint32  compressOptions            // 0x13 = Position | Normal | TexCoord
- * uint32  blockCount                 // 实测恒为 1
+ * uint32  blockCount                 // 实测 1 或 2
+ *   ↑ 下面整段重复 blockCount 次：
  *   uint32  vertexCount
  *   float32 vertCompressConstant
  *   float64 minVerticesValue.xyz
@@ -138,13 +166,23 @@ const SEMANTIC_NAME = {
  *     pad4
  *   String  descript                // {"TextureCoordMatrix":1,"VertexWeight":0}
  *   pad4
+ *   IndexPackage[]                  // ← 每块各带一份，不是所有块之后再统一放
  * ```
+ *
+ * 注意最后一行：blockCount > 1 时索引包夹在块与块之间。之前按「读完所有块再读索引包」
+ * 处理，会把第一块的索引包当成第二块的块头，读出天文数字的 compressedSize。
+ *
+ * 多块是同一份几何的拆分，这里把各块属性按顺序拼成一条流，并把各块索引加上
+ * 顶点基数偏移，对外仍是一份顶点缓冲 + 多组索引包，下游无需改动。
  */
-export async function parseMeshOptSkeleton(r, vp) {
+export async function parseMeshOptGeometry(r, vp) {
     const decoder = await loadMeshoptDecoder();
     const compressOptions = r.u32();
     vp.compressOptions = compressOptions;
     const blockCount = r.u32();
+    if (blockCount > 64) {
+        throw new Error(`[s3m] MeshOpt 块数异常：blockCount=${blockCount}`);
+    }
     const info = {
         vertexCount: 0,
         compressOptions,
@@ -160,6 +198,10 @@ export async function parseMeshOptSkeleton(r, vp) {
         ],
         streams: [],
     };
+    const sinks = new Map();
+    const indexPackages = [];
+    let baseVertex = 0;
+    let hasCustomAttribute = false;
     for (let bi = 0; bi < blockCount; bi++) {
         const vertexCount = r.u32();
         const vertScale = r.f32();
@@ -178,14 +220,11 @@ export async function parseMeshOptSkeleton(r, vp) {
                 texCoordOffset.push([a, b]);
         }
         const attrCount = r.i32();
-        const decodeThisBlock = bi === 0;
-        if (decodeThisBlock) {
-            info.vertexCount = vertexCount;
-            info.vertScale = vertScale;
+        if (bi === 0) {
             info.minVertices = [minX, minY, minZ];
+            info.vertScale = vertScale;
             info.texCoordScale = texCoordScale;
             info.texCoordOffset = texCoordOffset;
-            vp.verticesCount = vertexCount;
         }
         for (let ai = 0; ai < attrCount; ai++) {
             const semantic = r.i32();
@@ -199,8 +238,6 @@ export async function parseMeshOptSkeleton(r, vp) {
             const compressedSize = r.i32();
             const data = r.bytes(compressedSize);
             r.align4();
-            if (!decodeThisBlock)
-                continue;
             // 切线流我们不用（渲染里没有法线贴图通道），解不出来也不该拖垮整个瓦片：
             // 真实服务里带 PBR 的数据（如 SubwayStationCombined）都带这条流，之前直接抛错导致整套数据不可见
             if (semantic === MeshOptSemantic.TANGENT) {
@@ -235,7 +272,7 @@ export async function parseMeshOptSkeleton(r, vp) {
                     pos[i * 3 + 1] = minY + u16[i * 4 + 1] * vertScale;
                     pos[i * 3 + 2] = minZ + u16[i * 4 + 2] * vertScale;
                 }
-                vp.vertexAttributes.push(f32Attribute('position', pos, 3));
+                pushSink(sinks, 'position', 'f32', 3, pos);
             }
             else if (semantic === MeshOptSemantic.NORMAL) {
                 const i16 = new Int16Array(out.buffer, out.byteOffset, vertexCount * 2);
@@ -243,13 +280,13 @@ export async function parseMeshOptSkeleton(r, vp) {
                 for (let i = 0; i < vertexCount; i++) {
                     octDecode(i16[i * 2] / 32767, i16[i * 2 + 1] / 32767, nrm, i * 3);
                 }
-                vp.vertexAttributes.push(f32Attribute('normal', nrm, 3));
+                pushSink(sinks, 'normal', 'f32', 3, nrm);
             }
             else if (semantic === MeshOptSemantic.COLOR) {
-                vp.vertexAttributes.push(u8Attribute('color', out, 4));
+                pushSink(sinks, 'color', 'u8', 4, out);
             }
             else if (semantic === MeshOptSemantic.COLOR1) {
-                vp.vertexAttributes.push(u8Attribute('color2', out, 4));
+                pushSink(sinks, 'color2', 'u8', 4, out);
             }
             else if (semantic === MeshOptSemantic.TEXCOORD0 || semantic === MeshOptSemantic.TEXCOORD1) {
                 const slot = semantic === MeshOptSemantic.TEXCOORD0 ? 0 : 1;
@@ -268,13 +305,23 @@ export async function parseMeshOptSkeleton(r, vp) {
                         uv[i * 2 + 1] = offset[1] + u16[i * 2 + 1] * scale[1];
                     }
                 }
-                vp.vertexAttributes.push(f32Attribute(slot === 0 ? 'uv' : 'uv2', uv, 2));
+                pushSink(sinks, slot === 0 ? 'uv' : 'uv2', 'f32', 2, uv);
+            }
+            else if (semantic === MeshOptSemantic.CUSTOM0 ||
+                semantic === MeshOptSemantic.CUSTOM1 ||
+                semantic === MeshOptSemantic.GS_SCALE ||
+                semantic === MeshOptSemantic.GS_ROTATION) {
+                // 自定义属性流 / 高斯泼溅的逐点参数：原样保留解码结果（每点 stride 字节），
+                // 语义由 vp.customVertexAttribute 的名字→槽位映射给出。
+                // 以前这里直接丢掉，导致 3DGaussianSplatting 数据只剩「点 + 颜色」，
+                // 上层永远拿不到泼溅尺寸与朝向。
+                pushSink(sinks, SEMANTIC_NAME[semantic], 'u8', stride, out);
             }
-            // tangent / custom / GS 系列暂不使用
         }
         const descript = r.string();
         r.align4();
-        if (decodeThisBlock && descript) {
+        if (descript && !hasCustomAttribute) {
+            hasCustomAttribute = true;
             try {
                 vp.customVertexAttribute = JSON.parse(descript);
             }
@@ -282,12 +329,48 @@ export async function parseMeshOptSkeleton(r, vp) {
                 vp.customVertexAttribute = descript;
             }
         }
+        // 每块后面紧跟自己的索引包（blockCount = 1 时等价于「骨架之后读索引包」）
+        const packs = await parseMeshOptIndexPackages(r);
+        if (baseVertex > 0)
+            offsetIndices(packs, baseVertex);
+        indexPackages.push(...packs);
+        baseVertex += vertexCount;
+    }
+    // blockCount = 0 的老数据：索引包仍然跟在骨架后面
+    if (blockCount === 0) {
+        indexPackages.push(...(await parseMeshOptIndexPackages(r)));
+    }
+    info.vertexCount = baseVertex;
+    vp.verticesCount = baseVertex;
+    // 留下原始流清单：诊断用，也是接自定义属性 / 高斯泼溅属性的入口
+    vp.meshOptInfo = info;
+    // 跨块拼接：属性流长度按理各块一致，缺块时补 0，宁可少一块颜色也不整块不可见
+    for (const [semantic, sink] of sinks) {
+        const expected = baseVertex * sink.components;
+        if (sink.dtype === 'f32') {
+            const out = new Float32Array(expected);
+            let off = 0;
+            for (const chunk of sink.chunks) {
+                out.set(chunk, off);
+                off += chunk.length;
+            }
+            vp.vertexAttributes.push(f32Attribute(semantic, out, sink.components));
+        }
+        else {
+            const out = new Uint8Array(expected);
+            let off = 0;
+            for (const chunk of sink.chunks) {
+                out.set(chunk, off);
+                off += chunk.length;
+            }
+            vp.vertexAttributes.push(u8Attribute(semantic, out, sink.components));
+        }
     }
     // attrLocation 供老接口按名字查索引
     for (let i = 0; i < vp.vertexAttributes.length; i++) {
         vp.attrLocation[`a${vp.vertexAttributes[i].semantic}`] = i;
     }
-    return info;
+    return { info, indexPackages };
 }
 /* ------------------------------------------------------------------ 索引包 */
 /**