Skip to content

Commit d417461

Browse files
committed
Merge branch 'main' of https://github.com/IFCjs/web-ifc
2 parents fd65d12 + 7f8c6a8 commit d417461

16 files changed

+224
-322
lines changed

benchmark.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# System informations
2-
{"gpu":"","cpuName":"Apple M1","freeRam":152.375,"totalRam":8192}
2+
{"gpu":"","cpuName":"Apple M1","freeRam":18.25390625,"totalRam":8192}
33
_________
44
| filename | Size (mo) | Time to open model (ms) | Time to execute all (ms) | Total ifc entities | Total meshes | Total geometries | total errors |
55
|-------|-------|-------|-------|-------|-------|-------|-------|
6-
| ifcfiles/advanced_model.ifc.test | 33.67 | 413 | 1623 | 594374 | 6401 | 14120 | 0 |
7-
ifcfiles/dental_clinic.ifc.test | 12.4 | 140 | 376 | 209259 | 2586 | 2626 | 0 |
8-
ifcfiles/example.ifc.test | 0.39 | 5 | 9 | 6487 | 115 | 119 | 0 |
9-
ifcfiles/tested_sample_project.ifc.test | 0.68 | 7 | 97 | 14119 | 93 | 98 | 0 |
6+
| ifcfiles/advanced_model.ifc.test | 33.67 | 428 | 2711 | 594374 | 6401 | 14120 | 0 |
7+
ifcfiles/dental_clinic.ifc.test | 12.4 | 243 | 1149 | 209259 | 2586 | 2626 | 176 |
8+
ifcfiles/example.ifc.test | 0.39 | 6 | 12 | 6487 | 115 | 119 | 0 |
9+
ifcfiles/tested_sample_project.ifc.test | 0.68 | 9 | 135 | 14119 | 93 | 98 | 0 |

examples/usage/src/exporting.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export default async function() {
2828
};
2929
}
3030

31-
// TODO: exports are NOT lossless, currently losing header and double precision
32-
Equals("In eq out", diffBytes, 403771);
31+
Equals("In eq out", diffBytes, 403899);
3332
});
3433
}

src/wasm/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if (EMSCRIPTEN)
7676
target_compile_options(web-ifc PUBLIC "-Wextra")
7777
target_compile_options(web-ifc PUBLIC "-Wpedantic")
7878
target_compile_options(web-ifc PUBLIC "-pedantic")
79-
if (release)
79+
if (RELEASE)
8080
target_compile_options(web-ifc PUBLIC "-O3")
8181
endif()
8282
set_target_properties(web-ifc PROPERTIES LINK_FLAGS "${DEBUG_FLAG} --bind -flto --define-macro=REAL_T_IS_DOUBLE -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -sSTACK_SIZE=5MB -s EXPORT_NAME=WebIFCWasm -s MODULARIZE=1 -s ENVIRONMENT=web")
@@ -92,7 +92,7 @@ if (EMSCRIPTEN)
9292
target_compile_options(web-ifc-node PUBLIC "-Wextra")
9393
target_compile_options(web-ifc-node PUBLIC "-Wpedantic")
9494
target_compile_options(web-ifc-node PUBLIC "-pedantic")
95-
if (release)
95+
if (RELEASE)
9696
target_compile_options(web-ifc-node PUBLIC "-O3")
9797
endif()
9898
set_target_properties(web-ifc-node PROPERTIES LINK_FLAGS "${DEBUG_FLAG} --bind -flto --define-macro=REAL_T_IS_DOUBLE -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -sSTACK_SIZE=5MB -s EXPORT_NAME=WebIFCWasm -s MODULARIZE=1 ")
@@ -111,7 +111,7 @@ if (EMSCRIPTEN)
111111
target_compile_options(web-ifc-mt PUBLIC "-Wextra")
112112
target_compile_options(web-ifc-mt PUBLIC "-Wpedantic")
113113
target_compile_options(web-ifc-mt PUBLIC "-pedantic")
114-
if (release)
114+
if (RELEASE)
115115
target_compile_options(web-ifc-mt PUBLIC "-O3")
116116
endif()
117117
set_target_properties(web-ifc-mt PROPERTIES LINK_FLAGS "${DEBUG_FLAG} -pthread -s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency --bind -flto --define-macro=REAL_T_IS_DOUBLE -sSTACK_SIZE=5MB -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s EXPORT_NAME=WebIFCWasm -s MODULARIZE=1 -s ENVIRONMENT=web,worker")
@@ -133,7 +133,7 @@ if (NOT EMSCRIPTEN)
133133
target_compile_options(web-ifc-test PUBLIC "-Wextra")
134134
target_compile_options(web-ifc-test PUBLIC "-Wpedantic")
135135
target_compile_options(web-ifc-test PUBLIC "-pedantic")
136-
if (release)
136+
if (RELEASE)
137137
target_compile_options(web-ifc-test PUBLIC "-O3")
138138
endif()
139139
add_test (web-ifc-test web-ifc-test)
@@ -155,7 +155,8 @@ if (NOT EMSCRIPTEN)
155155
#comment these to prevent debug files being generated
156156
target_compile_options(web-ifc PUBLIC "-DCSG_DEBUG_OUTPUT")
157157
target_compile_options(web-ifc PUBLIC "-DDEBUG_DUMP_SVG")
158-
if (release)
158+
if (RELEASE)
159159
target_compile_options(web-ifc PUBLIC "-O3")
160+
set_target_properties(web-ifc PROPERTIES LINK_FLAGS "-O3")
160161
endif()
161162
endif()

0 commit comments

Comments
 (0)