Building igl statically and moving to the dep scripts

Fixing dep build script on Windows and removing some warnings.

Use bundled igl by default.

Not building with the dependency scripts if not explicitly stated. This way, it will stay in
Fix the libigl patch to include C source files in header only mode.
This commit is contained in:
tamasmeszaros 2019-06-19 14:52:55 +02:00
parent 89e39e3895
commit 2ae2672ee9
1095 changed files with 181 additions and 5 deletions

View file

@ -0,0 +1,114 @@
// This file is part of libigl, a simple c++ geometry processing library.
//
// Copyright (C) 2015 Alec Jacobson <alecjacobson@gmail.com>
//
// 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/.
#include "sort_angles.h"
#include "LinSpaced.h"
#include <algorithm>
template <typename DerivedM, typename DerivedR>
IGL_INLINE void igl::sort_angles(
const Eigen::PlainObjectBase<DerivedM>& M,
Eigen::PlainObjectBase<DerivedR>& R) {
const size_t num_rows = M.rows();
const size_t num_cols = M.cols();
assert(num_cols >= 2);
R.resize(num_rows);
// Have to use << instead of = because Eigen's PlainObjectBase is annoying
R << igl::LinSpaced<
Eigen::Matrix<typename DerivedR::Scalar, Eigen::Dynamic, 1> >
(num_rows, 0, num_rows-1);
// |
// (pi/2, pi) | (0, pi/2)
// |
// -------------+--------------
// |
// (-pi, -pi/2) | (-pi/2, 0)
// |
auto comp = [&](size_t i, size_t j) {
auto yi = M(i, 0);
auto xi = M(i, 1);
auto yj = M(j, 0);
auto xj = M(j, 1);
if (xi == xj && yi == yj) {
for (size_t idx=2; idx<num_cols; idx++) {
auto i_val = M(i, idx);
auto j_val = M(j, idx);
if (i_val != j_val) {
return i_val < j_val;
}
}
// If the entire rows are equal, use the row index.
return i < j;
}
if (xi >= 0 && yi >= 0) {
if (xj >=0 && yj >= 0) {
if (xi != xj) {
return xi > xj;
} else {
return yi < yj;
}
} else if (xj < 0 && yj >= 0) {
return true;
} else if (xj < 0 && yj < 0) {
return false;
} else {
return false;
}
} else if (xi < 0 && yi >= 0) {
if (xj >= 0 && yj >= 0) {
return false;
} else if (xj < 0 && yj >= 0) {
if (xi != xj) {
return xi > xj;
} else {
return yi > yj;
}
} else if (xj < 0 && yj < 0) {
return false;
} else {
return false;
}
} else if (xi < 0 && yi < 0) {
if (xj >= 0 && yj >= 0) {
return true;
} else if (xj < 0 && yj >= 0) {
return true;
} else if (xj < 0 && yj < 0) {
if (xi != xj) {
return xi < xj;
} else {
return yi > yj;
}
} else {
return true;
}
} else {
if (xj >= 0 && yj >= 0) {
return true;
} else if (xj < 0 && yj >= 0) {
return true;
} else if (xj < 0 && yj < 0) {
return false;
} else {
if (xi != xj) {
return xi < xj;
} else {
return yi < yj;
}
}
}
};
std::sort(R.data(), R.data() + num_rows, comp);
}
#ifdef IGL_STATIC_LIBRARY
template void igl::sort_angles<Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, 1, 0, -1, 1> >(Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> >&);
#endif