@d5techs/3dgs-lib 1.4.76 → 1.4.78
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/3dgs-lib.cjs +134 -77
- package/dist/3dgs-lib.cjs.map +1 -1
- package/dist/3dgs-lib.js +134 -77
- package/dist/3dgs-lib.js.map +1 -1
- package/dist/editor/SelectionVolumeRenderer.d.ts +0 -2
- package/dist/editor/SplatEditor.d.ts +2 -1
- package/package.json +1 -1
package/dist/3dgs-lib.js
CHANGED
|
@@ -17577,7 +17577,7 @@ class SphereSelection {
|
|
|
17577
17577
|
this.toolbar = document.createElement("div");
|
|
17578
17578
|
this.toolbar.className = "volume-select-toolbar";
|
|
17579
17579
|
this.toolbar.style.cssText = `
|
|
17580
|
-
position:absolute; bottom:
|
|
17580
|
+
position:absolute; bottom:90px; left:50%; transform:translateX(-50%);
|
|
17581
17581
|
display:none; z-index:20; background:rgba(30,30,30,0.92);
|
|
17582
17582
|
border-radius:8px; padding:6px 10px; gap:6px;
|
|
17583
17583
|
align-items:center; font-size:13px; color:#ddd;
|
|
@@ -17668,7 +17668,7 @@ class BoxSelection {
|
|
|
17668
17668
|
this.toolbar = document.createElement("div");
|
|
17669
17669
|
this.toolbar.className = "volume-select-toolbar";
|
|
17670
17670
|
this.toolbar.style.cssText = `
|
|
17671
|
-
position:absolute; bottom:
|
|
17671
|
+
position:absolute; bottom:90px; left:50%; transform:translateX(-50%);
|
|
17672
17672
|
display:none; z-index:20; background:rgba(30,30,30,0.92);
|
|
17673
17673
|
border-radius:8px; padding:6px 10px; gap:6px;
|
|
17674
17674
|
align-items:center; font-size:13px; color:#ddd;
|
|
@@ -17875,8 +17875,10 @@ function exportEditedPLY(positions, scales, rotations, colors, opacities, shCoef
|
|
|
17875
17875
|
}
|
|
17876
17876
|
return buffer;
|
|
17877
17877
|
}
|
|
17878
|
-
const
|
|
17879
|
-
const
|
|
17878
|
+
const SEG = 64;
|
|
17879
|
+
const LAT_COUNT = 8;
|
|
17880
|
+
const LON_COUNT = 12;
|
|
17881
|
+
const BOX_GRID_SUBDIV = 4;
|
|
17880
17882
|
class SelectionVolumeRenderer {
|
|
17881
17883
|
constructor(renderer, camera) {
|
|
17882
17884
|
__publicField(this, "renderer");
|
|
@@ -17887,16 +17889,14 @@ class SelectionVolumeRenderer {
|
|
|
17887
17889
|
__publicField(this, "vertexBuffer", null);
|
|
17888
17890
|
__publicField(this, "_volume", { type: null, center: [0, 0, 0], dimensions: [2, 2, 2] });
|
|
17889
17891
|
__publicField(this, "vertexCount", 0);
|
|
17890
|
-
__publicField(this, "
|
|
17891
|
-
__publicField(this, "lineColor", [0.2, 0.8, 1]);
|
|
17892
|
+
__publicField(this, "lineColor", [0.4, 0.9, 1]);
|
|
17892
17893
|
this.renderer = renderer;
|
|
17893
17894
|
this.camera = camera;
|
|
17894
|
-
this.maxVertices = Math.max(
|
|
17895
|
-
24,
|
|
17896
|
-
SPHERE_SEGMENTS * 2 * SPHERE_RINGS
|
|
17897
|
-
);
|
|
17898
17895
|
this.createPipeline();
|
|
17899
|
-
this.
|
|
17896
|
+
this.vertexBuffer = this.renderer.device.createBuffer({
|
|
17897
|
+
size: 65536,
|
|
17898
|
+
usage: GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST
|
|
17899
|
+
});
|
|
17900
17900
|
}
|
|
17901
17901
|
get volume() {
|
|
17902
17902
|
return this._volume;
|
|
@@ -17930,7 +17930,7 @@ class SelectionVolumeRenderer {
|
|
|
17930
17930
|
return o;
|
|
17931
17931
|
}
|
|
17932
17932
|
@fragment fn fs(i: VO) -> @location(0) vec4<f32> {
|
|
17933
|
-
return vec4(i.color, 0.
|
|
17933
|
+
return vec4(i.color, 0.6);
|
|
17934
17934
|
}
|
|
17935
17935
|
`
|
|
17936
17936
|
);
|
|
@@ -17968,78 +17968,115 @@ class SelectionVolumeRenderer {
|
|
|
17968
17968
|
depthStencil: { format: this.renderer.depthFormat, depthWriteEnabled: false, depthCompare: "always" }
|
|
17969
17969
|
});
|
|
17970
17970
|
}
|
|
17971
|
-
|
|
17972
|
-
const size = this.maxVertices * 24;
|
|
17973
|
-
this.vertexBuffer = this.renderer.device.createBuffer({
|
|
17974
|
-
size,
|
|
17975
|
-
usage: GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST
|
|
17976
|
-
});
|
|
17977
|
-
}
|
|
17971
|
+
// ========== Box: 12 edges + grid lines on all 6 faces ==========
|
|
17978
17972
|
generateBoxVertices() {
|
|
17979
17973
|
const [cx, cy, cz] = this._volume.center;
|
|
17980
17974
|
const [lx, ly, lz] = this._volume.dimensions;
|
|
17981
17975
|
const hx = lx / 2, hy = ly / 2, hz = lz / 2;
|
|
17982
17976
|
const [r, g, b] = this.lineColor;
|
|
17983
17977
|
const v = [];
|
|
17984
|
-
const
|
|
17978
|
+
const line = (x12, y12, z12, x2, y2, z2) => {
|
|
17985
17979
|
v.push(x12, y12, z12, r, g, b, x2, y2, z2, r, g, b);
|
|
17986
17980
|
};
|
|
17987
17981
|
const x0 = cx - hx, x1 = cx + hx;
|
|
17988
17982
|
const y0 = cy - hy, y1 = cy + hy;
|
|
17989
17983
|
const z0 = cz - hz, z1 = cz + hz;
|
|
17990
|
-
|
|
17991
|
-
|
|
17992
|
-
|
|
17993
|
-
|
|
17994
|
-
|
|
17995
|
-
|
|
17996
|
-
|
|
17997
|
-
|
|
17998
|
-
|
|
17999
|
-
|
|
18000
|
-
|
|
18001
|
-
|
|
17984
|
+
line(x0, y0, z0, x1, y0, z0);
|
|
17985
|
+
line(x1, y0, z0, x1, y0, z1);
|
|
17986
|
+
line(x1, y0, z1, x0, y0, z1);
|
|
17987
|
+
line(x0, y0, z1, x0, y0, z0);
|
|
17988
|
+
line(x0, y1, z0, x1, y1, z0);
|
|
17989
|
+
line(x1, y1, z0, x1, y1, z1);
|
|
17990
|
+
line(x1, y1, z1, x0, y1, z1);
|
|
17991
|
+
line(x0, y1, z1, x0, y1, z0);
|
|
17992
|
+
line(x0, y0, z0, x0, y1, z0);
|
|
17993
|
+
line(x1, y0, z0, x1, y1, z0);
|
|
17994
|
+
line(x1, y0, z1, x1, y1, z1);
|
|
17995
|
+
line(x0, y0, z1, x0, y1, z1);
|
|
17996
|
+
const n = BOX_GRID_SUBDIV;
|
|
17997
|
+
for (let i = 1; i < n; i++) {
|
|
17998
|
+
const t = i / n;
|
|
17999
|
+
const px = x0 + (x1 - x0) * t;
|
|
18000
|
+
const pz = z0 + (z1 - z0) * t;
|
|
18001
|
+
line(px, y0, z0, px, y0, z1);
|
|
18002
|
+
line(px, y1, z0, px, y1, z1);
|
|
18003
|
+
line(x0, y0, pz, x1, y0, pz);
|
|
18004
|
+
line(x0, y1, pz, x1, y1, pz);
|
|
18005
|
+
}
|
|
18006
|
+
for (let i = 1; i < n; i++) {
|
|
18007
|
+
const t = i / n;
|
|
18008
|
+
const px = x0 + (x1 - x0) * t;
|
|
18009
|
+
const py = y0 + (y1 - y0) * t;
|
|
18010
|
+
line(px, y0, z0, px, y1, z0);
|
|
18011
|
+
line(px, y0, z1, px, y1, z1);
|
|
18012
|
+
line(x0, py, z0, x1, py, z0);
|
|
18013
|
+
line(x0, py, z1, x1, py, z1);
|
|
18014
|
+
}
|
|
18015
|
+
for (let i = 1; i < n; i++) {
|
|
18016
|
+
const t = i / n;
|
|
18017
|
+
const py = y0 + (y1 - y0) * t;
|
|
18018
|
+
const pz = z0 + (z1 - z0) * t;
|
|
18019
|
+
line(x0, py, z0, x0, py, z1);
|
|
18020
|
+
line(x1, py, z0, x1, py, z1);
|
|
18021
|
+
line(x0, y0, pz, x0, y1, pz);
|
|
18022
|
+
line(x1, y0, pz, x1, y1, pz);
|
|
18023
|
+
}
|
|
18002
18024
|
return new Float32Array(v);
|
|
18003
18025
|
}
|
|
18026
|
+
// ========== Sphere: latitude + longitude rings ==========
|
|
18004
18027
|
generateSphereVertices() {
|
|
18005
18028
|
const [cx, cy, cz] = this._volume.center;
|
|
18006
18029
|
const radius = this._volume.dimensions[0];
|
|
18007
18030
|
const [r, g, b] = this.lineColor;
|
|
18008
18031
|
const v = [];
|
|
18009
|
-
const
|
|
18010
|
-
|
|
18011
|
-
|
|
18012
|
-
const
|
|
18013
|
-
|
|
18014
|
-
|
|
18015
|
-
|
|
18016
|
-
|
|
18017
|
-
|
|
18018
|
-
|
|
18019
|
-
|
|
18020
|
-
|
|
18021
|
-
|
|
18022
|
-
|
|
18023
|
-
|
|
18024
|
-
|
|
18025
|
-
|
|
18026
|
-
|
|
18027
|
-
y1 = cy + Math.cos(a1) * radius;
|
|
18028
|
-
z1 = cz + Math.sin(a1) * radius;
|
|
18029
|
-
} else {
|
|
18030
|
-
x0 = cx + Math.cos(a0) * radius;
|
|
18031
|
-
y0 = cy + Math.sin(a0) * radius;
|
|
18032
|
-
z0 = cz;
|
|
18033
|
-
x1 = cx + Math.cos(a1) * radius;
|
|
18034
|
-
y1 = cy + Math.sin(a1) * radius;
|
|
18035
|
-
z1 = cz;
|
|
18036
|
-
}
|
|
18037
|
-
v.push(x0, y0, z0, r, g, b, x1, y1, z1, r, g, b);
|
|
18032
|
+
const addRing = (centerY, ringRadius) => {
|
|
18033
|
+
for (let i = 0; i < SEG; i++) {
|
|
18034
|
+
const a0 = i / SEG * Math.PI * 2;
|
|
18035
|
+
const a1 = (i + 1) / SEG * Math.PI * 2;
|
|
18036
|
+
v.push(
|
|
18037
|
+
cx + Math.cos(a0) * ringRadius,
|
|
18038
|
+
cy + centerY,
|
|
18039
|
+
cz + Math.sin(a0) * ringRadius,
|
|
18040
|
+
r,
|
|
18041
|
+
g,
|
|
18042
|
+
b,
|
|
18043
|
+
cx + Math.cos(a1) * ringRadius,
|
|
18044
|
+
cy + centerY,
|
|
18045
|
+
cz + Math.sin(a1) * ringRadius,
|
|
18046
|
+
r,
|
|
18047
|
+
g,
|
|
18048
|
+
b
|
|
18049
|
+
);
|
|
18038
18050
|
}
|
|
18039
18051
|
};
|
|
18040
|
-
|
|
18041
|
-
|
|
18042
|
-
|
|
18052
|
+
for (let i = 0; i <= LAT_COUNT; i++) {
|
|
18053
|
+
const phi = -Math.PI / 2 + i / LAT_COUNT * Math.PI;
|
|
18054
|
+
const y = Math.sin(phi) * radius;
|
|
18055
|
+
const ringR = Math.cos(phi) * radius;
|
|
18056
|
+
if (ringR < 1e-3) continue;
|
|
18057
|
+
addRing(y, ringR);
|
|
18058
|
+
}
|
|
18059
|
+
for (let j = 0; j < LON_COUNT; j++) {
|
|
18060
|
+
const theta = j / LON_COUNT * Math.PI;
|
|
18061
|
+
for (let i = 0; i < SEG; i++) {
|
|
18062
|
+
const phi0 = i / SEG * Math.PI * 2;
|
|
18063
|
+
const phi1 = (i + 1) / SEG * Math.PI * 2;
|
|
18064
|
+
v.push(
|
|
18065
|
+
cx + Math.cos(phi0) * Math.sin(theta) * radius,
|
|
18066
|
+
cy + Math.sin(phi0) * radius,
|
|
18067
|
+
cz + Math.cos(phi0) * Math.cos(theta) * radius,
|
|
18068
|
+
r,
|
|
18069
|
+
g,
|
|
18070
|
+
b,
|
|
18071
|
+
cx + Math.cos(phi1) * Math.sin(theta) * radius,
|
|
18072
|
+
cy + Math.sin(phi1) * radius,
|
|
18073
|
+
cz + Math.cos(phi1) * Math.cos(theta) * radius,
|
|
18074
|
+
r,
|
|
18075
|
+
g,
|
|
18076
|
+
b
|
|
18077
|
+
);
|
|
18078
|
+
}
|
|
18079
|
+
}
|
|
18043
18080
|
return new Float32Array(v);
|
|
18044
18081
|
}
|
|
18045
18082
|
render(pass) {
|
|
@@ -18152,9 +18189,17 @@ class SplatEditor {
|
|
|
18152
18189
|
this.toolOverlay.style.display = name && !isVolumeTool ? "block" : "none";
|
|
18153
18190
|
if (isVolumeTool && this.volumeRenderer) {
|
|
18154
18191
|
const volType = name;
|
|
18155
|
-
const
|
|
18156
|
-
const
|
|
18157
|
-
|
|
18192
|
+
const bounds = this.getModelBounds();
|
|
18193
|
+
const defaultSize = Math.max(bounds.size[0], bounds.size[1], bounds.size[2]) * 0.3;
|
|
18194
|
+
const safeSize = Math.max(defaultSize, 0.5);
|
|
18195
|
+
if (volType === "box") {
|
|
18196
|
+
this.boxTool.setDimensions(safeSize, safeSize, safeSize);
|
|
18197
|
+
this.volumeRenderer.setVolume("box", bounds.center, [safeSize, safeSize, safeSize]);
|
|
18198
|
+
} else {
|
|
18199
|
+
const r = safeSize / 2;
|
|
18200
|
+
this.sphereTool.setRadius(r);
|
|
18201
|
+
this.volumeRenderer.setVolume("sphere", bounds.center, [r, 0, 0]);
|
|
18202
|
+
}
|
|
18158
18203
|
(_b2 = (_a2 = this.callbacks).onVolumeToolActivated) == null ? void 0 : _b2.call(_a2, this.volumeRenderer.volume);
|
|
18159
18204
|
} else {
|
|
18160
18205
|
if (this.volumeRenderer) this.volumeRenderer.setVolume(null);
|
|
@@ -18571,24 +18616,36 @@ class SplatEditor {
|
|
|
18571
18616
|
};
|
|
18572
18617
|
}
|
|
18573
18618
|
/**
|
|
18574
|
-
*
|
|
18619
|
+
* 获取模型世界空间包围盒(中心 + 尺寸)
|
|
18575
18620
|
*/
|
|
18576
|
-
|
|
18621
|
+
getModelBounds() {
|
|
18577
18622
|
const cpuPos = this.gsRenderer.getCPUPositions();
|
|
18578
|
-
if (!cpuPos || cpuPos.length === 0) return [0, 0, 0];
|
|
18623
|
+
if (!cpuPos || cpuPos.length === 0) return { center: [0, 0, 0], size: [2, 2, 2] };
|
|
18579
18624
|
const modelMat = this.gsRenderer.getModelMatrix();
|
|
18580
18625
|
const count = this.splatState.count;
|
|
18581
|
-
let
|
|
18582
|
-
|
|
18626
|
+
let minX = Infinity, minY = Infinity, minZ = Infinity;
|
|
18627
|
+
let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
|
|
18628
|
+
const step = Math.max(1, Math.floor(count / 2e3));
|
|
18583
18629
|
for (let i = 0; i < count; i += step) {
|
|
18584
18630
|
const i3 = i * 3;
|
|
18585
18631
|
const lx = cpuPos[i3], ly = cpuPos[i3 + 1], lz = cpuPos[i3 + 2];
|
|
18586
|
-
|
|
18587
|
-
|
|
18588
|
-
|
|
18589
|
-
|
|
18632
|
+
const wx = modelMat[0] * lx + modelMat[4] * ly + modelMat[8] * lz + modelMat[12];
|
|
18633
|
+
const wy = modelMat[1] * lx + modelMat[5] * ly + modelMat[9] * lz + modelMat[13];
|
|
18634
|
+
const wz = modelMat[2] * lx + modelMat[6] * ly + modelMat[10] * lz + modelMat[14];
|
|
18635
|
+
if (wx < minX) minX = wx;
|
|
18636
|
+
if (wx > maxX) maxX = wx;
|
|
18637
|
+
if (wy < minY) minY = wy;
|
|
18638
|
+
if (wy > maxY) maxY = wy;
|
|
18639
|
+
if (wz < minZ) minZ = wz;
|
|
18640
|
+
if (wz > maxZ) maxZ = wz;
|
|
18590
18641
|
}
|
|
18591
|
-
return
|
|
18642
|
+
return {
|
|
18643
|
+
center: [(minX + maxX) / 2, (minY + maxY) / 2, (minZ + maxZ) / 2],
|
|
18644
|
+
size: [maxX - minX, maxY - minY, maxZ - minZ]
|
|
18645
|
+
};
|
|
18646
|
+
}
|
|
18647
|
+
getModelCenter() {
|
|
18648
|
+
return this.getModelBounds().center;
|
|
18592
18649
|
}
|
|
18593
18650
|
/**
|
|
18594
18651
|
* 根据屏幕像素坐标,找到最近的可见 splat 并返回其世界坐标及深度换算系数
|