Skip to content

Extract U32 texture data upload logic and restore pixelStorei parameters #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrxz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Extract U32 texture data upload logic and restore pixelStorei parameters #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions src/SparkRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
isMobile,
isOculus,
isVisionPro,
uploadU32DataTextureRows,
} from "./utils";

export interface SparkRendererOptions {
Expand Down Expand Up @@ -1084,34 +1085,16 @@ export class SparkRenderer extends THREE.Mesh {
this.orderingTexture = orderingTexture;
} else {
const renderer = this.renderer;
const gl = renderer.getContext() as WebGL2RenderingContext;
if (!renderer.properties.has(this.orderingTexture)) {
this.orderingTexture.needsUpdate = true;
} else {
const props = renderer.properties.get(this.orderingTexture) as {
__webglTexture: WebGLTexture;
};
const glTexture = props.__webglTexture;
if (!glTexture) {
throw new Error("ordering texture not found");
}
renderer.state.activeTexture(gl.TEXTURE0);
renderer.state.bindTexture(gl.TEXTURE_2D, glTexture);
gl.bindBuffer(gl.PIXEL_UNPACK_BUFFER, null);
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
gl.texSubImage2D(
gl.TEXTURE_2D,
0,
0,
0,
uploadU32DataTextureRows(
renderer,
this.orderingTexture,
4096,
rows,
gl.RGBA_INTEGER,
gl.UNSIGNED_INT,
// data,
result.ordering,
);
renderer.state.bindTexture(gl.TEXTURE_2D, null);
}
}

Expand Down
49 changes: 10 additions & 39 deletions src/SplatPager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ import {
SplatFileType,
} from "./defines";
import { pagedSplatTexCoord } from "./dyno";
import { decodeExtSplat, getTextureSize, unpackSplat } from "./utils";
import {
decodeExtSplat,
getTextureSize,
unpackSplat,
uploadU32DataTextureRows,
} from "./utils";
import * as wasm from "./wasm";

export interface PagedSplatsOptions {
Expand Down Expand Up @@ -341,26 +346,13 @@ export class PagedSplats implements SplatSource {
const textureIndices = indicesTexture.image.data as Uint32Array;
textureIndices.set(indices.subarray(0, numSplats));

const gl = renderer.getContext() as WebGL2RenderingContext;
renderer.state.activeTexture(gl.TEXTURE0);
renderer.state.bindTexture(
gl.TEXTURE_2D,
getGlTexture(renderer, indicesTexture),
);
gl.bindBuffer(gl.PIXEL_UNPACK_BUFFER, null);
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
gl.texSubImage2D(
gl.TEXTURE_2D,
0,
0,
0,
uploadU32DataTextureRows(
renderer,
indicesTexture,
4096,
rows,
gl.RGBA_INTEGER,
gl.UNSIGNED_INT,
indices,
textureIndices,
);
renderer.state.bindTexture(gl.TEXTURE_2D, null);
}
}

Expand Down Expand Up @@ -1278,10 +1270,6 @@ export class SplatPager {
// this.renderer.state.bindTexture(gl.TEXTURE_2D_ARRAY, null);
}

private getGlTexture(texture: THREE.Texture): WebGLTexture {
return getGlTexture(this.renderer, texture);
}

private newUint32ArrayTexture(
data: Uint32Array<ArrayBuffer> | null,
width: number,
Expand Down Expand Up @@ -1523,23 +1511,6 @@ export class SplatPager {
static emptyExtSh3BTexture = this.emptyUint32x4;
}

function getGlTexture(
renderer: THREE.WebGLRenderer,
texture: THREE.Texture,
): WebGLTexture {
if (!renderer.properties.has(texture)) {
throw new Error("texture not found");
}
const props = renderer.properties.get(texture) as {
__webglTexture: WebGLTexture;
};
const glTexture = props.__webglTexture;
if (!glTexture) {
throw new Error("texture not found");
}
return glTexture;
}

async function fetchRange({
url,
requestHeader,
Expand Down
41 changes: 41 additions & 0 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,3 +1676,44 @@ export class GunzipReader {
return result;
}
}

export function uploadU32DataTextureRows(
renderer: THREE.WebGLRenderer,
texture: THREE.Texture,
width: number,
rows: number,
data: Uint32Array,
) {
const gl = renderer.getContext() as WebGL2RenderingContext;

const props = renderer.properties.get(texture) as {
__webglTexture: WebGLTexture;
};
const glTexture = props?.__webglTexture;
if (!glTexture) {
throw new Error("texture not found");
}
// Note: instead of saving and restoring the pixelStorei parameters
// renderer.state.pixelStorei can be used with Three.js >= r184
const currentFlipY = gl.getParameter(gl.UNPACK_FLIP_Y_WEBGL);
const currentPremultiply = gl.getParameter(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL);
renderer.state.activeTexture(gl.TEXTURE0);
renderer.state.bindTexture(gl.TEXTURE_2D, glTexture);
gl.bindBuffer(gl.PIXEL_UNPACK_BUFFER, null);
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
gl.texSubImage2D(
gl.TEXTURE_2D,
0,
0,
0,
width,
rows,
gl.RGBA_INTEGER,
gl.UNSIGNED_INT,
data,
);
renderer.state.unbindTexture();
gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, currentFlipY);
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, currentPremultiply);
}
Loading