Skip to content

Commit

Permalink
Fix ID uniqueness for multi-XKT models
Browse files Browse the repository at this point in the history
  • Loading branch information
@xeolabs
xeolabs committed Sep 8, 2023
1 parent 8d13ea6 commit ff1b90c
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 38 deletions.
12 changes: 7 additions & 5 deletions src/plugins/XKTLoaderPlugin/XKTLoaderPlugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,11 @@ class XKTLoaderPlugin extends Plugin {
sceneModel.fire("error", errMsg);
}

let nextId = 0;
const manifestCtx = {
nextMeshId: 0
getNextId: () => {
return `${modelId}.${nextId++}`;
}
};

if (params.metaModelSrc || params.metaModelData) {
Expand Down Expand Up @@ -944,7 +947,6 @@ class XKTLoaderPlugin extends Plugin {
}



} else {

if (params.src) {
Expand Down Expand Up @@ -1016,9 +1018,9 @@ class XKTLoaderPlugin extends Plugin {

_loadModel(src, params, options, sceneModel, metaModel, manifestCtx, done, error) {
this._dataSource.getXKT(params.src, (arrayBuffer) => {
this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
done();
}, error);
this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
done();
}, error);
}

_parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx) {
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ function inflate(deflatedData) {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

sceneModel.positionsCompression = "precompressed";
sceneModel.normalsCompression = "precompressed";

Expand Down
30 changes: 16 additions & 14 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV10.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ const imagDataToImage = (function () {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

const metadata = inflatedData.metadata;
const textureData = inflatedData.textureData;
const eachTextureDataPortion = inflatedData.eachTextureDataPortion;
Expand Down Expand Up @@ -181,7 +183,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

const imageDataSubarray = new Uint8Array(textureData.subarray(textureDataPortionStart, textureDataPortionEnd));
const arrayBuffer = imageDataSubarray.buffer;
const textureId = `texture-${textureIndex}`;
const textureId = `${modelPartId}-texture-${textureIndex}`;

if (compressed) {

Expand Down Expand Up @@ -222,19 +224,19 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

for (let textureSetIndex = 0; textureSetIndex < numTextureSets; textureSetIndex++) {
const eachTextureSetTexturesIndex = textureSetIndex * 5;
const textureSetId = `textureSet-${textureSetIndex}`;
const textureSetId = `${modelPartId}-textureSet-${textureSetIndex}`;
const colorTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 0];
const metallicRoughnessTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 1];
const normalsTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 2];
const emissiveTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 3];
const occlusionTextureIndex = eachTextureSetTextures[eachTextureSetTexturesIndex + 4];
sceneModel.createTextureSet({
id: textureSetId,
colorTextureId: colorTextureIndex >= 0 ? `texture-${colorTextureIndex}` : null,
normalsTextureId: normalsTextureIndex >= 0 ? `texture-${normalsTextureIndex}` : null,
metallicRoughnessTextureId: metallicRoughnessTextureIndex >= 0 ? `texture-${metallicRoughnessTextureIndex}` : null,
emissiveTextureId: emissiveTextureIndex >= 0 ? `texture-${emissiveTextureIndex}` : null,
occlusionTextureId: occlusionTextureIndex >= 0 ? `texture-${occlusionTextureIndex}` : null
colorTextureId: colorTextureIndex >= 0 ? `${modelPartId}-texture-${colorTextureIndex}` : null,
normalsTextureId: normalsTextureIndex >= 0 ? `${modelPartId}-texture-${normalsTextureIndex}` : null,
metallicRoughnessTextureId: metallicRoughnessTextureIndex >= 0 ? `${modelPartId}-texture-${metallicRoughnessTextureIndex}` : null,
emissiveTextureId: emissiveTextureIndex >= 0 ? `${modelPartId}-texture-${emissiveTextureIndex}` : null,
occlusionTextureId: occlusionTextureIndex >= 0 ? `${modelPartId}-texture-${occlusionTextureIndex}` : null
});
}

Expand Down Expand Up @@ -357,14 +359,14 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

const textureSetIndex = eachMeshTextureSet[meshIndex];

const textureSetId = (textureSetIndex >= 0) ? `textureSet-${textureSetIndex}` : null;
const textureSetId = (textureSetIndex >= 0) ? `${modelPartId}-textureSet-${textureSetIndex}` : null;

const meshColor = decompressColor(eachMeshMaterialAttributes.subarray((meshIndex * 6), (meshIndex * 6) + 3));
const meshOpacity = eachMeshMaterialAttributes[(meshIndex * 6) + 3] / 255.0;
const meshMetallic = eachMeshMaterialAttributes[(meshIndex * 6) + 4] / 255.0;
const meshRoughness = eachMeshMaterialAttributes[(meshIndex * 6) + 5] / 255.0;

const meshId = manifestCtx.nextMeshId++;
const meshId = manifestCtx.getNextId();

if (isReusedGeometry) {

Expand All @@ -373,7 +375,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);

const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel

let geometryArrays = geometryArraysCache[geometryId];

Expand Down Expand Up @@ -477,7 +479,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

sceneModel.createMesh(utils.apply(meshDefaults, {
id: meshId,
textureSetId: textureSetId,
textureSetId,
origin: tileCenter,
primitive: geometryArrays.primitiveName,
positionsCompressed: transformedAndRecompressedPositions,
Expand Down Expand Up @@ -516,8 +518,8 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

sceneModel.createMesh(utils.apply(meshDefaults, {
id: meshId,
geometryId: geometryId,
textureSetId: textureSetId,
geometryId,
textureSetId,
matrix: meshMatrix,
color: meshColor,
metallic: meshMetallic,
Expand Down Expand Up @@ -592,7 +594,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

sceneModel.createMesh(utils.apply(meshDefaults, {
id: meshId,
textureSetId: textureSetId,
textureSetId,
origin: tileCenter,
primitive: primitiveName,
positionsCompressed: geometryPositions,
Expand Down
8 changes: 5 additions & 3 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ const decompressColor = (function () {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

sceneModel.positionsCompression = "precompressed";
sceneModel.normalsCompression = "precompressed";

Expand Down Expand Up @@ -147,7 +149,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const jj = entityMeshIds [j];

const lastMesh = (jj === (numMeshes - 1));
const meshId = manifestCtx.nextMeshId++;
const meshId = manifestCtx.getNextId();

const color = decompressColor(meshColors.subarray((jj * 4), (jj * 4) + 3));
const opacity = meshColors[(jj * 4) + 3] / 255.0;
Expand All @@ -159,7 +161,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

if (entityUsesInstancing [i] === 1) {

const geometryId = "geometry." + jj;
const geometryId = `${modelPartId}.geometry.${meshId}.${jj}`;

if (!(geometryId in alreadyCreatedGeometries)) {

Expand All @@ -181,7 +183,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
color: color,
opacity: opacity,
matrix: entityMatrix,
geometryId: geometryId,
geometryId,
}));

meshIds.push(meshId);
Expand Down
9 changes: 6 additions & 3 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ const decompressColor = (function () {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

sceneModel.positionsCompression = "precompressed";
sceneModel.normalsCompression = "precompressed";

Expand Down Expand Up @@ -141,7 +143,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
var jj = entityMeshIds [j];

const lastMesh = (jj === (numMeshes - 1));
const meshId = entityId + ".mesh." + jj;
const meshId = `${modelPartId}.${entityId}.mesh.${jj}`;

const color = decompressColor(meshColors.subarray((jj * 4), (jj * 4) + 3));
const opacity = meshColors[(jj * 4) + 3] / 255.0;
Expand All @@ -152,7 +154,8 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
var tmpEdgeIndices = edgeIndices.subarray(meshEdgesIndices [jj], lastMesh ? edgeIndices.length : meshEdgesIndices [jj + 1]);

if (entityUsesInstancing [i] === 1) {
var geometryId = "geometry." + jj;

const geometryId = `${modelPartId}.geometry.${meshId}.${jj}`;

if (!(geometryId in _alreadyCreatedGeometries)) {

Expand All @@ -174,7 +177,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
color: color,
opacity: opacity,
matrix: entityMatrix,
geometryId: geometryId,
geometryId,
}));

meshIds.push(meshId);
Expand Down
12 changes: 8 additions & 4 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ const decompressColor = (function () {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

sceneModel.positionsCompression = "precompressed";
sceneModel.normalsCompression = "precompressed";

Expand Down Expand Up @@ -174,7 +176,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

// Primitive instanced by more than one entity, and has positions in Model-space

var geometryId = "geometry" + orderedPrimitiveIndex; // These IDs are local to the SceneModel
const geometryId = `${modelPartId}-geometry.${orderedPrimitiveIndex}`; // These IDs are local to the SceneModel

sceneModel.createGeometry({
id: geometryId,
Expand All @@ -192,7 +194,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

// Primitive is used only by one entity, and has positions pre-transformed into World-space

const meshId = orderedPrimitiveIndex; // These IDs are local to the SceneModel
const meshId = `${modelPartId}-${orderedPrimitiveIndex}`;

const entityIndex = batchedPrimitiveEntityIndexes[orderedPrimitiveIndex];
const entityId = eachEntityId[entityIndex];
Expand Down Expand Up @@ -235,8 +237,9 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

const meshDefaults = {}; // TODO: get from lookup from entity IDs

const meshId = "instance." + countInstances++;
const geometryId = "geometry" + primitiveIndex;
const meshId = `${modelPartId}-instance.${countInstances++}`;
const geometryId = `${modelPartId}-geometry.${primitiveIndex}`; // These IDs are local to the SceneModel

const matricesIndex = (eachEntityMatricesPortion [entityIndex]) * 16;
const matrix = matrices.subarray(matricesIndex, matricesIndex + 16);

Expand All @@ -249,6 +252,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
meshIds.push(meshId);

} else {
const meshId = `${modelPartId}-${primitiveIndex}`;
meshIds.push(primitiveIndex);
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/XKTLoaderPlugin/parsers/ParserV5.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ const decompressColor = (function () {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

sceneModel.positionsCompression = "disabled"; // Positions in XKT V4 are floats, which we never quantize, for precision with big models
sceneModel.normalsCompression = "precompressed"; // Normals are oct-encoded though

Expand Down Expand Up @@ -141,7 +143,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)

// Primitive instanced by more than one entity, and has positions in Model-space

var geometryId = "geometry" + primitiveIndex; // These IDs are local to the SceneModel
const geometryId = `${modelPartId}-geometry.${primitiveIndex}`; // These IDs are local to the SceneModel

sceneModel.createGeometry({
id: geometryId,
Expand Down
6 changes: 4 additions & 2 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV6.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ const decompressColor = (function () {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

const positions = inflatedData.positions;
const normals = inflatedData.normals;
const indices = inflatedData.indices;
Expand Down Expand Up @@ -221,13 +223,13 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const color = decompressColor(eachPrimitiveColorAndOpacity.subarray((primitiveIndex * 4), (primitiveIndex * 4) + 3));
const opacity = eachPrimitiveColorAndOpacity[(primitiveIndex * 4) + 3] / 255.0;

const meshId = manifestCtx.nextMeshId++;
const meshId = manifestCtx.getNextId();

if (isReusedPrimitive) {

// Create mesh for multi-use primitive - create (or reuse) geometry, create mesh using that geometry

const geometryId = "geometry." + tileIndex + "." + primitiveIndex; // These IDs are local to the SceneModel
const geometryId = `${modelPartId}-geometry.${tileIndex}.${primitiveIndex}`; // These IDs are local to the SceneModel

if (!geometryCreated[geometryId]) {

Expand Down
6 changes: 4 additions & 2 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV7.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ function convertColorsRGBToRGBA(colorsRGB) {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

const positions = inflatedData.positions;
const normals = inflatedData.normals;
const colors = inflatedData.colors;
Expand Down Expand Up @@ -274,7 +276,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const meshMetallic = eachMeshMaterial[(meshIndex * 6) + 4] / 255.0;
const meshRoughness = eachMeshMaterial[(meshIndex * 6) + 5] / 255.0;

const meshId = manifestCtx.nextMeshId++;
const meshId = manifestCtx.getNextId();

if (isReusedGeometry) {

Expand All @@ -283,7 +285,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);

const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel

if (!geometryCreated[geometryId]) {

Expand Down
6 changes: 4 additions & 2 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV8.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ function convertColorsRGBToRGBA(colorsRGB) {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

const types = JSON.parse(inflatedData.types);
const eachMetaObjectId = JSON.parse(inflatedData.eachMetaObjectId);
const eachMetaObjectType = inflatedData.eachMetaObjectType;
Expand Down Expand Up @@ -317,7 +319,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const meshMetallic = eachMeshMaterial[(meshIndex * 6) + 4] / 255.0;
const meshRoughness = eachMeshMaterial[(meshIndex * 6) + 5] / 255.0;

const meshId = manifestCtx.nextMeshId++;
const meshId = manifestCtx.getNextId();

if (isReusedGeometry) {

Expand All @@ -326,7 +328,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);

const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel

let geometryArrays = geometryArraysCache[geometryId];

Expand Down
6 changes: 4 additions & 2 deletions src/plugins/XKTLoaderPlugin/parsers/ParserV9.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ const decompressColor = (function () {

function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx) {

const modelPartId = manifestCtx.getNextId();

const metadata = inflatedData.metadata;

const positions = inflatedData.positions;
Expand Down Expand Up @@ -270,7 +272,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const meshMetallic = eachMeshMaterial[(meshIndex * 6) + 4] / 255.0;
const meshRoughness = eachMeshMaterial[(meshIndex * 6) + 5] / 255.0;

const meshId = manifestCtx.nextMeshId++;
const meshId = manifestCtx.getNextId();

if (isReusedGeometry) {

Expand All @@ -279,7 +281,7 @@ function load(viewer, options, inflatedData, sceneModel, metaModel, manifestCtx)
const meshMatrixIndex = eachMeshMatricesPortion[meshIndex];
const meshMatrix = matrices.slice(meshMatrixIndex, meshMatrixIndex + 16);

const geometryId = "geometry." + tileIndex + "." + geometryIndex; // These IDs are local to the SceneModel
const geometryId = `${modelPartId}-geometry.${tileIndex}.${geometryIndex}`; // These IDs are local to the SceneModel

let geometryArrays = geometryArraysCache[geometryId];

Expand Down

0 comments on commit ff1b90c

Please sign in to comment.