s3m-three 0.3.5 → 0.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/assets/s3mWorker-D7AV6O30.js +1 -0
- package/dist/browser/s3m-three.iife.ext-three.js +26 -20
- package/dist/browser/s3m-three.iife.js +26 -20
- package/dist/core/TextureDecode.d.ts +39 -0
- package/dist/core/TextureDecode.d.ts.map +1 -0
- package/dist/core/TextureDecode.js +174 -0
- package/dist/core/TextureDecode.js.map +1 -0
- package/dist/core/TextureFormat.d.ts +22 -2
- package/dist/core/TextureFormat.d.ts.map +1 -1
- package/dist/core/TextureFormat.js +22 -2
- package/dist/core/TextureFormat.js.map +1 -1
- package/dist/core/TileGeometry.d.ts +92 -0
- package/dist/core/TileGeometry.d.ts.map +1 -0
- package/dist/core/TileGeometry.js +607 -0
- package/dist/core/TileGeometry.js.map +1 -0
- package/dist/render/DatasetManager.d.ts +2 -0
- package/dist/render/DatasetManager.d.ts.map +1 -1
- package/dist/render/DatasetManager.js +1 -0
- package/dist/render/DatasetManager.js.map +1 -1
- package/dist/render/FeatureStyleManager.d.ts +4 -2
- package/dist/render/FeatureStyleManager.d.ts.map +1 -1
- package/dist/render/FeatureStyleManager.js +33 -1
- package/dist/render/FeatureStyleManager.js.map +1 -1
- package/dist/render/GeometryBuilder.d.ts +8 -10
- package/dist/render/GeometryBuilder.d.ts.map +1 -1
- package/dist/render/GeometryBuilder.js +77 -555
- package/dist/render/GeometryBuilder.js.map +1 -1
- package/dist/render/S3MViewer.d.ts +4 -0
- package/dist/render/S3MViewer.d.ts.map +1 -1
- package/dist/render/S3MViewer.js +13 -2
- package/dist/render/S3MViewer.js.map +1 -1
- package/dist/render/StyleMaterial.d.ts.map +1 -1
- package/dist/render/StyleMaterial.js +6 -0
- package/dist/render/StyleMaterial.js.map +1 -1
- package/dist/render/TextureFactory.d.ts +9 -19
- package/dist/render/TextureFactory.d.ts.map +1 -1
- package/dist/render/TextureFactory.js +62 -115
- package/dist/render/TextureFactory.js.map +1 -1
- package/dist/tileset/S3MTileset.d.ts +21 -0
- package/dist/tileset/S3MTileset.d.ts.map +1 -1
- package/dist/tileset/S3MTileset.js +41 -2
- package/dist/tileset/S3MTileset.js.map +1 -1
- package/dist/worker/S3MWorkerClient.d.ts +48 -0
- package/dist/worker/S3MWorkerClient.d.ts.map +1 -0
- package/dist/worker/S3MWorkerClient.js +124 -0
- package/dist/worker/S3MWorkerClient.js.map +1 -0
- package/dist/worker/s3mWorker.d.ts +2 -0
- package/dist/worker/s3mWorker.d.ts.map +1 -0
- package/dist/worker/s3mWorker.js +56 -0
- package/dist/worker/s3mWorker.js.map +1 -0
- package/dist/worker/transferables.d.ts +14 -0
- package/dist/worker/transferables.d.ts.map +1 -0
- package/dist/worker/transferables.js +61 -0
- package/dist/worker/transferables.js.map +1 -0
- package/docs/API.md +6 -0
- package/package.json +1 -1
- package/src/core/TextureDecode.ts +224 -0
- package/src/core/TextureFormat.ts +23 -2
- package/src/core/TileGeometry.ts +745 -0
- package/src/render/DatasetManager.ts +3 -0
- package/src/render/FeatureStyleManager.ts +31 -2
- package/src/render/GeometryBuilder.ts +91 -617
- package/src/render/S3MViewer.ts +18 -4
- package/src/render/StyleMaterial.ts +6 -0
- package/src/render/TextureFactory.ts +78 -123
- package/src/tileset/S3MTileset.ts +55 -3
- package/src/worker/S3MWorkerClient.ts +159 -0
- package/src/worker/s3mWorker.ts +76 -0
- package/src/worker/transferables.ts +58 -0
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import type { S3MTexture } from './types.js';
|
|
2
|
+
/** 解码产物:rgba 与 bitmap 二选一,都为 null = 解码失败 / 格式不支持 */
|
|
3
|
+
export interface DecodedTextureData {
|
|
4
|
+
/** 实际走的解码路径('crn->dxt5' / 'dxt1' / 'raw' / 'webp' / 'crn(failed)' / 'unsupported(...)') */
|
|
5
|
+
kind: string;
|
|
6
|
+
width: number;
|
|
7
|
+
height: number;
|
|
8
|
+
/** RGBA8 像素(已按需翻行) */
|
|
9
|
+
rgba: Uint8Array | null;
|
|
10
|
+
/** WEBP 路径的解码结果(ImageBitmap 可 transfer,主线程直接 new THREE.Texture 包) */
|
|
11
|
+
bitmap: ImageBitmap | null;
|
|
12
|
+
hasAlpha: boolean;
|
|
13
|
+
/**
|
|
14
|
+
* 压缩直传模式(decodeTextureData 的 compressed 选项):不解码,原样返回 DXT 块,
|
|
15
|
+
* 主线程用 CompressedTexture 硬件解压上传。与 rgba 互斥。
|
|
16
|
+
*/
|
|
17
|
+
blocks?: Uint8Array;
|
|
18
|
+
blockFormat?: 'dxt1' | 'dxt5';
|
|
19
|
+
/** CRN 转码失败时的原始错误(渲染层负责打 warn) */
|
|
20
|
+
error?: string;
|
|
21
|
+
}
|
|
22
|
+
export interface DecodeOptions {
|
|
23
|
+
/**
|
|
24
|
+
* 压缩直传:dxt1/dxt5(含 CRN 转码产物)不解码,原样返回 DXT 块。
|
|
25
|
+
* 仅在宿主支持 WEBGL_compressed_texture_s3tc(+srgb) 时开启;
|
|
26
|
+
* flipY 纹理走不了压缩上传(WebGL 对压缩纹理忽略 UNPACK_FLIP_Y),自动回退解码。
|
|
27
|
+
*/
|
|
28
|
+
compressed?: boolean;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* DXT 块数据的期望字节数:4×4 对齐块 × 每块字节(DXT1=8,DXT5=16)。
|
|
32
|
+
* S3M 纹理宽高不总是 4 的倍数,驱动按声明尺寸算期望大小——对不上就是
|
|
33
|
+
* GL_INVALID_VALUE: glCompressedTexSubImage2D: The <imageSize> does not match。
|
|
34
|
+
* 压缩直传前必须用这个函数把关,不匹配就回退 RGBA 解码。
|
|
35
|
+
*/
|
|
36
|
+
export declare function expectedDxtByteLength(width: number, height: number, format: 'dxt1' | 'dxt5'): number;
|
|
37
|
+
/** 主线程 / Worker 共用的解码入口。不抛错:失败与不支持都体现在返回值里 */
|
|
38
|
+
export declare function decodeTextureData(tex: S3MTexture, options?: DecodeOptions): Promise<DecodedTextureData>;
|
|
39
|
+
//# sourceMappingURL=TextureDecode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TextureDecode.d.ts","sourceRoot":"","sources":["../../src/core/TextureDecode.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,oDAAoD;AACpD,MAAM,WAAW,kBAAkB;IACjC,2FAA2F;IAC3F,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACxB,qEAAqE;IACrE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAgED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAIpG;AAED,8CAA8C;AAC9C,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAkG7B"}
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* S3M 纹理解码(three 无关,主线程 / Worker 共用同一份实现)
|
|
3
|
+
*
|
|
4
|
+
* 职责到「解出像素数据」为止:DXT 族解块成 RGBA8、CRN 先用 crunch wasm 转码回 DXT
|
|
5
|
+
* 再解块、WEBP 交给 createImageBitmap、RGB 系逐像素重排。产出是纯数据
|
|
6
|
+
* (DecodedTextureData),包成 three 对象由渲染层的 TextureFactory 负责——
|
|
7
|
+
* 这样整份文件可以原样搬进 Worker 跑。
|
|
8
|
+
*
|
|
9
|
+
* 该走哪条解码路径由 compressType 判定(见 core/TextureFormat.ts):
|
|
10
|
+
* v3.00 的 CRN 纹理 pixelFormat 是 13(ABGR)、行标的 CRN 是 32856(GL_RGBA8),
|
|
11
|
+
* 都不是 26 / 27,所以判定只能看 compressType,不能看 pixelFormat。
|
|
12
|
+
*/
|
|
13
|
+
import DXTTextureDecode from './DXTTextureDecode.js';
|
|
14
|
+
import { transcodeCRN } from './CRNDecode.js';
|
|
15
|
+
import { dxtPixelFormatOf, resolveTextureKind, PixelFormat } from './TextureFormat.js';
|
|
16
|
+
/** 行序翻转(原地)。S3MBLOCK 图集按 GL 方向存储(v=0 在最后一行),解码后要翻一次行 */
|
|
17
|
+
function flipRows(rgba, width, height) {
|
|
18
|
+
const row = width * 4;
|
|
19
|
+
const tmp = new Uint8Array(row);
|
|
20
|
+
for (let y = 0; y < height >> 1; y++) {
|
|
21
|
+
const a = y * row;
|
|
22
|
+
const b = (height - 1 - y) * row;
|
|
23
|
+
tmp.set(rgba.subarray(a, a + row));
|
|
24
|
+
rgba.copyWithin(a, b, b + row);
|
|
25
|
+
rgba.set(tmp, b);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
/** 该像素格式自带 alpha 通道(DXT1 的 1bit alpha 不算,历史上没开过 alphaTest) */
|
|
29
|
+
function hasAlphaChannel(pixelFormat) {
|
|
30
|
+
return (pixelFormat === PixelFormat.DXT3 ||
|
|
31
|
+
pixelFormat === PixelFormat.DXT4 ||
|
|
32
|
+
pixelFormat === PixelFormat.DXT5 ||
|
|
33
|
+
pixelFormat === PixelFormat.ARGB ||
|
|
34
|
+
pixelFormat === PixelFormat.ABGR ||
|
|
35
|
+
pixelFormat === PixelFormat.BGRA ||
|
|
36
|
+
pixelFormat === PixelFormat.RGBA);
|
|
37
|
+
}
|
|
38
|
+
/** 解 DXT 到 RGBA8。DXT5 是 1 字节/像素,DXT1 是 0.5 字节/像素。 */
|
|
39
|
+
/** DXT 解码只需要尺寸 / 格式 / 字节,CRN 转码出来的结果也走这条路 */
|
|
40
|
+
function decodeDXT(tex) {
|
|
41
|
+
const { width, height, pixelFormat, data } = tex;
|
|
42
|
+
const out = new Uint8Array(width * height * 4);
|
|
43
|
+
DXTTextureDecode.decode(out, width, height, data, pixelFormat);
|
|
44
|
+
if (tex.flipY)
|
|
45
|
+
flipRows(out, width, height);
|
|
46
|
+
return { rgba: out, hasAlpha: hasAlphaChannel(pixelFormat) };
|
|
47
|
+
}
|
|
48
|
+
function rawRGBA(tex) {
|
|
49
|
+
const { width, height, pixelFormat, data } = tex;
|
|
50
|
+
const out = new Uint8Array(width * height * 4);
|
|
51
|
+
// RGBA / BGRA / ARGB / ABGR 都是 4 字节,前两个是「尾字节是 alpha」,后两个是「首字节是 alpha」
|
|
52
|
+
const hasAlpha = pixelFormat === PixelFormat.RGBA ||
|
|
53
|
+
pixelFormat === PixelFormat.BGRA ||
|
|
54
|
+
pixelFormat === PixelFormat.ARGB ||
|
|
55
|
+
pixelFormat === PixelFormat.ABGR;
|
|
56
|
+
const swapRB = pixelFormat === PixelFormat.BGR || pixelFormat === PixelFormat.BGRA;
|
|
57
|
+
const alphaFirst = pixelFormat === PixelFormat.ARGB || pixelFormat === PixelFormat.ABGR;
|
|
58
|
+
const src = hasAlpha ? 4 : 3;
|
|
59
|
+
for (let i = 0, s = 0, d = 0; i < width * height; i++, s += src, d += 4) {
|
|
60
|
+
const p = alphaFirst ? s + 1 : s;
|
|
61
|
+
out[d] = swapRB ? data[p + 2] : data[p];
|
|
62
|
+
out[d + 1] = data[p + 1];
|
|
63
|
+
out[d + 2] = swapRB ? data[p] : data[p + 2];
|
|
64
|
+
out[d + 3] = hasAlpha ? data[alphaFirst ? s : s + 3] : 255;
|
|
65
|
+
}
|
|
66
|
+
if (tex.flipY)
|
|
67
|
+
flipRows(out, width, height);
|
|
68
|
+
return { rgba: out, hasAlpha: hasAlphaChannel(pixelFormat) };
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* DXT 块数据的期望字节数:4×4 对齐块 × 每块字节(DXT1=8,DXT5=16)。
|
|
72
|
+
* S3M 纹理宽高不总是 4 的倍数,驱动按声明尺寸算期望大小——对不上就是
|
|
73
|
+
* GL_INVALID_VALUE: glCompressedTexSubImage2D: The <imageSize> does not match。
|
|
74
|
+
* 压缩直传前必须用这个函数把关,不匹配就回退 RGBA 解码。
|
|
75
|
+
*/
|
|
76
|
+
export function expectedDxtByteLength(width, height, format) {
|
|
77
|
+
const bw = (width + 3) >> 2;
|
|
78
|
+
const bh = (height + 3) >> 2;
|
|
79
|
+
return bw * bh * (format === 'dxt1' ? 8 : 16);
|
|
80
|
+
}
|
|
81
|
+
/** 主线程 / Worker 共用的解码入口。不抛错:失败与不支持都体现在返回值里 */
|
|
82
|
+
export async function decodeTextureData(tex, options = {}) {
|
|
83
|
+
const empty = {
|
|
84
|
+
kind: 'unsupported(0/0)',
|
|
85
|
+
width: 0,
|
|
86
|
+
height: 0,
|
|
87
|
+
rgba: null,
|
|
88
|
+
bitmap: null,
|
|
89
|
+
hasAlpha: false,
|
|
90
|
+
};
|
|
91
|
+
if (!tex || !tex.width || !tex.height)
|
|
92
|
+
return empty;
|
|
93
|
+
const kind = resolveTextureKind(tex.compressType ?? 0, tex.pixelFormat);
|
|
94
|
+
// 压缩直传的公共前提:不是 GL 翻行图集(压缩上传无法 flipY)
|
|
95
|
+
const canCompress = options.compressed === true && !tex.flipY;
|
|
96
|
+
/** 块数据字节数与 4×4 对齐公式一致才允许直传,否则回退解码 */
|
|
97
|
+
const compressible = (data, w, h, format) => data.byteLength === expectedDxtByteLength(w, h, format);
|
|
98
|
+
if (kind === 'crn') {
|
|
99
|
+
try {
|
|
100
|
+
const crn = await transcodeCRN(tex.data);
|
|
101
|
+
const pf = crn.dxtFormat === 1 ? PixelFormat.DXT1 : PixelFormat.DXT5;
|
|
102
|
+
const fmt = crn.dxtFormat === 1 ? 'dxt1' : 'dxt5';
|
|
103
|
+
if (canCompress && compressible(crn.data, crn.width, crn.height, fmt)) {
|
|
104
|
+
// CRN→DXT 的转码免不了(wasm),但后续的 DXT→RGBA 解块省掉,块数据直传 GPU
|
|
105
|
+
return {
|
|
106
|
+
kind: `crn->dxt${crn.dxtFormat}(c)`,
|
|
107
|
+
width: crn.width,
|
|
108
|
+
height: crn.height,
|
|
109
|
+
rgba: null,
|
|
110
|
+
bitmap: null,
|
|
111
|
+
hasAlpha: pf === PixelFormat.DXT5,
|
|
112
|
+
blocks: crn.data,
|
|
113
|
+
blockFormat: fmt,
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
const decoded = decodeDXT({
|
|
117
|
+
width: crn.width,
|
|
118
|
+
height: crn.height,
|
|
119
|
+
pixelFormat: pf,
|
|
120
|
+
data: crn.data,
|
|
121
|
+
});
|
|
122
|
+
return {
|
|
123
|
+
kind: `crn->dxt${crn.dxtFormat}`,
|
|
124
|
+
width: crn.width,
|
|
125
|
+
height: crn.height,
|
|
126
|
+
rgba: decoded.rgba,
|
|
127
|
+
bitmap: null,
|
|
128
|
+
hasAlpha: decoded.hasAlpha,
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
catch (e) {
|
|
132
|
+
// 一张纹理坏了不该带崩整个瓦片,如实上报并降级成无贴图
|
|
133
|
+
return {
|
|
134
|
+
kind: 'crn(failed)',
|
|
135
|
+
width: tex.width,
|
|
136
|
+
height: tex.height,
|
|
137
|
+
rgba: null,
|
|
138
|
+
bitmap: null,
|
|
139
|
+
hasAlpha: false,
|
|
140
|
+
error: String(e?.message ?? e),
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
if (kind === 'dxt1' || kind === 'dxt3' || kind === 'dxt4' || kind === 'dxt5') {
|
|
145
|
+
const pf = dxtPixelFormatOf(kind);
|
|
146
|
+
// dxt3/dxt4 少见,不进直传白名单;块长与 4×4 对齐公式不符的也回退解码
|
|
147
|
+
if (canCompress && (kind === 'dxt1' || kind === 'dxt5') && compressible(tex.data, tex.width, tex.height, kind)) {
|
|
148
|
+
return {
|
|
149
|
+
kind: `${kind}(c)`,
|
|
150
|
+
width: tex.width,
|
|
151
|
+
height: tex.height,
|
|
152
|
+
rgba: null,
|
|
153
|
+
bitmap: null,
|
|
154
|
+
hasAlpha: kind === 'dxt5',
|
|
155
|
+
blocks: tex.data,
|
|
156
|
+
blockFormat: kind,
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
const decoded = decodeDXT({ ...tex, pixelFormat: pf });
|
|
160
|
+
return { kind, width: tex.width, height: tex.height, rgba: decoded.rgba, bitmap: null, hasAlpha: decoded.hasAlpha };
|
|
161
|
+
}
|
|
162
|
+
if (kind === 'webp') {
|
|
163
|
+
const blob = new Blob([tex.data], { type: 'image/webp' });
|
|
164
|
+
const bitmap = await createImageBitmap(blob);
|
|
165
|
+
return { kind, width: bitmap.width, height: bitmap.height, rgba: null, bitmap, hasAlpha: true };
|
|
166
|
+
}
|
|
167
|
+
if (kind === 'raw') {
|
|
168
|
+
const decoded = rawRGBA(tex);
|
|
169
|
+
return { kind, width: tex.width, height: tex.height, rgba: decoded.rgba, bitmap: null, hasAlpha: decoded.hasAlpha };
|
|
170
|
+
}
|
|
171
|
+
// KTX2 / ETC 需要额外解码器,先如实上报而不是静默出错
|
|
172
|
+
return { ...empty, kind: `unsupported(${tex.compressType}/${tex.pixelFormat})` };
|
|
173
|
+
}
|
|
174
|
+
//# sourceMappingURL=TextureDecode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TextureDecode.js","sourceRoot":"","sources":["../../src/core/TextureDecode.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,28 @@
|
|
|
17
17
|
* 结论:**「是不是 CRN」只能看 compressType**。之前按 pixelFormat 26 / 27 判断,
|
|
18
18
|
* 真实服务里的 CRN 纹理会被当成未知格式整包丢掉(模型变成无贴图的灰模)。
|
|
19
19
|
*/
|
|
20
|
-
/**
|
|
21
|
-
|
|
20
|
+
/**
|
|
21
|
+
* S3M 像素 / 块格式枚举(iClient3D S3MPixelFormat)。
|
|
22
|
+
*
|
|
23
|
+
* 原本住在 render/TextureFactory,纹理解码下沉到 core(Worker 复用)后搬到这里;
|
|
24
|
+
* TextureFactory 保留同名 re-export,对外 API 不变。
|
|
25
|
+
*/
|
|
26
|
+
export declare const PixelFormat: {
|
|
27
|
+
readonly RGB: 10;
|
|
28
|
+
readonly BGR: 11;
|
|
29
|
+
readonly ARGB: 12;
|
|
30
|
+
readonly ABGR: 13;
|
|
31
|
+
readonly BGRA: 14;
|
|
32
|
+
readonly RGBA: 28;
|
|
33
|
+
readonly WEBP: 25;
|
|
34
|
+
readonly DXT1: 17;
|
|
35
|
+
readonly DXT3: 19;
|
|
36
|
+
readonly DXT4: 20;
|
|
37
|
+
readonly DXT5: 21;
|
|
38
|
+
readonly CRN_DXT5: 26;
|
|
39
|
+
readonly STANDARD_CRN: 27;
|
|
40
|
+
};
|
|
41
|
+
/** S3M 3.01(行标)compressType 取值 */ export declare const TextureCompress: {
|
|
22
42
|
readonly NONE: 0;
|
|
23
43
|
readonly DXT1_RGB: 33776;
|
|
24
44
|
readonly DXT1_RGBA: 33777;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureFormat.d.ts","sourceRoot":"","sources":["../../src/core/TextureFormat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,
|
|
1
|
+
{"version":3,"file":"TextureFormat.d.ts","sourceRoot":"","sources":["../../src/core/TextureFormat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;GAKG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcd,CAAC;AAEX,kCAAkC,CAAA,eAAO,MAAM,eAAe;;;;;;;;;IAS5D,cAAc;;CAEN,CAAC;AAEX,mDAAmD;AACnD,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC;AAyD1G;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,WAAW,CAKzF;AAeD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CAE1D"}
|
|
@@ -17,8 +17,28 @@
|
|
|
17
17
|
* 结论:**「是不是 CRN」只能看 compressType**。之前按 pixelFormat 26 / 27 判断,
|
|
18
18
|
* 真实服务里的 CRN 纹理会被当成未知格式整包丢掉(模型变成无贴图的灰模)。
|
|
19
19
|
*/
|
|
20
|
-
/**
|
|
21
|
-
|
|
20
|
+
/**
|
|
21
|
+
* S3M 像素 / 块格式枚举(iClient3D S3MPixelFormat)。
|
|
22
|
+
*
|
|
23
|
+
* 原本住在 render/TextureFactory,纹理解码下沉到 core(Worker 复用)后搬到这里;
|
|
24
|
+
* TextureFactory 保留同名 re-export,对外 API 不变。
|
|
25
|
+
*/
|
|
26
|
+
export const PixelFormat = {
|
|
27
|
+
RGB: 10,
|
|
28
|
+
BGR: 11,
|
|
29
|
+
ARGB: 12,
|
|
30
|
+
ABGR: 13,
|
|
31
|
+
BGRA: 14,
|
|
32
|
+
RGBA: 28,
|
|
33
|
+
WEBP: 25,
|
|
34
|
+
DXT1: 17,
|
|
35
|
+
DXT3: 19,
|
|
36
|
+
DXT4: 20,
|
|
37
|
+
DXT5: 21,
|
|
38
|
+
CRN_DXT5: 26,
|
|
39
|
+
STANDARD_CRN: 27,
|
|
40
|
+
};
|
|
41
|
+
/** S3M 3.01(行标)compressType 取值 */ export const TextureCompress = {
|
|
22
42
|
NONE: 0,
|
|
23
43
|
DXT1_RGB: 33776,
|
|
24
44
|
DXT1_RGBA: 33777,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureFormat.js","sourceRoot":"","sources":["../../src/core/TextureFormat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,
|
|
1
|
+
{"version":3,"file":"TextureFormat.js","sourceRoot":"","sources":["../../src/core/TextureFormat.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* S3M 解析结果 → 纯数据几何组装(three 无关,主线程 / Worker 共用)
|
|
3
|
+
*
|
|
4
|
+
* 从 GeometryBuilder 拆出来的 CPU 密集段:顶点流解交错、法线计算、
|
|
5
|
+
* 同材质合批合并(含 geode 矩阵变换)。产出是「PrimitiveData 列表」——
|
|
6
|
+
* 每个 primitive 就是一份能直接包成 BufferGeometry 的 attribute 字典 + 索引,
|
|
7
|
+
* three 对象(Mesh / 材质 / InstancedMesh)仍由渲染层的 GeometryBuilder 包装。
|
|
8
|
+
*
|
|
9
|
+
* 语义必须与原实现逐位一致(下游拾取 / 单体化 / 图集都依赖):
|
|
10
|
+
* - attribute 省缺补默认:aColor 补白、aBatchId 补 -1、无 index 走 drawRange;
|
|
11
|
+
* - 点云骨架(无索引包)补一个 primitiveType=1 的伪包;
|
|
12
|
+
* - 合批只在 primitiveType=4 且 batching 开启时做,棱线包与实例化网格单独摆放;
|
|
13
|
+
* - 合并时矩阵变换用列主序 mat4(S3M 与 three elements 布局一致),
|
|
14
|
+
* 法线用上 3x3 的逆转置并归一化。
|
|
15
|
+
*/
|
|
16
|
+
import type { ParsedTile, VertexAttribute } from './types.js';
|
|
17
|
+
/**
|
|
18
|
+
* S3M 规范里 `DrawPrimitiveType` 的两个特殊值(原住 GeometryBuilder,随组装层
|
|
19
|
+
* 下沉到 core —— 渲染层从这里 re-export,对外 API 不变):
|
|
20
|
+
* 13 = 数据自带的「棱线包」—— 索引是线段对,不是三角形(把 13 当三角形画,
|
|
21
|
+
* 每条棱线都会被连成一根几十上百米的尖刺);
|
|
22
|
+
* 1 = 点云包。索引是点序号,画成三角面就是满屏彩色尖刺。
|
|
23
|
+
*/
|
|
24
|
+
export declare const LINE_PRIMITIVE = 13;
|
|
25
|
+
export declare const POINT_PRIMITIVE = 1;
|
|
26
|
+
/** 解交错后的属性流:数组 + 分量数 + 是否归一化(对应 THREE.BufferAttribute 三参) */
|
|
27
|
+
export interface PlainAttribute {
|
|
28
|
+
array: Float32Array | Uint8Array | Uint16Array | Uint32Array;
|
|
29
|
+
components: number;
|
|
30
|
+
normalized: boolean;
|
|
31
|
+
}
|
|
32
|
+
/** 非交错整段铺开 / 交错逐元素抽取(原 toBufferAttribute 的数据部分) */
|
|
33
|
+
export declare function deinterleave(attr: VertexAttribute): PlainAttribute;
|
|
34
|
+
export interface BoundsData {
|
|
35
|
+
boxMin: [number, number, number];
|
|
36
|
+
boxMax: [number, number, number];
|
|
37
|
+
sphereCenter: [number, number, number];
|
|
38
|
+
sphereRadius: number;
|
|
39
|
+
}
|
|
40
|
+
/** 等价 BufferGeometry.computeBoundingBox / computeBoundingSphere 的数学部分 */
|
|
41
|
+
export declare function computeBounds(position: ArrayLike<number>, vertexCount: number): BoundsData;
|
|
42
|
+
/** 一个 primitive 的属性字典:键即 geometry attribute 名,数组/分量/归一化齐备 */
|
|
43
|
+
export interface PrimitiveAttributes {
|
|
44
|
+
position: PlainAttribute;
|
|
45
|
+
normal?: PlainAttribute;
|
|
46
|
+
uv?: PlainAttribute;
|
|
47
|
+
uv1?: PlainAttribute;
|
|
48
|
+
aColor: PlainAttribute;
|
|
49
|
+
aBatchId: PlainAttribute;
|
|
50
|
+
aAtlasRect?: PlainAttribute;
|
|
51
|
+
aAtlasRect1?: PlainAttribute;
|
|
52
|
+
aSecUv?: PlainAttribute;
|
|
53
|
+
}
|
|
54
|
+
export interface PrimitiveData {
|
|
55
|
+
/** 首个候选骨架名(userData.skeletonName) */
|
|
56
|
+
skeletonName: string;
|
|
57
|
+
/** 参与合并的 geoPackage 键(主线程重建 geoRef / geoByBatchId) */
|
|
58
|
+
geoNames: string[];
|
|
59
|
+
primitiveType: number;
|
|
60
|
+
passNames: string[];
|
|
61
|
+
/** geode 矩阵(列主序 16 个数)或 null */
|
|
62
|
+
matrix: number[] | null;
|
|
63
|
+
vertexCount: number;
|
|
64
|
+
indexCount: number;
|
|
65
|
+
attributes: PrimitiveAttributes;
|
|
66
|
+
index: Uint16Array | Uint32Array | null;
|
|
67
|
+
bounds: BoundsData;
|
|
68
|
+
/** 合批前候选数(>1 表示是合并产物) */
|
|
69
|
+
batchedFrom?: number;
|
|
70
|
+
}
|
|
71
|
+
export interface TileGeometryStats {
|
|
72
|
+
vertices: number;
|
|
73
|
+
instanced: number;
|
|
74
|
+
edgeLines: number;
|
|
75
|
+
/** 合批前独立网格数(batching 生效时 > meshes) */
|
|
76
|
+
originalMeshes?: number;
|
|
77
|
+
skipped: string[];
|
|
78
|
+
}
|
|
79
|
+
export interface TileGeometryData {
|
|
80
|
+
primitives: PrimitiveData[];
|
|
81
|
+
stats: TileGeometryStats;
|
|
82
|
+
}
|
|
83
|
+
export interface AssembleOptions {
|
|
84
|
+
/** 是否对 primitiveType=4 的三角面做瓦片内同材质合批(默认 true) */
|
|
85
|
+
batching?: boolean;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* 瓦片几何组装入口。与 GeometryBuilder 的摆放/分组逻辑逐位对齐,
|
|
89
|
+
* 但只产出纯数据 —— three 包装在渲染层。
|
|
90
|
+
*/
|
|
91
|
+
export declare function assembleTileGeometry(tile: ParsedTile, options?: AssembleOptions): TileGeometryData;
|
|
92
|
+
//# sourceMappingURL=TileGeometry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TileGeometry.d.ts","sourceRoot":"","sources":["../../src/core/TileGeometry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAIV,UAAU,EACV,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,eAAe,IAAI,CAAC;AAQjC,6DAA6D;AAC7D,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;CACrB;AA4BD,mDAAmD;AACnD,wBAAgB,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,cAAc,CAgClE;AAkFD,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,yEAAyE;AACzE,wBAAgB,aAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,UAAU,CAwB1F;AAID,6DAA6D;AAC7D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,WAAW,CAAC,EAAE,cAAc,CAAC;IAC7B,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,gCAAgC;IAChC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,mBAAmB,CAAC;IAChC,KAAK,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI,CAAC;IACxC,MAAM,EAAE,UAAU,CAAC;IACnB,yBAAyB;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,sCAAsC;IACtC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,iDAAiD;IACjD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAmWD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,eAAoB,GAAG,gBAAgB,CAkHtG"}
|