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

Fix bug in PPM normal interpolation #46

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Fix bug in PPM normal interpolation #46

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
ed88e42
(ppm_to_ps) Use MeshIO, save point normals
csparker247 Oct 27, 2023
ded5a1d
(BarycentricCoordinates) Fix small bug in normal interpolation
csparker247 Oct 27, 2023
5ad3400
Ensure double
csparker247 Oct 27, 2023
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: 1 addition & 1 deletion core/src/BarycentricCoordinates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ auto vc::BarycentricNormalInterpolation(
const cv::Vec3d& nC) -> cv::Vec3d
{
return cv::normalize(
(1 - uvw[0] - uvw[1]) * nA + uvw[1] * nB + uvw[2] * nC);
uvw[0] * nA + uvw[1] * nB + (1. - uvw[0] - uvw[1]) * nC);
}

bool vc::CartesianPointIsInTriangle(
Expand Down
28 changes: 13 additions & 15 deletions utils/src/PPMToPointSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <boost/program_options.hpp>

#include "vc/core/filesystem.hpp"
#include "vc/core/io/OBJWriter.hpp"
#include "vc/core/io/MeshIO.hpp"
#include "vc/core/types/ITKMesh.hpp"
#include "vc/core/types/PerPixelMap.hpp"
#include "vc/core/util/String.hpp"
Expand All @@ -23,9 +23,9 @@ struct ROI {
};

// Converts ROI string to ROI struct
ROI ParseROI(const std::string& opt);
auto ParseROI(const std::string& opt) -> ROI;

int main(int argc, char* argv[])
auto main(int argc, char* argv[]) -> int
{
///// Parse the command line options /////
// All command line options
Expand All @@ -35,9 +35,9 @@ int main(int argc, char* argv[])
("help,h", "Show this message")
("ppm,p", po::value<std::string>()->required(), "Input PPM file")
("output-mesh,o", po::value<std::string>()->required(),
"Output OBJ mesh file")
"Output mesh file")
("roi", po::value<std::string>(), "String describing origin and width "
"and height of region-of-interest. Format: X+Y+WxH");
"and height of region-of-interest. Format: WxH+X+Y");

po::options_description all("Usage");
all.add(required);
Expand Down Expand Up @@ -93,25 +93,23 @@ int main(int argc, char* argv[])
}

auto id = mesh->GetNumberOfPoints();
auto pos = ppm.getAsPixelMap(y, x).pos;
mesh->SetPoint(id, pos.val);
auto pt = ppm.getAsPixelMap(y, x);
mesh->SetPoint(id, pt.pos.val);
mesh->SetPointData(id, pt.normal.val);
}
}

// Write the mesh
std::cout << "Write OBJ file..." << std::endl;
fs::path outputPath = parsed["output-mesh"].as<std::string>();
vc::io::OBJWriter writer;
writer.setPath(outputPath);
writer.setMesh(mesh);
writer.write();
vc::WriteMesh(outputPath, mesh);
}

// Convert ROI string to ROI struct
ROI ParseROI(const std::string& opt)
auto ParseROI(const std::string& opt) -> ROI
{
// Match against regex
std::regex roiRegex{"^[0-9]*\\+[0-9]*\\+[0-9]*x[0-9]*$"};
std::regex roiRegex{"^[0-9]*x[0-9]*\\+[0-9]*\\+[0-9]*$"};
if (!std::regex_match(opt.begin(), opt.end(), roiRegex)) {
std::cerr << "Cannot parse ROI: " << opt << std::endl;
exit(EXIT_FAILURE);
Expand All @@ -128,6 +126,6 @@ ROI ParseROI(const std::string& opt)
}

return {
std::stoull(strs[0]), std::stoull(strs[1]), std::stoull(strs[2]),
std::stoull(strs[3])};
std::stoull(strs[2]), std::stoull(strs[3]), std::stoull(strs[0]),
std::stoull(strs[1])};
}