Skip to content

Commit

Permalink
Check into breaking obj for win exe
Browse files Browse the repository at this point in the history
  • Loading branch information
ipadjen committed Jan 12, 2024
1 parent c6641e9 commit 8e909a6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ void IO::output_obj(const OutputFeaturesPtr& allFeatures) {
std::vector<std::ofstream> of;
std::vector<std::string> fs(numOutputSurfaces), bs(numOutputSurfaces);

std::vector<std::unordered_map<std::string, int>> dPts(numOutputSurfaces);
std::vector<std::unordered_map<std::string, unsigned long>> dPts(numOutputSurfaces);
//-- Output points
// int count = 0; // to output each building as a separate group
for (auto& f : allFeatures) {
Expand Down Expand Up @@ -441,7 +441,7 @@ void IO::output_cityjson(const OutputFeaturesPtr& allFeatures) {
void IO::get_obj_pts(const Mesh& mesh,
std::string& fs,
std::string& bs,
std::unordered_map<std::string, int>& dPts) {
std::unordered_map<std::string, unsigned long>& dPts) {
for (auto& face : mesh.faces()) {
if (IO::is_degen(mesh, face)) continue;
std::string bsTemp;
Expand Down Expand Up @@ -614,4 +614,4 @@ std::string IO::gen_key_bucket(const T& p) {
}
//- Explicit template instantiation
template std::string IO::gen_key_bucket<Point_3>(const Point_3& p);
template std::string IO::gen_key_bucket<Vector_3>(const Vector_3& p);
template std::string IO::gen_key_bucket<Vector_3>(const Vector_3& p);
4 changes: 2 additions & 2 deletions src/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace IO {
void output_stl(const OutputFeaturesPtr& allFeatures);
void output_cityjson(const OutputFeaturesPtr& allFeatures);

void get_obj_pts(const Mesh& mesh, std::string& fs, std::string& bs, std::unordered_map<std::string, int>& dPts);
void get_obj_pts(const Mesh& mesh, std::string& fs, std::string& bs, std::unordered_map<std::string, unsigned long>& dPts);
void get_stl_pts(Mesh& mesh, std::string& fs);
void get_cityjson_geom(const Mesh& mesh, nlohmann::json& g, std::unordered_map<std::string, int>& dPts, std::string primitive);

Expand All @@ -65,4 +65,4 @@ namespace IO {
template <typename T> std::string gen_key_bucket(const T& p);
}

#endif //CITY4CFD_IO_H
#endif //CITY4CFD_IO_H

0 comments on commit 8e909a6

Please sign in to comment.