Skip to content
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.

Sign up for GitHub

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

manifold: Update to 3.0.1 #101351

Merged
merged 1 commit into from
Jan 9, 2025
Merged

manifold: Update to 3.0.1 #101351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions thirdparty/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,12 @@ in the MSVC debugger.
## manifold

- Upstream: https://github.com/elalish/manifold
- Version: master (36035428bc32302a9d7c9ee1ecc833fb8394a2a3, 2024)
- Version: 3.0.1 (98b8142519d35c13e0e25cfa9fd6e3a271403be6, 2024)
- License: Apache 2.0

File extracted from upstream source:

- `src/`
- `src/` and `include/`, except from `CMakeLists.txt`, `cross_section.cpp` and `meshIO.{cpp,h}`
- `AUTHORS`, `LICENSE`


Expand Down
8 changes: 8 additions & 0 deletions thirdparty/manifold/include/manifold/manifold.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
#include <functional>
#include <memory>

#ifdef MANIFOLD_EXPORT
#include <iostream>
#endif

#include "manifold/common.h"
#include "manifold/vec_view.h"

Expand Down Expand Up @@ -376,6 +380,10 @@ class Manifold {

struct Impl;

#ifdef MANIFOLD_EXPORT
static Manifold ImportMeshGL64(std::istream& stream);
#endif

private:
Manifold(std::shared_ptr<CsgNode> pNode_);
Manifold(std::shared_ptr<Impl> pImpl_);
Expand Down
1 change: 1 addition & 0 deletions thirdparty/manifold/src/boolean_result.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@ Manifold::Impl Boolean3::Result(OpType op) const {
UpdateReference(outR, inP_, inQ_, invertQ);

outR.SimplifyTopology();
outR.RemoveUnreferencedVerts();

if (ManifoldParams().intermediateChecks)
DEBUG_ASSERT(outR.Is2Manifold(), logicErr,
Expand Down
6 changes: 3 additions & 3 deletions thirdparty/manifold/src/cross_section/cross_section.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,8 +740,8 @@ double CrossSection::Area() const { return C2::Area(GetPaths()->paths_); }
/**
* Return the number of vertices in the CrossSection.
*/
int CrossSection::NumVert() const {
int n = 0;
size_t CrossSection::NumVert() const {
size_t n = 0;
auto paths = GetPaths()->paths_;
for (auto p : paths) {
n += p.size();
Expand All @@ -753,7 +753,7 @@ int CrossSection::NumVert() const {
* Return the number of contours (both outer and inner paths) in the
* CrossSection.
*/
int CrossSection::NumContour() const { return GetPaths()->paths_.size(); }
size_t CrossSection::NumContour() const { return GetPaths()->paths_.size(); }

/**
* Does the CrossSection contain any contours?
Expand Down
Loading