Skip to content

Fix std::string / std::regex ambiguity and update logger for modern spdlog #98

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

Merged
SarahWeiii merged 3 commits into from
Apr 10, 2026
+29 −24
Merged

Fix std::string / std::regex ambiguity and update logger for modern spdlog #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ec28b
Refactor: Add explicit std:: namespace to string and regex
clintmorris229 Apr 10, 2026
292c7e2
update logger for modern spdlog
clintmorris229 Apr 10, 2026
3bcb7a3
Introduce a COACD_RUNTIME_FMT macro in src/logger.h. This safely
clintmorris229 Apr 10, 2026
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 main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ int main(int argc, char *argv[])
Params params;

// Model files
string input_model;
std::string input_model;
params.seed = (unsigned)time(NULL);

// args
Expand Down Expand Up @@ -117,7 +117,7 @@ int main(int argc, char *argv[])
}
}

string ext;
std::string ext;
if (params.input_model.length() > 4)
{
ext = params.input_model.substr(params.input_model.length() - 4);
Expand Down Expand Up @@ -207,8 +207,8 @@ int main(int argc, char *argv[])

RecoverParts(parts, bbox, rot, params);

string objName = regex_replace(params.output_name, regex("wrl"), "obj");
string wrlName = regex_replace(params.output_name, regex("obj"), "wrl");
std::string objName = regex_replace(params.output_name, std::regex("wrl"), "obj");
std::string wrlName = regex_replace(params.output_name, std::regex("obj"), "wrl");

SaveVRML(wrlName, parts, params);
SaveOBJ(objName, parts, params);
Expand Down
12 changes: 6 additions & 6 deletions src/io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace coacd
logger::info("\tRandom Seed: {}", params.seed);
}

void SaveMesh(const string &filename, Model &mesh)
void SaveMesh(const std::string &filename, Model &mesh)
{
std::ofstream os(filename);
for (int i = 0; i < (int)mesh.points.size(); ++i)
Expand All @@ -45,7 +45,7 @@ namespace coacd
os.close();
}

void SaveOBJ(const string &filename, vector<Model> parts, Params &params)
void SaveOBJ(const std::string &filename, vector<Model> parts, Params &params)
{
vector<int> v_numbers;
v_numbers.push_back(0);
Expand All @@ -68,13 +68,13 @@ namespace coacd
os.close();
}

