Skip to content

Commit 68ca995

Browse files
authored
Merge branch 'ThatOpen:main' into main
2 parents ab7f4c3 + de9bedd commit 68ca995

File tree

4 files changed

+84
-92
lines changed

4 files changed

+84
-92
lines changed

package-lock.json

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cpp/wasm/web-ifc-wasm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "../web-ifc/geometry/operations/bim-geometry/alignment.h"
2424
#include "../web-ifc/geometry/operations/bim-geometry/utils.h"
2525
#include "../web-ifc/geometry/operations/bim-geometry/boolean.h"
26-
#include "../web-ifc/geometry/operations/bim-geometry/Profile.h"
26+
#include "../web-ifc/geometry/operations/bim-geometry/profile.h"
2727

2828
namespace webifc::parsing {
2929
void p21encode(std::string_view input, std::ostringstream &output);

src/cpp/web-ifc/geometry/IfcGeometryProcessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace webifc::geometry
5555
void Clear();
5656
IfcGeometryProcessor * Clone(const webifc::parsing::IfcLoader &loader) const;
5757

58-
private:
58+
protected:
5959
IfcGeometryProcessor(const IfcGeometrySettings &settings,std::unordered_map<uint32_t, IfcGeometry> expressIDToGeometry,const IfcGeometryLoader &geometryLoader,glm::dmat4 transformation, const parsing::IfcLoader &loader, booleanManager boolEngine, const schema::IfcSchemaManager &schemaManager, bool isCoordinated, uint32_t expressIdCyl, uint32_t expressIdRect, glm::dmat4 coordinationMatrix, IfcGeometry predefinedCylinder, IfcGeometry predefinedCube);
6060
IfcGeometrySettings _settings;
6161

yarn.lock

Lines changed: 52 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@
3333
integrity sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==
3434

3535
"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9":
36-
version "7.27.1"
37-
resolved "https://registry.npmjs.org/@babel/core/-/core-7.27.1.tgz"
38-
integrity sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==
36+
version "7.27.4"
37+
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.4.tgz#cc1fc55d0ce140a1828d1dd2a2eba285adbfb3ce"
38+
integrity sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==
3939
dependencies:
4040
"@ampproject/remapping" "^2.2.0"
4141
"@babel/code-frame" "^7.27.1"
42-
"@babel/generator" "^7.27.1"
43-
"@babel/helper-compilation-targets" "^7.27.1"
44-
"@babel/helper-module-transforms" "^7.27.1"
45-
"@babel/helpers" "^7.27.1"
46-
"@babel/parser" "^7.27.1"
47-
"@babel/template" "^7.27.1"
48-
"@babel/traverse" "^7.27.1"
49-
"@babel/types" "^7.27.1"
42+
"@babel/generator" "^7.27.3"
43+
"@babel/helper-compilation-targets" "^7.27.2"
44+
"@babel/helper-module-transforms" "^7.27.3"
45+
"@babel/helpers" "^7.27.4"
46+
"@babel/parser" "^7.27.4"
47+
"@babel/template" "^7.27.2"
48+
"@babel/traverse" "^7.27.4"
49+
"@babel/types" "^7.27.3"
5050
convert-source-map "^2.0.0"
5151
debug "^4.1.0"
5252
gensync "^1.0.0-beta.2"
5353
json5 "^2.2.3"
5454
semver "^6.3.1"
5555

56-
"@babel/generator@^7.27.1", "@babel/generator@^7.27.3", "@babel/generator@^7.7.2":
56+
"@babel/generator@^7.27.3", "@babel/generator@^7.7.2":
5757
version "7.27.5"
5858
resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.27.5.tgz"
5959
integrity sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==
@@ -64,9 +64,9 @@
6464
"@jridgewell/trace-mapping" "^0.3.25"
6565
jsesc "^3.0.2"
6666

67-
"@babel/helper-compilation-targets@^7.27.1":
67+
"@babel/helper-compilation-targets@^7.27.2":
6868
version "7.27.2"
69-
resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz"
69+
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
7070
integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
7171
dependencies:
7272
"@babel/compat-data" "^7.27.2"
@@ -83,7 +83,7 @@
8383
"@babel/traverse" "^7.27.1"
8484
"@babel/types" "^7.27.1"
8585

86-
"@babel/helper-module-transforms@^7.27.1":
86+
"@babel/helper-module-transforms@^7.27.3":
8787
version "7.27.3"
8888
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz#db0bbcfba5802f9ef7870705a7ef8788508ede02"
8989
integrity sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==
@@ -112,15 +112,15 @@
112112
resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz"
113113
integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
114114

115-
"@babel/helpers@^7.27.1":
115+
"@babel/helpers@^7.27.4":
116116
version "7.27.6"
117117
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.6.tgz#6456fed15b2cb669d2d1fabe84b66b34991d812c"
118118
integrity sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==
119119
dependencies:
120120
"@babel/template" "^7.27.2"
121121
"@babel/types" "^7.27.6"
122122

123-
"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.27.1", "@babel/parser@^7.27.2", "@babel/parser@^7.27.4", "@babel/parser@^7.27.5":
123+
"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.27.2", "@babel/parser@^7.27.4", "@babel/parser@^7.27.5":
124124
version "7.27.5"
125125
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz"
126126
integrity sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==
@@ -246,7 +246,7 @@
246246
dependencies:
247247
"@babel/helper-plugin-utils" "^7.27.1"
248248

249-
"@babel/template@^7.27.1", "@babel/template@^7.27.2", "@babel/template@^7.3.3":
249+
"@babel/template@^7.27.2", "@babel/template@^7.3.3":
250250
version "7.27.2"
251251
resolved "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz"
252252
integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
@@ -255,9 +255,9 @@
255255
"@babel/parser" "^7.27.2"
256256
"@babel/types" "^7.27.1"
257257

258-
"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3":
258+
"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.27.4":
259259
version "7.27.4"
260-
resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz"
260+
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.4.tgz#b0045ac7023c8472c3d35effd7cc9ebd638da6ea"
261261
integrity sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==
262262
dependencies:
263263
"@babel/code-frame" "^7.27.1"
@@ -419,14 +419,14 @@
419419
integrity sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==
420420

421421
"@gerrit0/mini-shiki@^3.2.2":
422-
version "3.4.2"
423-
resolved "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.4.2.tgz"
424-
integrity sha512-3jXo5bNjvvimvdbIhKGfFxSnKCX+MA8wzHv55ptzk/cx8wOzT+BRcYgj8aFN3yTiTs+zvQQiaZFr7Jce1ZG3fw==
425-
dependencies:
426-
"@shikijs/engine-oniguruma" "^3.4.2"
427-
"@shikijs/langs" "^3.4.2"
428-
"@shikijs/themes" "^3.4.2"
429-
"@shikijs/types" "^3.4.2"
422+
version "3.6.0"
423+
resolved "https://registry.yarnpkg.com/@gerrit0/mini-shiki/-/mini-shiki-3.6.0.tgz#5c9b7a87fee29faa64aace00733a1691c691a999"
424+
integrity sha512-KaeJvPNofTEZR9EzVNp/GQzbQqkGfjiu6k3CXKvhVTX+8OoAKSX/k7qxLKOX3B0yh2XqVAc93rsOu48CGt2Qug==
425+
dependencies:
426+
"@shikijs/engine-oniguruma" "^3.6.0"
427+
"@shikijs/langs" "^3.6.0"
428+
"@shikijs/themes" "^3.6.0"
429+
"@shikijs/types" "^3.6.0"
430430
"@shikijs/vscode-textmate" "^10.0.2"
431431

432432
"@hapi/bourne@^3.0.0":
@@ -722,44 +722,36 @@
722722
"@nodelib/fs.scandir" "2.1.5"
723723
fastq "^1.6.0"
724724

725-
"@shikijs/engine-oniguruma@^3.4.2":
725+
"@shikijs/engine-oniguruma@^3.6.0":
726726
version "3.6.0"
727-
resolved "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.6.0.tgz"
727+
resolved "https://registry.yarnpkg.com/@shikijs/engine-oniguruma/-/engine-oniguruma-3.6.0.tgz#dce6074a258f1b349ff043eddba9779e76984769"
728728
integrity sha512-nmOhIZ9yT3Grd+2plmW/d8+vZ2pcQmo/UnVwXMUXAKTXdi+LK0S08Ancrz5tQQPkxvjBalpMW2aKvwXfelauvA==
729729
dependencies:
730730
"@shikijs/types" "3.6.0"
731731
"@shikijs/vscode-textmate" "^10.0.2"
732732

733-
"@shikijs/langs@^3.4.2":
733+
"@shikijs/langs@^3.6.0":
734734
version "3.6.0"
735735
resolved "https://registry.yarnpkg.com/@shikijs/langs/-/langs-3.6.0.tgz#e3faea60e12c9bcdbebeeac14975c71f927bc7cb"
736736
integrity sha512-IdZkQJaLBu1LCYCwkr30hNuSDfllOT8RWYVZK1tD2J03DkiagYKRxj/pDSl8Didml3xxuyzUjgtioInwEQM/TA==
737737
dependencies:
738738
"@shikijs/types" "3.6.0"
739739

740-
"@shikijs/themes@^3.4.2":
740+
"@shikijs/themes@^3.6.0":
741741
version "3.6.0"
742-
resolved "https://registry.npmjs.org/@shikijs/themes/-/themes-3.6.0.tgz"
742+
resolved "https://registry.yarnpkg.com/@shikijs/themes/-/themes-3.6.0.tgz#6003780e033f9fec6b1336395a8994be17959e81"
743743
integrity sha512-Fq2j4nWr1DF4drvmhqKq8x5vVQ27VncF8XZMBuHuQMZvUSS3NBgpqfwz/FoGe36+W6PvniZ1yDlg2d4kmYDU6w==
744744
dependencies:
745745
"@shikijs/types" "3.6.0"
746746

747-
"@shikijs/types@3.6.0":
747+
"@shikijs/types@3.6.0", "@shikijs/types@^3.6.0":
748748
version "3.6.0"
749749
resolved "https://registry.npmjs.org/@shikijs/types/-/types-3.6.0.tgz"
750750
integrity sha512-cLWFiToxYu0aAzJqhXTQsFiJRTFDAGl93IrMSBNaGSzs7ixkLfdG6pH11HipuWFGW5vyx4X47W8HDQ7eSrmBUg==
751751
dependencies:
752752
"@shikijs/vscode-textmate" "^10.0.2"
753753
"@types/hast" "^3.0.4"
754754

755-
"@shikijs/types@^3.4.2":
756-
version "3.4.2"
757-
resolved "https://registry.npmjs.org/@shikijs/types/-/types-3.4.2.tgz"
758-
integrity sha512-zHC1l7L+eQlDXLnxvM9R91Efh2V4+rN3oMVS2swCBssbj2U/FBwybD1eeLaq8yl/iwT+zih8iUbTBCgGZOYlVg==
759-
dependencies:
760-
"@shikijs/vscode-textmate" "^10.0.2"
761-
"@types/hast" "^3.0.4"
762-
763755
"@shikijs/vscode-textmate@^10.0.2":
764756
version "10.0.2"
765757
resolved "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz"
@@ -889,11 +881,11 @@
889881
pretty-format "^29.0.0"
890882

891883
"@types/node@*":
892-
version "22.15.30"
893-
resolved "https://registry.npmjs.org/@types/node/-/node-22.15.30.tgz"
894-
integrity sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==
884+
version "24.0.3"
885+
resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.3.tgz#f935910f3eece3a3a2f8be86b96ba833dc286cab"
886+
integrity sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==
895887
dependencies:
896-
undici-types "~6.21.0"
888+
undici-types "~7.8.0"
897889

898890
"@types/stack-utils@^2.0.0":
899891
version "2.0.3"
@@ -1194,12 +1186,12 @@ braces@^3.0.3:
11941186
fill-range "^7.1.1"
11951187

11961188
browserslist@^4.24.0:
1197-
version "4.24.5"
1198-
resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz"
1199-
integrity sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==
1189+
version "4.25.0"
1190+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.0.tgz#986aa9c6d87916885da2b50d8eb577ac8d133b2c"
1191+
integrity sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==
12001192
dependencies:
1201-
caniuse-lite "^1.0.30001716"
1202-
electron-to-chromium "^1.5.149"
1193+
caniuse-lite "^1.0.30001718"
1194+
electron-to-chromium "^1.5.160"
12031195
node-releases "^2.0.19"
12041196
update-browserslist-db "^1.1.3"
12051197

@@ -1276,7 +1268,7 @@ camelcase@^6.2.0:
12761268
resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"
12771269
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
12781270

1279-
caniuse-lite@^1.0.30001716:
1271+
caniuse-lite@^1.0.30001718:
12801272
version "1.0.30001723"
12811273
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz#c4f3174f02089720736e1887eab345e09bb10944"
12821274
integrity sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==
@@ -1614,10 +1606,10 @@ ejs@^3.1.10:
16141606
dependencies:
16151607
jake "^10.8.5"
16161608

1617-
electron-to-chromium@^1.5.149:
1618-
version "1.5.165"
1619-
resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.165.tgz"
1620-
integrity sha512-naiMx1Z6Nb2TxPU6fiFrUrDTjyPMLdTtaOd2oLmG8zVSg2hCWGkhPyxwk+qRmZ1ytwVqUv0u7ZcDA5+ALhaUtw==
1609+
electron-to-chromium@^1.5.160:
1610+
version "1.5.171"
1611+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.171.tgz#e552b4fd73d4dd941ee4c70ae288a8a39f818726"
1612+
integrity sha512-scWpzXEJEMrGJa4Y6m/tVotb0WuvNmasv3wWVzUAeCgKU0ToFOhUW6Z+xWnRQANMYGxN4ngJXIThgBJOqzVPCQ==
16211613

16221614
emittery@^0.13.1:
16231615
version "0.13.1"
@@ -4022,10 +4014,10 @@ uc.micro@^2.0.0, uc.micro@^2.1.0:
40224014
resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz"
40234015
integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
40244016

4025-
undici-types@~6.21.0:
4026-
version "6.21.0"
4027-
resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz"
4028-
integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
4017+
undici-types@~7.8.0:
4018+
version "7.8.0"
4019+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.8.0.tgz#de00b85b710c54122e44fbfd911f8d70174cd294"
4020+
integrity sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==
40294021

40304022
unpipe@1.0.0:
40314023
version "1.0.0"

0 commit comments

Comments
 (0)