s3m-three 0.4.21 → 0.4.23
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/s3m-three.iife.ext-three.js +35 -35
- package/dist/browser/s3m-three.iife.js +30 -30
- package/dist/render/DatasetManager.d.ts +30 -0
- package/dist/render/DatasetManager.d.ts.map +1 -1
- package/dist/render/DatasetManager.js +41 -0
- package/dist/render/DatasetManager.js.map +1 -1
- package/dist/render/GeometryBuilder.d.ts +18 -0
- package/dist/render/GeometryBuilder.d.ts.map +1 -1
- package/dist/render/GeometryBuilder.js +4 -1
- package/dist/render/GeometryBuilder.js.map +1 -1
- package/dist/render/S3MViewer.d.ts +68 -11
- package/dist/render/S3MViewer.d.ts.map +1 -1
- package/dist/render/S3MViewer.js +181 -19
- package/dist/render/S3MViewer.js.map +1 -1
- package/dist/render/StyleMaterial.d.ts +23 -2
- package/dist/render/StyleMaterial.d.ts.map +1 -1
- package/dist/render/StyleMaterial.js +35 -5
- package/dist/render/StyleMaterial.js.map +1 -1
- package/dist/render/TextureFactory.d.ts +23 -1
- package/dist/render/TextureFactory.d.ts.map +1 -1
- package/dist/render/TextureFactory.js +32 -8
- package/dist/render/TextureFactory.js.map +1 -1
- package/dist/render/viewer/LightRig.d.ts +21 -7
- package/dist/render/viewer/LightRig.d.ts.map +1 -1
- package/dist/render/viewer/LightRig.js +11 -13
- package/dist/render/viewer/LightRig.js.map +1 -1
- package/dist/render/viewer/types.d.ts +16 -2
- package/dist/render/viewer/types.d.ts.map +1 -1
- package/dist/render/viewer/types.js.map +1 -1
- package/dist/tileset/S3MTileset.d.ts +33 -0
- package/dist/tileset/S3MTileset.d.ts.map +1 -1
- package/dist/tileset/S3MTileset.js +27 -0
- package/dist/tileset/S3MTileset.js.map +1 -1
- package/docs/API.md +26 -5
- package/package.json +1 -1
- package/src/render/DatasetManager.ts +47 -0
- package/src/render/GeometryBuilder.ts +22 -1
- package/src/render/S3MViewer.ts +192 -19
- package/src/render/StyleMaterial.ts +48 -6
- package/src/render/TextureFactory.ts +50 -8
- package/src/render/viewer/LightRig.ts +23 -13
- package/src/render/viewer/types.ts +16 -2
- package/src/tileset/S3MTileset.ts +43 -0
|
@@ -12,6 +12,28 @@ import type { S3MTexture } from '../core/types.js';
|
|
|
12
12
|
import type { DecodedTextureData } from '../core/TextureDecode.js';
|
|
13
13
|
export { PixelFormat } from '../core/TextureFormat.js';
|
|
14
14
|
export declare function setMaxAnisotropy(n: number, cap?: number): void;
|
|
15
|
+
/**
|
|
16
|
+
* 单次创建的纹理参数。三项都可缺省 —— 缺省时读模块级默认（`setSrgbTextureDecode`
|
|
17
|
+
* / `setMaxTextureSize` / `setAnisotropyCap`），所以老调用方行为逐字不变。
|
|
18
|
+
*
|
|
19
|
+
* 图层级隔离靠这条：`S3MLayer` 把自己的渲染 profile 透传进来，不再共享模块级状态。
|
|
20
|
+
*/
|
|
21
|
+
export interface TextureCreateOptions {
|
|
22
|
+
/** 是否做 sRGB 解码（默认读 `getSrgbTextureDecode()`）。`'direct'` 管线传 false */
|
|
23
|
+
srgbDecode?: boolean;
|
|
24
|
+
/** 长边像素上限（默认读 `setMaxTextureSize` 的值）。图集恒不缩放 */
|
|
25
|
+
maxSize?: number;
|
|
26
|
+
/** 各向异性上限（默认读 `setAnisotropyCap` 的值）。Infinity = 取 GPU 最大值 */
|
|
27
|
+
anisotropyCap?: number;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* 把各向异性上限**即时应用**到一批已上传的纹理。
|
|
31
|
+
*
|
|
32
|
+
* `anisotropy` 是采样参数，不需要重新解码 —— 改值 + `needsUpdate` 让 three 重传一次
|
|
33
|
+
* 即可，代价远小于重载瓦片。图集纹理（`configureAtlas` 打过 `s3mNoAniso` 标记）
|
|
34
|
+
* 保持 1：它关了 mip、靠子区域 rect 自己算层级，开各向异性会把相邻子区域混进来。
|
|
35
|
+
*/
|
|
36
|
+
export declare function applyAnisotropyCap(textures: Iterable<THREE.Texture>, cap: number): void;
|
|
15
37
|
/**
|
|
16
38
|
* 单独调各向异性上限（只影响之后创建的纹理）。
|
|
17
39
|
* supermap 预设会设成 1 —— 官方 iClient3D 不开各向异性，斜视角直接采高 mip
|
|
@@ -30,5 +52,5 @@ export declare function setTextureOffThreadDecode(fn: ((tex: S3MTexture, compres
|
|
|
30
52
|
/** 切换纹理解码（只影响之后创建的纹理，已上传 GPU 的不受影响） */
|
|
31
53
|
export declare function setSrgbTextureDecode(v: boolean): void;
|
|
32
54
|
export declare function getSrgbTextureDecode(): boolean;
|
|
33
|
-
export declare function createTexture(tex: S3MTexture | null | undefined): Promise<DecodedTexture>;
|
|
55
|
+
export declare function createTexture(tex: S3MTexture | null | undefined, opts?: TextureCreateOptions): Promise<DecodedTexture>;
|
|
34
56
|
//# sourceMappingURL=TextureFactory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureFactory.d.ts","sourceRoot":"","sources":["../../src/render/TextureFactory.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAcvD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,SAAW,GAAG,IAAI,CAGhE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAElD;AAQD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjD;AAUD,wBAAgB,8BAA8B,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAE/D;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;IAC9B,qDAAqD;IACrD,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,GAC1G,IAAI,CAEN;AAuBD,uCAAuC;AACvC,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAErD;AAED,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;
|
|
1
|
+
{"version":3,"file":"TextureFactory.d.ts","sourceRoot":"","sources":["../../src/render/TextureFactory.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAcvD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,SAAW,GAAG,IAAI,CAGhE;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,qEAAqE;IACrE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAOD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAQvF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAElD;AAQD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjD;AAUD,wBAAgB,8BAA8B,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAE/D;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;IAC9B,qDAAqD;IACrD,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,GAC1G,IAAI,CAEN;AAuBD,uCAAuC;AACvC,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAErD;AAED,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;AAqCD,wBAAsB,aAAa,CACjC,GAAG,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,EAClC,IAAI,GAAE,oBAAyB,GAC9B,OAAO,CAAC,cAAc,CAAC,CAwDzB"}
|
|
@@ -24,6 +24,28 @@ export function setMaxAnisotropy(n, cap = Infinity) {
|
|
|
24
24
|
maxAnisotropy = Math.max(1, n | 0);
|
|
25
25
|
anisotropyCap = Number.isFinite(cap) && cap > 0 ? Math.max(1, cap) : Infinity;
|
|
26
26
|
}
|
|
27
|
+
/** 把「上限」解析成实际的 anisotropy 值（GPU 最大值与 cap 取小） */
|
|
28
|
+
function resolveAnisotropy(cap) {
|
|
29
|
+
return Number.isFinite(cap) && cap > 0 ? Math.min(maxAnisotropy, Math.max(1, cap)) : maxAnisotropy;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* 把各向异性上限**即时应用**到一批已上传的纹理。
|
|
33
|
+
*
|
|
34
|
+
* `anisotropy` 是采样参数，不需要重新解码 —— 改值 + `needsUpdate` 让 three 重传一次
|
|
35
|
+
* 即可，代价远小于重载瓦片。图集纹理（`configureAtlas` 打过 `s3mNoAniso` 标记）
|
|
36
|
+
* 保持 1：它关了 mip、靠子区域 rect 自己算层级，开各向异性会把相邻子区域混进来。
|
|
37
|
+
*/
|
|
38
|
+
export function applyAnisotropyCap(textures, cap) {
|
|
39
|
+
const n = resolveAnisotropy(cap);
|
|
40
|
+
for (const tex of textures) {
|
|
41
|
+
if (!tex || tex.userData?.s3mNoAniso)
|
|
42
|
+
continue;
|
|
43
|
+
if (tex.anisotropy === n)
|
|
44
|
+
continue;
|
|
45
|
+
tex.anisotropy = n;
|
|
46
|
+
tex.needsUpdate = true;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
27
49
|
/**
|
|
28
50
|
* 单独调各向异性上限（只影响之后创建的纹理）。
|
|
29
51
|
* supermap 预设会设成 1 —— 官方 iClient3D 不开各向异性，斜视角直接采高 mip
|
|
@@ -83,15 +105,15 @@ export function setSrgbTextureDecode(v) {
|
|
|
83
105
|
export function getSrgbTextureDecode() {
|
|
84
106
|
return srgbTextureDecode;
|
|
85
107
|
}
|
|
86
|
-
function configure(tex, srgb = true) {
|
|
108
|
+
function configure(tex, srgb = true, opts = {}) {
|
|
87
109
|
tex.wrapS = THREE.RepeatWrapping;
|
|
88
110
|
tex.wrapT = THREE.RepeatWrapping;
|
|
89
111
|
tex.magFilter = THREE.LinearFilter;
|
|
90
112
|
tex.minFilter = THREE.LinearMipmapLinearFilter;
|
|
91
113
|
tex.generateMipmaps = true;
|
|
92
114
|
// 各向异性过滤对斜视角立面清晰度的提升比提高分辨率更直接
|
|
93
|
-
tex.anisotropy = anisotropyCap
|
|
94
|
-
if (srgb && srgbTextureDecode)
|
|
115
|
+
tex.anisotropy = resolveAnisotropy(opts.anisotropyCap ?? anisotropyCap);
|
|
116
|
+
if (srgb && (opts.srgbDecode ?? srgbTextureDecode))
|
|
95
117
|
tex.colorSpace = THREE.SRGBColorSpace;
|
|
96
118
|
tex.flipY = false;
|
|
97
119
|
tex.needsUpdate = true;
|
|
@@ -105,17 +127,19 @@ function configure(tex, srgb = true) {
|
|
|
105
127
|
* 自动选的层级会把相邻子区域混进来，远处就是一糊串色 —— 实测照抄公式但留着 GPU mip
|
|
106
128
|
* 时，画面反而比不改更糟，就是因为这两个变量叠在一起了。
|
|
107
129
|
*/
|
|
108
|
-
function configureAtlas(tex) {
|
|
109
|
-
configure(tex);
|
|
130
|
+
function configureAtlas(tex, opts = {}) {
|
|
131
|
+
configure(tex, true, opts);
|
|
110
132
|
tex.wrapS = THREE.ClampToEdgeWrapping;
|
|
111
133
|
tex.wrapT = THREE.ClampToEdgeWrapping;
|
|
112
134
|
tex.minFilter = THREE.LinearFilter;
|
|
113
135
|
tex.generateMipmaps = false;
|
|
114
136
|
tex.anisotropy = 1;
|
|
137
|
+
// 标记给 applyAnisotropyCap：图集不吃各向异性上限（见该函数注释）
|
|
138
|
+
tex.userData.s3mNoAniso = true;
|
|
115
139
|
tex.needsUpdate = true;
|
|
116
140
|
return tex;
|
|
117
141
|
}
|
|
118
|
-
export async function createTexture(tex) {
|
|
142
|
+
export async function createTexture(tex, opts = {}) {
|
|
119
143
|
if (!tex || !tex.width || !tex.height)
|
|
120
144
|
return { texture: null, decoded: 'empty' };
|
|
121
145
|
// 图集纹理（flipY 的原始 DXT 图集 / AtlasPack 拼出来的 RGBA 大图 / leaf 组合画布）都必须
|
|
@@ -124,7 +148,7 @@ export async function createTexture(tex) {
|
|
|
124
148
|
// 压缩直传只在「宿主 GL 支持 + 非图集」时开：图集要 flipY / 无 mip，压缩上传做不了翻行
|
|
125
149
|
const wantCompressed = compressedTexturesSupported && !isAtlas;
|
|
126
150
|
// 尺寸上限同样跳过图集：UV 已重映射到子区域，缩放会让整体错位
|
|
127
|
-
const sizeCap = isAtlas ? Infinity : maxTextureSize;
|
|
151
|
+
const sizeCap = isAtlas ? Infinity : (opts.maxSize ?? maxTextureSize);
|
|
128
152
|
const data = await decodeTexture(tex, wantCompressed, sizeCap);
|
|
129
153
|
if (!data.rgba && !data.blocks && !data.bitmap) {
|
|
130
154
|
if (data.error) {
|
|
@@ -155,7 +179,7 @@ export async function createTexture(tex) {
|
|
|
155
179
|
texture = dt;
|
|
156
180
|
}
|
|
157
181
|
texture.needsUpdate = true;
|
|
158
|
-
const configured = isAtlas ? configureAtlas(texture) : configure(texture);
|
|
182
|
+
const configured = isAtlas ? configureAtlas(texture, opts) : configure(texture, true, opts);
|
|
159
183
|
if (data.blocks) {
|
|
160
184
|
configured.generateMipmaps = false;
|
|
161
185
|
// 带链 → 三线性取链上高层级（官方同款平均效果）；纯 level0 才退回 Linear 兜底
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextureFactory.js","sourceRoot":"","sources":["../../src/render/TextureFactory.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,4CAA4C;AAC5C,IAAI,aAAa,GAAG,CAAC,CAAC;AAEtB;;;;;;GAMG;AACH,IAAI,aAAa,GAAG,QAAQ,CAAC;AAE7B,MAAM,UAAU,gBAAgB,CAAC,CAAS,EAAE,GAAG,GAAG,QAAQ;IACxD,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACnC,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAChF,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAChF,CAAC;AAED;;;GAGG;AACH,IAAI,cAAc,GAAG,QAAQ,CAAC;AAE9B,MAAM,UAAU,iBAAiB,CAAC,CAAS;IACzC,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC/D,CAAC;AAED;;;;;GAKG;AACH,IAAI,2BAA2B,GAAG,KAAK,CAAC;AAExC,MAAM,UAAU,8BAA8B,CAAC,CAAU;IACvD,2BAA2B,GAAG,CAAC,CAAC;AAClC,CAAC;AAQD;;;;GAIG;AACH,IAAI,eAAe,GAER,IAAI,CAAC;AAEhB,MAAM,UAAU,yBAAyB,CACvC,EAA2G;IAE3G,eAAe,GAAG,EAAE,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,GAAe,EACf,UAAmB,EACnB,OAAe;IAEf,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAClE,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC;IAClC,CAAC;IACD,OAAO,iBAAiB,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;GAMG;AACH,IAAI,iBAAiB,GAAG,IAAI,CAAC;AAE7B,uCAAuC;AACvC,MAAM,UAAU,oBAAoB,CAAC,CAAU;IAC7C,iBAAiB,GAAG,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,SAAS,CAA0B,GAAM,EAAE,IAAI,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"TextureFactory.js","sourceRoot":"","sources":["../../src/render/TextureFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,16 @@
|
|
|
4
4
|
* 从 `S3MViewer` 里整体搬出来的第一块 —— 它只依赖 `scene` / `renderer` / 共享
|
|
5
5
|
* uniform / 宿主方位角，不碰几何、瓦片、拾取，是耦合最低的一块。
|
|
6
6
|
*
|
|
7
|
-
* ##
|
|
7
|
+
* ## 颜色管线是图层级的
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
9
|
+
* 颜色管线 / 纹理解码 / 各向异性三者一起决定「官方 supermap 观感」，都由
|
|
10
|
+
* `ctx.applyRenderProfile` 落到本图层（见 `S3MViewer._applyRenderProfile`），
|
|
11
|
+
* 不再写模块级全局 —— 同页两个 viewer 用不同预设互不影响，已加载瓦片也会
|
|
12
|
+
* 当场重建材质、重传纹理，不用重载。
|
|
13
13
|
*/
|
|
14
14
|
import * as THREE from 'three';
|
|
15
15
|
import { type LightingPreset } from '../lightingPreset.js';
|
|
16
|
+
import type { ColorPipeline } from '../StyleMaterial.js';
|
|
16
17
|
import type { LightOptions, S3MViewerOptions } from '../S3MViewer.js';
|
|
17
18
|
import type { StyleUniforms } from '../../core/types.js';
|
|
18
19
|
/**
|
|
@@ -28,6 +29,17 @@ export interface LightRigContext {
|
|
|
28
29
|
getBearing?: () => number | undefined;
|
|
29
30
|
/** 宿主需要重画的信号 */
|
|
30
31
|
repaint: () => void;
|
|
32
|
+
/**
|
|
33
|
+
* 应用图层级渲染 profile（颜色管线 + 各向异性）。
|
|
34
|
+
*
|
|
35
|
+
* `initial = true` 是构造期：那时还没有瓦片与材质，落地方只记状态即可。
|
|
36
|
+
* 换掉以前的 `setColorPipeline` / `setSrgbTextureDecode` / `setAnisotropyCap`
|
|
37
|
+
* 三个模块级全局调用 —— 它们会让同页多图层互相污染。
|
|
38
|
+
*/
|
|
39
|
+
applyRenderProfile: (p: {
|
|
40
|
+
colorPipeline: ColorPipeline;
|
|
41
|
+
anisotropyCap: number;
|
|
42
|
+
}, initial?: boolean) => void;
|
|
31
43
|
}
|
|
32
44
|
export declare class LightRig {
|
|
33
45
|
private readonly ctx;
|
|
@@ -57,9 +69,11 @@ export declare class LightRig {
|
|
|
57
69
|
/**
|
|
58
70
|
* supermap 完整版 = 光照强度 + 颜色管线一起切：
|
|
59
71
|
* direct 管线下纹理不做 sRGB 解码、片元按官方常数 Lambert 直乘（见 lightingPreset.ts）。
|
|
60
|
-
*
|
|
72
|
+
*
|
|
73
|
+
* 这三样（管线 / 解码 / 各向异性）以前都是模块级全局，同页两个图层用不同预设
|
|
74
|
+
* 会互相污染；现在交给 `ctx.applyRenderProfile`，由图层自己持有并透传给材质与纹理。
|
|
61
75
|
*/
|
|
62
|
-
applyColorPipeline(preset: LightingPreset): void;
|
|
76
|
+
applyColorPipeline(preset: LightingPreset, initial?: boolean): void;
|
|
63
77
|
setLightingPreset(preset: LightingPreset): void;
|
|
64
78
|
setLight(options: Partial<LightOptions>): void;
|
|
65
79
|
getLight(): LightOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightRig.d.ts","sourceRoot":"","sources":["../../../src/render/viewer/LightRig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"LightRig.d.ts","sourceRoot":"","sources":["../../../src/render/viewer/LightRig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAoBzD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,MAAM,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;IAC3C,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACtC,gBAAgB;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB;;;;;;OAMG;IACH,kBAAkB,EAAE,CAAC,CAAC,EAAE;QAAE,aAAa,EAAE,aAAa,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7G;AAED,qBAAa,QAAQ;IAkBP,OAAO,CAAC,QAAQ,CAAC,GAAG;IAjBhC,OAAO,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAQ;IAC1C,IAAI,EAAE,KAAK,CAAC,eAAe,GAAG,IAAI,CAAQ;IAC1C,GAAG,EAAE,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAQ;IAC1C,IAAI,EAAE,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAQ;IAE3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,sDAAsD;IACtD,OAAO,CAAC,MAAM,CAAwC;IAEtD,uCAAuC;IACvC,IAAI,KAAK,IAAI,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAE1C;IACD,IAAI,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,GAAG,IAAI,EAE1C;gBAE4B,GAAG,EAAE,eAAe;IAYjD,OAAO,CAAC,OAAO;IAYf,yBAAyB;IACzB,UAAU,IAAI,IAAI;IAOlB,mCAAmC;IACnC,IAAI,OAAO,IAAI,OAAO,CAErB;IAID,OAAO,CAAC,aAAa;IAqBrB;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAkBd;;;;;;OAMG;IACH,kBAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,UAAQ,GAAG,IAAI;IAUjE,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IAS/C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI;IAc9C,QAAQ,IAAI,YAAY;IAIxB,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,QAAQ,SAAM,GAAG,IAAI;IAWpE,cAAc,IAAI;QAAE,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC;QAAC,mBAAmB,EAAE,MAAM,CAAA;KAAE;IAUjF;;;;;;;;;;;;OAYG;IACG,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,OAAO,GAAG,IAAI,EAAE,SAAS,SAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCzF,4BAA4B;IAC5B,OAAO,IAAI,IAAI;CAIhB"}
|
|
@@ -4,17 +4,15 @@
|
|
|
4
4
|
* 从 `S3MViewer` 里整体搬出来的第一块 —— 它只依赖 `scene` / `renderer` / 共享
|
|
5
5
|
* uniform / 宿主方位角，不碰几何、瓦片、拾取，是耦合最低的一块。
|
|
6
6
|
*
|
|
7
|
-
* ##
|
|
7
|
+
* ## 颜色管线是图层级的
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
9
|
+
* 颜色管线 / 纹理解码 / 各向异性三者一起决定「官方 supermap 观感」，都由
|
|
10
|
+
* `ctx.applyRenderProfile` 落到本图层（见 `S3MViewer._applyRenderProfile`），
|
|
11
|
+
* 不再写模块级全局 —— 同页两个 viewer 用不同预设互不影响，已加载瓦片也会
|
|
12
|
+
* 当场重建材质、重传纹理，不用重载。
|
|
13
13
|
*/
|
|
14
14
|
import * as THREE from 'three';
|
|
15
15
|
import { resolveLightingPreset } from '../lightingPreset.js';
|
|
16
|
-
import { setColorPipeline } from '../StyleMaterial.js';
|
|
17
|
-
import { setAnisotropyCap, setSrgbTextureDecode } from '../TextureFactory.js';
|
|
18
16
|
const DEFAULT_LIGHT = {
|
|
19
17
|
ambientIntensity: 0.4,
|
|
20
18
|
ambientColor: 0xffffff,
|
|
@@ -51,7 +49,7 @@ export class LightRig {
|
|
|
51
49
|
const options = ctx.options;
|
|
52
50
|
if (options.lightingPreset && options.lightingPreset !== 'default') {
|
|
53
51
|
Object.assign(this._state, resolveLightingPreset(options.lightingPreset));
|
|
54
|
-
this.applyColorPipeline(options.lightingPreset);
|
|
52
|
+
this.applyColorPipeline(options.lightingPreset, true);
|
|
55
53
|
}
|
|
56
54
|
if (options.light)
|
|
57
55
|
Object.assign(this._state, options.light);
|
|
@@ -126,15 +124,15 @@ export class LightRig {
|
|
|
126
124
|
/**
|
|
127
125
|
* supermap 完整版 = 光照强度 + 颜色管线一起切：
|
|
128
126
|
* direct 管线下纹理不做 sRGB 解码、片元按官方常数 Lambert 直乘（见 lightingPreset.ts）。
|
|
129
|
-
*
|
|
127
|
+
*
|
|
128
|
+
* 这三样（管线 / 解码 / 各向异性）以前都是模块级全局，同页两个图层用不同预设
|
|
129
|
+
* 会互相污染；现在交给 `ctx.applyRenderProfile`，由图层自己持有并透传给材质与纹理。
|
|
130
130
|
*/
|
|
131
|
-
applyColorPipeline(preset) {
|
|
131
|
+
applyColorPipeline(preset, initial = false) {
|
|
132
132
|
const direct = preset === 'supermap';
|
|
133
|
-
setColorPipeline(direct ? 'direct' : 'linear');
|
|
134
|
-
setSrgbTextureDecode(!direct);
|
|
135
133
|
// 官方不开各向异性：远处直接采高 mip 平均成纯色（"灰色滤镜"的一部分）。
|
|
136
134
|
// 我们默认 Infinity（倾斜摄影立面清晰度优先），supermap 模式必须收回。
|
|
137
|
-
|
|
135
|
+
this.ctx.applyRenderProfile({ colorPipeline: direct ? 'direct' : 'linear', anisotropyCap: direct ? 1 : Infinity }, initial);
|
|
138
136
|
}
|
|
139
137
|
setLightingPreset(preset) {
|
|
140
138
|
Object.assign(this._state, resolveLightingPreset(preset));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightRig.js","sourceRoot":"","sources":["../../../src/render/viewer/LightRig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAuB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"LightRig.js","sourceRoot":"","sources":["../../../src/render/viewer/LightRig.ts"],"names":[],"mappings":"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"}
|
|
@@ -167,10 +167,24 @@ export interface S3MViewerOptions {
|
|
|
167
167
|
* - `'lambert'`：`MeshLambertMaterial`，只保留漫反射 + 平行光，片元开销约省一半；
|
|
168
168
|
* 白模 / 纯色 / 按高度着色这类不需要高光的模式肉眼差别很小
|
|
169
169
|
*
|
|
170
|
-
*
|
|
171
|
-
*
|
|
170
|
+
* **图层级**：只定这一层，同页多个图层各用各的，互不覆盖；构造时不会写模块级
|
|
171
|
+
* 默认（`setMaterialQuality`）。不传 = 跟随模块级默认，老用法照旧有效。
|
|
172
|
+
* 只影响**之后创建**的材质 —— 已加载的瓦片要重载，或在图层上调
|
|
173
|
+
* `setMaterialQuality()` 原位重建。
|
|
172
174
|
*/
|
|
173
175
|
materialQuality?: 'pbr' | 'lambert';
|
|
176
|
+
/**
|
|
177
|
+
* 颜色管线（默认 `'linear'`）。
|
|
178
|
+
*
|
|
179
|
+
* - `'linear'`：纹理 sRGB 解码 → 线性 PBR 光照 → linear→sRGB 输出（three 标准姿势）
|
|
180
|
+
* - `'direct'`：官方 iClient3D 的 sRGB 直乘管线，同时把纹理解码关掉（字节值原样进
|
|
181
|
+
* shader）。`lightingPreset: 'supermap'` 会选它
|
|
182
|
+
*
|
|
183
|
+
* **图层级**：只定这一层，同页多图层各用各的；不传 = 跟随模块级默认。
|
|
184
|
+
* 已加载瓦片可以在运行时用 `setColorPipeline(q, { duration })` 平滑切过去
|
|
185
|
+
* （重建材质 + 重传纹理，不重新下载瓦片）。
|
|
186
|
+
*/
|
|
187
|
+
colorPipeline?: 'linear' | 'direct';
|
|
174
188
|
/** 自定义瓦片构建器（测试 / 服务端渲染时注入） */
|
|
175
189
|
buildTile?: BuildTileFn | null;
|
|
176
190
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/render/viewer/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/render/viewer/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/render/viewer/types.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/render/viewer/types.ts"],"names":[],"mappings":";AAoRA,2EAA2E"}
|
|
@@ -3,6 +3,7 @@ import { type AuthenticateFn } from '../core/AuthFetch.js';
|
|
|
3
3
|
import type { S3MBlockAtlasImage } from '../core/S3MBlockParser.js';
|
|
4
4
|
import type { Anchor, ParsedTile, Stats, StyleUniforms } from '../core/types.js';
|
|
5
5
|
import type { TileGeometryData } from '../core/TileGeometry.js';
|
|
6
|
+
import type { TextureCreateOptions } from '../render/TextureFactory.js';
|
|
6
7
|
import type { Group, Texture } from 'three';
|
|
7
8
|
/**
|
|
8
9
|
* 修补路径里没被编码、但会被服务端改写的字符。
|
|
@@ -95,6 +96,12 @@ export type BuildTileFn = (tile: ParsedTile, options: {
|
|
|
95
96
|
factor: number;
|
|
96
97
|
units: number;
|
|
97
98
|
};
|
|
99
|
+
/** 光照模型档位（透传给 buildTileObjects），见 BuildTileOptions.materialQuality */
|
|
100
|
+
materialQuality?: 'pbr' | 'lambert';
|
|
101
|
+
/** 颜色管线（透传给 buildTileObjects），见 BuildTileOptions.colorPipeline */
|
|
102
|
+
colorPipeline?: 'linear' | 'direct';
|
|
103
|
+
/** 纹理创建参数（透传给 buildTileObjects → createTexture） */
|
|
104
|
+
textureOptions?: TextureCreateOptions;
|
|
98
105
|
}) => Promise<{
|
|
99
106
|
group: Group;
|
|
100
107
|
stats: Partial<Stats>;
|
|
@@ -111,6 +118,15 @@ export interface S3MTilesetOptions {
|
|
|
111
118
|
factor: number;
|
|
112
119
|
units: number;
|
|
113
120
|
};
|
|
121
|
+
/**
|
|
122
|
+
* 光照模型档位，透传给 buildTileObjects。不传 = 读模块级默认。
|
|
123
|
+
* 由 DatasetManager 从图层 / 数据集设置带下来。
|
|
124
|
+
*/
|
|
125
|
+
materialQuality?: 'pbr' | 'lambert';
|
|
126
|
+
/** 颜色管线，透传给 buildTileObjects。不传 = 读模块级默认。由图层的渲染 profile 带下来 */
|
|
127
|
+
colorPipeline?: 'linear' | 'direct';
|
|
128
|
+
/** 纹理创建参数（sRGB 解码 / 尺寸上限 / 各向异性上限），透传给 createTexture */
|
|
129
|
+
textureOptions?: TextureCreateOptions;
|
|
114
130
|
/**
|
|
115
131
|
* 是否用 Web Worker 解析经典 `.s3mb` 瓦片（默认开）。
|
|
116
132
|
*
|
|
@@ -257,6 +273,9 @@ export declare class S3MTileset {
|
|
|
257
273
|
private isS3MV1;
|
|
258
274
|
private _buildTile;
|
|
259
275
|
private readonly _polygonOffset;
|
|
276
|
+
private _materialQuality;
|
|
277
|
+
private _colorPipeline;
|
|
278
|
+
private _textureOptions;
|
|
260
279
|
private readonly _uniforms;
|
|
261
280
|
/** 经典 .s3mb 的 Worker 解析客户端；undefined = 尚未尝试创建，null = 不可用/已降级 */
|
|
262
281
|
private _workerClient;
|
|
@@ -303,6 +322,20 @@ export declare class S3MTileset {
|
|
|
303
322
|
* 收紧后不会立刻掉内容，要等下一次 `_trimBudget`（下一帧 update）才生效。
|
|
304
323
|
*/
|
|
305
324
|
setMaxMemory(bytes: number): void;
|
|
325
|
+
/**
|
|
326
|
+
* 运行时改本数据集的光照模型档位。只影响**之后**构建的瓦片材质；
|
|
327
|
+
* 场上已有材质由 `S3MViewer.setMaterialQuality` 原位重建。
|
|
328
|
+
* `undefined` = 跟随模块级默认。
|
|
329
|
+
*/
|
|
330
|
+
setMaterialQuality(q: 'pbr' | 'lambert' | undefined): void;
|
|
331
|
+
/**
|
|
332
|
+
* 运行时改本数据集的渲染 profile（颜色管线 / 纹理参数）。
|
|
333
|
+
* 只影响**之后**构建的瓦片材质与纹理；场上已有的由 `S3MViewer` 统一重建 / 重传。
|
|
334
|
+
*/
|
|
335
|
+
setRenderProfile(p: {
|
|
336
|
+
colorPipeline?: 'linear' | 'direct';
|
|
337
|
+
textureOptions?: TextureCreateOptions;
|
|
338
|
+
}): void;
|
|
306
339
|
/**
|
|
307
340
|
* 当前数据集驻留的显存与内存总字节数（几何缓冲精确大小 + 纹理显存估计）
|
|
308
341
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3MTileset.d.ts","sourceRoot":"","sources":["../../src/tileset/S3MTileset.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"S3MTileset.d.ts","sourceRoot":"","sources":["../../src/tileset/S3MTileset.ts"],"names":[],"mappings":"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"}
|
|
@@ -322,6 +322,9 @@ export class S3MTileset {
|
|
|
322
322
|
isS3MV1 = false;
|
|
323
323
|
_buildTile;
|
|
324
324
|
_polygonOffset;
|
|
325
|
+
_materialQuality;
|
|
326
|
+
_colorPipeline;
|
|
327
|
+
_textureOptions;
|
|
325
328
|
_uniforms;
|
|
326
329
|
/** 经典 .s3mb 的 Worker 解析客户端；undefined = 尚未尝试创建，null = 不可用/已降级 */
|
|
327
330
|
_workerClient;
|
|
@@ -341,6 +344,9 @@ export class S3MTileset {
|
|
|
341
344
|
// 渲染层可注入：Node 环境下不需要 three，也能跑 URL / 解析链路
|
|
342
345
|
this._buildTile = options.buildTile ?? null;
|
|
343
346
|
this._polygonOffset = options.polygonOffset;
|
|
347
|
+
this._materialQuality = options.materialQuality;
|
|
348
|
+
this._colorPipeline = options.colorPipeline;
|
|
349
|
+
this._textureOptions = options.textureOptions;
|
|
344
350
|
// 着色器共享 uniform，由 S3MLayer 持有并传进来
|
|
345
351
|
this._uniforms = options.uniforms ?? null;
|
|
346
352
|
this._useWorker = options.useWorker !== false;
|
|
@@ -566,6 +572,24 @@ export class S3MTileset {
|
|
|
566
572
|
setMaxMemory(bytes) {
|
|
567
573
|
this.maxMemory = Number.isFinite(bytes) && bytes > 0 ? bytes : Infinity;
|
|
568
574
|
}
|
|
575
|
+
/**
|
|
576
|
+
* 运行时改本数据集的光照模型档位。只影响**之后**构建的瓦片材质；
|
|
577
|
+
* 场上已有材质由 `S3MViewer.setMaterialQuality` 原位重建。
|
|
578
|
+
* `undefined` = 跟随模块级默认。
|
|
579
|
+
*/
|
|
580
|
+
setMaterialQuality(q) {
|
|
581
|
+
this._materialQuality = q;
|
|
582
|
+
}
|
|
583
|
+
/**
|
|
584
|
+
* 运行时改本数据集的渲染 profile（颜色管线 / 纹理参数）。
|
|
585
|
+
* 只影响**之后**构建的瓦片材质与纹理；场上已有的由 `S3MViewer` 统一重建 / 重传。
|
|
586
|
+
*/
|
|
587
|
+
setRenderProfile(p) {
|
|
588
|
+
if (p.colorPipeline !== undefined)
|
|
589
|
+
this._colorPipeline = p.colorPipeline;
|
|
590
|
+
if (p.textureOptions !== undefined)
|
|
591
|
+
this._textureOptions = p.textureOptions;
|
|
592
|
+
}
|
|
569
593
|
/**
|
|
570
594
|
* 当前数据集驻留的显存与内存总字节数（几何缓冲精确大小 + 纹理显存估计）
|
|
571
595
|
*/
|
|
@@ -1085,6 +1109,9 @@ export class S3MTileset {
|
|
|
1085
1109
|
uniforms: this._uniforms,
|
|
1086
1110
|
assembled,
|
|
1087
1111
|
polygonOffset: this._polygonOffset,
|
|
1112
|
+
materialQuality: this._materialQuality,
|
|
1113
|
+
colorPipeline: this._colorPipeline,
|
|
1114
|
+
textureOptions: this._textureOptions,
|
|
1088
1115
|
});
|
|
1089
1116
|
const { group, stats } = buildRes;
|
|
1090
1117
|
const texKeys = buildRes.textureKeys ?? group.userData?.textureKeys ?? Object.keys(tile.textures ?? {});
|