void SaveOBJs(const string &foldername, const string &filename, vector<Model> parts, Params &params)
void SaveOBJs(const std::string &foldername, const std::string &filename, vector<Model> parts, Params &params)
{
int n_zero = 3;
for (int n = 0; n < (int)parts.size(); n++)
{
string num = to_string(n);
string idx = string(n_zero - num.length(), '0') + num;
std::string num = to_string(n);
std::string idx = std::string(n_zero - num.length(), '0') + num;
ofstream os(foldername + "/" + filename + "_" + idx + ".obj");
for (int i = 0; i < (int)parts[n].points.size(); ++i)
{
Expand Down Expand Up @@ -168,7 +168,7 @@ namespace coacd
}
}

void SaveVRML(const string &fileName, vector<Model>& meshes, Params &params)
void SaveVRML(const std::string &fileName, vector<Model>& meshes, Params &params)
{
ofstream foutCH(fileName);
if (foutCH.is_open())
Expand Down
9 changes: 4 additions & 5 deletions src/io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <iostream>
#include <sstream>
#include <stdio.h>
#include <string.h>
#include <string>
#include <vector>
#include <cstdlib>
Expand All @@ -29,10 +28,10 @@ namespace coacd
{

//////////////// IO ////////////////
void SaveMesh(const string &filename, Model &mesh);
void SaveMesh(const std::string &filename, Model &mesh);
void SaveConfig(Params params);
void SaveOBJ(const string &filename, vector<Model> parts, Params &params);
void SaveOBJs(const string &foldername, const string &filename, vector<Model> parts, Params &params);
void SaveOBJ(const std::string &filename, vector<Model> parts, Params &params);
void SaveOBJs(const std::string &foldername, const std::string &filename, vector<Model> parts, Params &params);
bool WriteVRML(ofstream &fout, Model mesh);
void SaveVRML(const string &fileName, vector<Model>& meshes, Params &params);
void SaveVRML(const std::string &fileName, vector<Model>& meshes, Params &params);
}
18 changes: 12 additions & 6 deletions src/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
#include <exception>
#ifndef DISABLE_SPDLOG
#include <spdlog/spdlog.h>

#if FMT_VERSION >= 80000
#define COACD_RUNTIME_FMT(x) fmt::runtime(x)
#else
#define COACD_RUNTIME_FMT(x) x
#endif
#else
#include <iostream>
#endif
Expand All @@ -28,7 +34,7 @@ namespace coacd
inline void debug(std::string_view fmt, const Args &...args)
{
#ifndef DISABLE_SPDLOG
get()->debug(fmt, args...);
get()->debug(COACD_RUNTIME_FMT(fmt), args...);
#else
doPrint(std::cout, fmt, args...);
#endif
Expand All @@ -38,7 +44,7 @@ namespace coacd
inline void info(std::string_view fmt, const Args &...args)
{
#ifndef DISABLE_SPDLOG
get()->info(fmt, args...);
get()->info(COACD_RUNTIME_FMT(fmt), args...);
#else
doPrint(std::cout, fmt, args...);
#endif
Expand All @@ -48,7 +54,7 @@ namespace coacd
inline void warn(std::string_view fmt, const Args &...args)
{
#ifndef DISABLE_SPDLOG
get()->warn(fmt, args...);
get()->warn(COACD_RUNTIME_FMT(fmt), args...);
#else
doPrint(std::cout, fmt, args...);
#endif
Expand All @@ -58,7 +64,7 @@ namespace coacd
inline void error(std::string_view fmt, const Args &...args)
{
#ifndef DISABLE_SPDLOG
get()->error(fmt, args...);
get()->error(COACD_RUNTIME_FMT(fmt), args...);
#else
doPrint(std::cout, fmt, args...);
#endif
Expand All @@ -68,11 +74,11 @@ namespace coacd
inline void critical(std::string_view fmt, const Args &...args)
{
#ifndef DISABLE_SPDLOG
get()->critical(fmt, args...);
get()->critical(COACD_RUNTIME_FMT(fmt), args...);
#else
doPrint(std::cout, fmt, args...);
#endif
};

} // namespace logger
} // namespace coacd
} // namespace coacd
4 changes: 2 additions & 2 deletions src/process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace coacd
return sqrt(pow(pt[0] - p[0], 2) + pow(pt[1] - p[1], 2) + pow(pt[2] - p[2], 2));
}

double compute_edge_cost(Model &ch, string apx_mode, int tri_i, int tri_j, vector<int> &rm_pt_idxs)
double compute_edge_cost(Model &ch, std::string apx_mode, int tri_i, int tri_j, vector<int> &rm_pt_idxs)
{
// Compute the edge length
double cost = pts_norm(ch.points[tri_i], ch.points[tri_j]);
Expand Down Expand Up @@ -138,7 +138,7 @@ namespace coacd
return cost;
}

void DecimateCH(Model &ch, int tgt_pts, string apx_mode)
void DecimateCH(Model &ch, int tgt_pts, std::string apx_mode)
{
if (tgt_pts >= (int)ch.points.size())
return;
Expand Down
2 changes: 1 addition & 1 deletion src/process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace coacd
{
extern thread_local std::mt19937 random_engine;

void DecimateCH(Model &ch, int tgt_pts, string apx_mode);
void DecimateCH(Model &ch, int tgt_pts, std::string apx_mode);
void DecimateConvexHulls(vector<Model> &cvxs, Params &params);
void MergeCH(Model &ch1, Model &ch2, Model &ch, Params &params);
double MergeConvexHulls(Model &m, vector<Model> &meshs, vector<Model> &cvxs, Params &params, double epsilon = 0.02, double threshold = 0.01);
Expand Down
Loading