Skip to content

update develop branch with all changes from main #5

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.

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 28 commits into from
Mar 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1d457f0
replace deprecated std::wstring_convert, close shape in Extrude()
ifcapps Feb 18, 2025
3241f7a
In Extrude(), check if first point is equal to last point, otherwise …
ifcapps Feb 18, 2025
1f31adb
add tabs to make diff cleaner
ifcapps Feb 18, 2025
a891211
enable polylines as mesh for IFCGRID. add bounds checks
ifcapps Feb 18, 2025
9c1d98e
make scaling mehses optional
ifcapps Feb 18, 2025
d34103c
Merge pull request #1 from ThatOpen/main
ifcapps Feb 25, 2025
fc1a599
in VectorToAngle: add check for zero, to avoid inf values in mesh
ifcapps Feb 25, 2025
3980414
add IFCTOPOLOGYREPRESENTATION, add IFCFACESURFACE, IFCEDGE and IFCCAR…
ifcapps Feb 28, 2025
33b3985
Merge branch 'main' of https://github.com/ThatOpen/engine_web-ifc int…
ifcapps Mar 1, 2025
e669f4a
t push origin mainMerge branch 'ThatOpen-main'
ifcapps Mar 1, 2025
1a97a85
Merge branch 'ThatOpen:main' into main
ifcapps Mar 5, 2025
e62a593
adjustable number of output curve points in BSpline curves
ifcapps Mar 6, 2025
d702ac6
IfcLoader::SaveFile: option to order the STEP lines
ifcapps Mar 6, 2025
8a75cf7
complete IFCAXIS2PLACEMENTLINEAR
ifcapps Mar 6, 2025
af83ba0
disable TriangulateCylindricalSurface
ifcapps Mar 6, 2025
47e7997
add IFCPOLYNOMIALCURVE in IfcGeometryLoader::ComputeCurve
ifcapps Mar 6, 2025
860e837
add IFCCLOTHOID, add double IfcGeometryLoader::ReadCurveMeasureSelect…
ifcapps Mar 10, 2025
ded2dd6
Merge branch 'ThatOpen:main' into main
ifcapps Mar 10, 2025
670e6d2
add IFCCOMPOSITECURVE in IfcGeometryProcessor::GetMesh
ifcapps Mar 11, 2025
5d2d2f0
complete implementation in SectionedSurface
ifcapps Mar 12, 2025
539a6f5
complete SectionedSurface
ifcapps Mar 12, 2025
fb8bbb1
fix IFCCLOTHOID curve computation
ifcapps Mar 12, 2025
bfb3532
add argument orderLinesByExpressID in SaveFile
ifcapps Mar 13, 2025
52901d2
Restore color of geometric items after flatten() and BoolProcess()
ifcapps Mar 18, 2025
0fe5aa1
Add check for nan in Nurbs. Add check for IfcTokenType::LINE_END in I…
ifcapps Mar 18, 2025
d199fb8
replace map.contains with find, to be able to compile with C++ 17
ifcapps Mar 27, 2025
b576957
add test script "regression-save-glb"
ifcapps Mar 27, 2025
be02d86
exclude polygons during triangle mesh export
ifcapps Mar 28, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ examples/nodejs/*.ifc
tests/ifcfiles/private/*.ifc
tests/ifcfiles/private/*.stl
tests/ifcfiles/created.ifc
src/cpp/_deps/
yarn.lock
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"postversion": "node src/setversion.js",
"benchmark": "ts-node ./tests/benchmark/benchmark.ts",
"regression": "node --max-old-space-size=8192 ./tests/regression/regression.mjs",
"regression-save-glb": "node --max-old-space-size=8192 ./tests/regression/regression-save-glb.mjs",
"regression-update": "node --max-old-space-size=8192 ./tests/regression/regression.mjs update",
"test": "jest --runInBand ",
"gen-docs": "typedoc --out dist/docs && cpy ./banner.png ./dist/docs",
Expand Down
9 changes: 9 additions & 0 deletions src/cpp/test/io_helpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ namespace webifc::io
}
writeFile(filename, makeSVGLines(points2D, indices));
}
void DumpSVGCurveXY(std::vector<glm::dvec3> points, std::string filename, std::vector<uint32_t> indices)
{
std::vector<glm::dvec2> points2D;
for (auto &pt : points)
{
points2D.emplace_back(pt.x, pt.y);
}
writeFile(filename, makeSVGLines(points2D, indices));
}

void svgMakeLine(glm::dvec2 a, glm::dvec2 b, std::stringstream &svg, std::string col)
{
Expand Down
1 change: 1 addition & 0 deletions src/cpp/test/io_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ namespace webifc::io

void writeFile(std::string filename, std::string data);
void DumpSVGCurve(std::vector<glm::dvec3> points, std::string filename, std::vector<uint32_t> indices = {});
void DumpSVGCurveXY(std::vector<glm::dvec3> points, std::string filename, std::vector<uint32_t> indices = {});
void svgMakeLine(glm::dvec2 a, glm::dvec2 b, std::stringstream &svg, std::string col = "rgb(255,0,0)");
void SVGLinesToString(Bounds bounds, glm::dvec2 size, glm::dvec2 offset, SVGLineSet lineSet, std::stringstream &svg);
std::string makeSVGLines(SVGDrawing drawing);
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/wasm/web-ifc-wasm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void SaveModel(uint32_t modelID, emscripten::val callback)
{
emscripten::val retVal = callback((uint32_t)src, srcSize);
}
);
, false);
}

int GetModelSize(uint32_t modelID) {
Expand Down
Loading
Loading