diff --git a/package.json b/package.json index 884f04a..656c483 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bim-fragment", - "version": "1.0.12", + "version": "1.0.13", "description": "3D BIM Geometry API", "main": "index.js", "scripts": { @@ -9,7 +9,7 @@ "build-examples": "rollup -c resources/rollup.config.mjs", "publish-repo": "cpy package.json dist && cd dist && npm publish", "create-flatbuffers": "cd src/flatbuffers && flatc.exe --ts fragment.fbs", - "regen-json": "cd src/flatbuffers && flatc.exe --json --raw-binary fragment.fbs -- example.bin" + "regen-json": "cd src/flatbuffers && flatc.exe --json --raw-binary fragment.fbs -- model.frag" }, "repository": { "type": "git", diff --git a/resources/openbim-components.js b/resources/openbim-components.js index 4bb7d45..dd5542c 100644 --- a/resources/openbim-components.js +++ b/resources/openbim-components.js @@ -11541,15 +11541,15 @@ let FragmentsGroup$1 = class FragmentsGroup { const offset = this.bb.__offset(this.bb_pos, 4); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; } - matrix(index) { + coordinationMatrix(index) { const offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.readFloat32(this.bb.__vector(this.bb_pos + offset) + index * 4) : 0; } - matrixLength() { + coordinationMatrixLength() { const offset = this.bb.__offset(this.bb_pos, 6); return offset ? this.bb.__vector_len(this.bb_pos + offset) : 0; } - matrixArray() { + coordinationMatrixArray() { const offset = this.bb.__offset(this.bb_pos, 6); return offset ? new Float32Array(this.bb.bytes().buffer, this.bb.bytes().byteOffset + this.bb.__vector(this.bb_pos + offset), this.bb.__vector_len(this.bb_pos + offset)) : null; } @@ -11653,17 +11653,17 @@ let FragmentsGroup$1 = class FragmentsGroup { static startItemsVector(builder, numElems) { builder.startVector(4, numElems, 4); } - static addMatrix(builder, matrixOffset) { - builder.addFieldOffset(1, matrixOffset, 0); + static addCoordinationMatrix(builder, coordinationMatrixOffset) { + builder.addFieldOffset(1, coordinationMatrixOffset, 0); } - static createMatrixVector(builder, data) { + static createCoordinationMatrixVector(builder, data) { builder.startVector(4, data.length, 4); for (let i = data.length - 1; i >= 0; i--) { builder.addFloat32(data[i]); } return builder.endVector(); } - static startMatrixVector(builder, numElems) { + static startCoordinationMatrixVector(builder, numElems) { builder.startVector(4, numElems, 4); } static addIds(builder, idsOffset) { @@ -11759,10 +11759,10 @@ let FragmentsGroup$1 = class FragmentsGroup { static finishSizePrefixedFragmentsGroupBuffer(builder, offset) { builder.finish(offset, undefined, true); } - static createFragmentsGroup(builder, itemsOffset, matrixOffset, idsOffset, itemsKeysOffset, itemsKeysIndicesOffset, itemsRelsOffset, itemsRelsIndicesOffset, fragmentKeysOffset, idOffset, ifcNameOffset, ifcDescriptionOffset, ifcSchemaOffset, maxExpressId) { + static createFragmentsGroup(builder, itemsOffset, coordinationMatrixOffset, idsOffset, itemsKeysOffset, itemsKeysIndicesOffset, itemsRelsOffset, itemsRelsIndicesOffset, fragmentKeysOffset, idOffset, ifcNameOffset, ifcDescriptionOffset, ifcSchemaOffset, maxExpressId) { FragmentsGroup.startFragmentsGroup(builder); FragmentsGroup.addItems(builder, itemsOffset); - FragmentsGroup.addMatrix(builder, matrixOffset); + FragmentsGroup.addCoordinationMatrix(builder, coordinationMatrixOffset); FragmentsGroup.addIds(builder, idsOffset); FragmentsGroup.addItemsKeys(builder, itemsKeysOffset); FragmentsGroup.addItemsKeysIndices(builder, itemsKeysIndicesOffset); @@ -11868,7 +11868,7 @@ class Serializer { items.push(exported); } const itemsVector = G.createItemsVector(builder, items); - const matrixVector = G.createMatrixVector(builder, group.coordinationMatrix.elements); + const matrixVector = G.createCoordinationMatrixVector(builder, group.coordinationMatrix.elements); let fragmentKeys = ""; for (const key in group.keyFragments) { const fragmentID = group.keyFragments[key]; @@ -11921,7 +11921,7 @@ class Serializer { G.addItemsKeys(builder, keysVector); G.addItemsRelsIndices(builder, relsIVector); G.addItemsRels(builder, relsVector); - G.addMatrix(builder, matrixVector); + G.addCoordinationMatrix(builder, matrixVector); const result = FragmentsGroup$1.endFragmentsGroup(builder); builder.finish(result); return builder.asUint8Array(); @@ -12010,7 +12010,7 @@ class Serializer { schema: group.ifcSchema() || "", maxExpressId: group.maxExpressId() || 0, }; - const matrixArray = group.matrixArray() || new Float32Array(); + const matrixArray = group.coordinationMatrixArray() || new Float32Array(); const ids = group.idsArray() || new Uint32Array(); const keysIndices = group.itemsKeysIndicesArray() || new Uint32Array(); const keysArray = group.itemsKeysArray() || new Uint32Array(); diff --git a/src/flatbuffers/fragment.fbs b/src/flatbuffers/fragment.fbs index 1274c53..b75a6df 100644 --- a/src/flatbuffers/fragment.fbs +++ b/src/flatbuffers/fragment.fbs @@ -2,7 +2,7 @@ namespace Fragments.index; table FragmentsGroup { items: [Fragment]; - matrix: [float]; + coordination_matrix: [float]; ids: [uint]; items_keys: [uint]; items_keys_indices: [uint]; diff --git a/src/flatbuffers/fragments/index/fragments-group.ts b/src/flatbuffers/fragments/index/fragments-group.ts index 3396ff7..4585162 100644 --- a/src/flatbuffers/fragments/index/fragments-group.ts +++ b/src/flatbuffers/fragments/index/fragments-group.ts @@ -33,17 +33,17 @@ itemsLength():number { return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0; } -matrix(index: number):number|null { +coordinationMatrix(index: number):number|null { const offset = this.bb!.__offset(this.bb_pos, 6); return offset ? this.bb!.readFloat32(this.bb!.__vector(this.bb_pos + offset) + index * 4) : 0; } -matrixLength():number { +coordinationMatrixLength():number { const offset = this.bb!.__offset(this.bb_pos, 6); return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0; } -matrixArray():Float32Array|null { +coordinationMatrixArray():Float32Array|null { const offset = this.bb!.__offset(this.bb_pos, 6); return offset ? new Float32Array(this.bb!.bytes().buffer, this.bb!.bytes().byteOffset + this.bb!.__vector(this.bb_pos + offset), this.bb!.__vector_len(this.bb_pos + offset)) : null; } @@ -183,16 +183,16 @@ static startItemsVector(builder:flatbuffers.Builder, numElems:number) { builder.startVector(4, numElems, 4); } -static addMatrix(builder:flatbuffers.Builder, matrixOffset:flatbuffers.Offset) { - builder.addFieldOffset(1, matrixOffset, 0); +static addCoordinationMatrix(builder:flatbuffers.Builder, coordinationMatrixOffset:flatbuffers.Offset) { + builder.addFieldOffset(1, coordinationMatrixOffset, 0); } -static createMatrixVector(builder:flatbuffers.Builder, data:number[]|Float32Array):flatbuffers.Offset; +static createCoordinationMatrixVector(builder:flatbuffers.Builder, data:number[]|Float32Array):flatbuffers.Offset; /** * @deprecated This Uint8Array overload will be removed in the future. */ -static createMatrixVector(builder:flatbuffers.Builder, data:number[]|Uint8Array):flatbuffers.Offset; -static createMatrixVector(builder:flatbuffers.Builder, data:number[]|Float32Array|Uint8Array):flatbuffers.Offset { +static createCoordinationMatrixVector(builder:flatbuffers.Builder, data:number[]|Uint8Array):flatbuffers.Offset; +static createCoordinationMatrixVector(builder:flatbuffers.Builder, data:number[]|Float32Array|Uint8Array):flatbuffers.Offset { builder.startVector(4, data.length, 4); for (let i = data.length - 1; i >= 0; i--) { builder.addFloat32(data[i]!); @@ -200,7 +200,7 @@ static createMatrixVector(builder:flatbuffers.Builder, data:number[]|Float32Arra return builder.endVector(); } -static startMatrixVector(builder:flatbuffers.Builder, numElems:number) { +static startCoordinationMatrixVector(builder:flatbuffers.Builder, numElems:number) { builder.startVector(4, numElems, 4); } @@ -346,10 +346,10 @@ static finishSizePrefixedFragmentsGroupBuffer(builder:flatbuffers.Builder, offse builder.finish(offset, undefined, true); } -static createFragmentsGroup(builder:flatbuffers.Builder, itemsOffset:flatbuffers.Offset, matrixOffset:flatbuffers.Offset, idsOffset:flatbuffers.Offset, itemsKeysOffset:flatbuffers.Offset, itemsKeysIndicesOffset:flatbuffers.Offset, itemsRelsOffset:flatbuffers.Offset, itemsRelsIndicesOffset:flatbuffers.Offset, fragmentKeysOffset:flatbuffers.Offset, idOffset:flatbuffers.Offset, ifcNameOffset:flatbuffers.Offset, ifcDescriptionOffset:flatbuffers.Offset, ifcSchemaOffset:flatbuffers.Offset, maxExpressId:number):flatbuffers.Offset { +static createFragmentsGroup(builder:flatbuffers.Builder, itemsOffset:flatbuffers.Offset, coordinationMatrixOffset:flatbuffers.Offset, idsOffset:flatbuffers.Offset, itemsKeysOffset:flatbuffers.Offset, itemsKeysIndicesOffset:flatbuffers.Offset, itemsRelsOffset:flatbuffers.Offset, itemsRelsIndicesOffset:flatbuffers.Offset, fragmentKeysOffset:flatbuffers.Offset, idOffset:flatbuffers.Offset, ifcNameOffset:flatbuffers.Offset, ifcDescriptionOffset:flatbuffers.Offset, ifcSchemaOffset:flatbuffers.Offset, maxExpressId:number):flatbuffers.Offset { FragmentsGroup.startFragmentsGroup(builder); FragmentsGroup.addItems(builder, itemsOffset); - FragmentsGroup.addMatrix(builder, matrixOffset); + FragmentsGroup.addCoordinationMatrix(builder, coordinationMatrixOffset); FragmentsGroup.addIds(builder, idsOffset); FragmentsGroup.addItemsKeys(builder, itemsKeysOffset); FragmentsGroup.addItemsKeysIndices(builder, itemsKeysIndicesOffset); diff --git a/src/serializer.ts b/src/serializer.ts index 7f54d68..a9009cf 100644 --- a/src/serializer.ts +++ b/src/serializer.ts @@ -78,7 +78,7 @@ export class Serializer { const itemsVector = G.createItemsVector(builder, items); - const matrixVector = G.createMatrixVector( + const matrixVector = G.createCoordinationMatrixVector( builder, group.coordinationMatrix.elements ); @@ -145,7 +145,7 @@ export class Serializer { G.addItemsKeys(builder, keysVector); G.addItemsRelsIndices(builder, relsIVector); G.addItemsRels(builder, relsVector); - G.addMatrix(builder, matrixVector); + G.addCoordinationMatrix(builder, matrixVector); const result = FB.FragmentsGroup.endFragmentsGroup(builder); builder.finish(result); @@ -260,7 +260,7 @@ export class Serializer { maxExpressId: group.maxExpressId() || 0, }; - const matrixArray = group.matrixArray() || new Float32Array(); + const matrixArray = group.coordinationMatrixArray() || new Float32Array(); const ids = group.idsArray() || new Uint32Array(); const keysIndices = group.itemsKeysIndicesArray() || new Uint32Array(); const keysArray = group.itemsKeysArray() || new Uint32Array();