Skip to content

C++20 compatible changes #83

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

Open
hollowsunhc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

C++20 compatible changes #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f0707
Update fmt and spdlog for C++20 compatibility
hollowsunhc Jun 5, 2025
9dfa636
C++20 compatible random number generator
hollowsunhc Jun 5, 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
8 changes: 4 additions & 4 deletions cmake/FloatTetwildDownloadExternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ endfunction()
## fmt
function(float_tetwild_download_fmt)
float_tetwild_download_project(fmt
URL https://github.com/fmtlib/fmt/archive/5.3.0.tar.gz
URL_MD5 1015bf3ff2a140dfe03de50ee2469401
GIT_REPOSITORY https://github.com/fmtlib/fmt
GIT_TAG 40626af88bd7df9a5fb80be7b25ac85b122d6c21
)
endfunction()

## spdlog
function(float_tetwild_download_spdlog)
float_tetwild_download_project(spdlog
URL https://github.com/gabime/spdlog/archive/v1.3.1.tar.gz
URL_MD5 3c17dd6983de2a66eca8b5a0b213d29f
GIT_REPOSITORY https://github.com/gabime/spdlog
GIT_TAG 6fa36017cfd5731d617e1a934f0e5ea9c4445b13
)
endfunction()

Expand Down
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ set(SOURCES
Types.hpp

Statistics.h

RandomSource.h
)

prepend_current_path(SOURCES)
Expand Down
14 changes: 14 additions & 0 deletions src/RandomSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// This file is part of fTetWild, a software for generating tetrahedral meshes.
//
// Copyright (C) 2019 Yixin Hu <yixin.hu@nyu.edu>
// This Source Code Form is subject to the terms of the Mozilla Public License
// v. 2.0. If a copy of the MPL was not distributed with this file, You can
// obtain one at http://mozilla.org/MPL/2.0/.
//

#ifndef FLOATTETWILD_RANDOMSOURCE_H
#define FLOATTETWILD_RANDOMSOURCE_H

std::random_device rd;

#endif //FLOATTETWILD_RANDOMSOURCE_H
7 changes: 6 additions & 1 deletion src/TriangleInsertion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

#include <floattetwild/MeshImprovement.h>//fortest

#include <floattetwild/RandomSource.h> // for rd

#include <igl/writeSTL.h>
#include <igl/writeOFF.h>
#include <igl/Timer.h>
Expand All @@ -34,6 +36,7 @@
#include <tbb/concurrent_vector.h>
#endif

#include <algorithm>
#include <bitset>
#include <numeric>
#include <unordered_map>
Expand Down Expand Up @@ -140,7 +143,9 @@ void floatTetWild::sort_input_faces(const std::vector<Vector3> &input_vertices,
if (mesh.params.not_sort_input)
return;

std::random_shuffle(sorted_f_ids.begin(), sorted_f_ids.end());
std::mt19937 g(rd()); // Standard mersenne_twister_engine seeded with rd()

std::shuffle(sorted_f_ids.begin(), sorted_f_ids.end(), g);
// std::sort(sorted_f_ids.begin(), sorted_f_ids.end(), [&weights](int a, int b) {
// return weights[a] < weights[b];
// });
Expand Down