Skip to content

KTX2Loader: Return LODs through DataTexture's mipmaps field. #25871

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

Merged
merged 7 commits into from
May 2, 2023
Merged

KTX2Loader: Return LODs through DataTexture's mipmaps field. #25871

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb2eafe
Return levels into mipmaps in DataTexture
emmanueljl Apr 17, 2023
a1e4527
Push mipmap as POJO with {data, width, height}
emmanueljl Apr 21, 2023
1c2625f
Put base into mipmaps. Push mipmaps as POJO (data, width, height)
emmanueljl Apr 24, 2023
5ae4ad4
Improve pixel width/height handling
emmanueljl Apr 24, 2023
12e1048
Handle pixelDepth for LODs
emmanueljl Apr 24, 2023
b0c1ac7
Fix source-to-mipmap references
emmanueljl Apr 28, 2023
3d2fad5
Update examples/jsm/loaders/KTX2Loader.js
emmanueljl May 1, 2023
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
35 changes: 31 additions & 4 deletions examples/jsm/loaders/KTX2Loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,31 @@ class KTX2Loader extends Loader {

if ( container.vkFormat !== VK_FORMAT_UNDEFINED ) {

return createDataTexture( container );
const mipmaps = [];
const pendings = [];

for ( let levelIndex = 0; levelIndex < container.levels.length; levelIndex ++ ) {

pendings.push( createDataTexture( container, levelIndex ).then( function ( dataTexture ) {

mipmaps[ levelIndex ] = dataTexture;

} ) );

}

await Promise.all( pendings );

const texture = mipmaps[ 0 ];
texture.mipmaps = mipmaps.map( dt => {
return {
data: dt.source.data,
width: dt.source.data.width,
height: dt.source.data.height,
depth: dt.source.data.depth
};
} );
return texture;

}

Expand Down Expand Up @@ -706,17 +730,20 @@ const COLOR_SPACE_MAP = {

};

async function createDataTexture( container ) {
async function createDataTexture( container, levelIndex = 0 ) {

const { vkFormat, pixelWidth, pixelHeight, pixelDepth } = container;
const { vkFormat } = container;
const pixelWidth = Math.max( 1, container.pixelWidth >> levelIndex );
const pixelHeight = Math.max( 1, container.pixelHeight >> levelIndex );
const pixelDepth = Math.max( 1, container.pixelDepth >> levelIndex );

if ( FORMAT_MAP[ vkFormat ] === undefined ) {

throw new Error( 'THREE.KTX2Loader: Unsupported vkFormat.' );

}

const level = container.levels[ 0 ];
const level = container.levels[ levelIndex ];

let levelData;
let view;
Expand Down