refactor: unify Object signal system, update property connections, and integrate Eigen3 into Root module
This commit is contained in:
@@ -50,9 +50,9 @@
|
||||
// #include <Eigen/src/Core/Matrix.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <Eigen/Dense>
|
||||
#include "Core/Types.h"
|
||||
#include "Core/Property.h"
|
||||
#include "Core/Types.h"
|
||||
#include <Eigen/Dense>
|
||||
|
||||
//// BOOST SERIALIZATION ///////////////////////////////////////////////////////
|
||||
|
||||
@@ -150,7 +150,6 @@ typedef Eigen::MatrixXi MatrixXi;
|
||||
typedef Eigen::MatrixXf MatrixXf;
|
||||
typedef Eigen::MatrixXd MatrixXd;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Vector String interaction ///////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -192,7 +191,7 @@ std::string VectorxT_ToString(const Eigen::Matrix<T, size, 1> &vec) {
|
||||
// }
|
||||
|
||||
template <typename T, int size>
|
||||
void operator >> (std::string &str, Eigen::Matrix<T, size, 1> &vec) {
|
||||
void operator>>(std::string &str, Eigen::Matrix<T, size, 1> &vec) {
|
||||
VectorxT_StringTo(vec, str);
|
||||
}
|
||||
|
||||
@@ -205,9 +204,7 @@ public:
|
||||
typedef Eigen::Matrix<Scalarf, 4, 1> BaseClass;
|
||||
|
||||
_HPoint3f() : BaseClass(0, 0, 0, p) {}
|
||||
_HPoint3f(int rows, int cols) : BaseClass() {
|
||||
this->operator()(3) = p;
|
||||
}
|
||||
_HPoint3f(int rows, int cols) : BaseClass() { this->operator()(3) = p; }
|
||||
_HPoint3f(float x, float y, float z) : BaseClass(x, y, z, p) {}
|
||||
_HPoint3f(Vector3f &in) : BaseClass(in.homogeneous()) {
|
||||
this->operator()(3) = p;
|
||||
@@ -250,24 +247,24 @@ struct _HError3f {
|
||||
HVector3f position_error;
|
||||
HVector3f direction_error;
|
||||
};
|
||||
typedef struct _HError3f HError3f;
|
||||
|
||||
inline std::ostream &operator<<(std::ostream &stream, const HError3f &err) {
|
||||
stream << "HError3f(" << "ept[" << err.position_error.transpose()
|
||||
<< "] , edr[" << err.direction_error.transpose() << "]) ";
|
||||
return stream;
|
||||
}
|
||||
|
||||
typedef Property<Scalari> ScalariProperty;
|
||||
typedef Property<Scalarui> ScalaruiProperty;
|
||||
typedef Property<Scalarl> ScalarlProperty;
|
||||
typedef Property<Scalarul> ScalarulProperty;
|
||||
typedef Property<Scalarf> ScalarfProperty;
|
||||
typedef Property<Scalard> ScalardProperty;
|
||||
typedef struct _HError3f HError3f;
|
||||
|
||||
typedef Property<Vector1i> Vector1iProperty;
|
||||
typedef Property<Vector1f> Vector1fProperty;
|
||||
typedef Property<Vector1d> Vector1dProperty;
|
||||
inline std::ostream &operator<<(std::ostream &stream, const HError3f &err) {
|
||||
stream << "HError3f(" << "ept[" << err.position_error.transpose()
|
||||
<< "] , edr[" << err.direction_error.transpose() << "]) ";
|
||||
return stream;
|
||||
}
|
||||
|
||||
typedef Property<Scalari> ScalariProperty;
|
||||
typedef Property<Scalarui> ScalaruiProperty;
|
||||
typedef Property<Scalarl> ScalarlProperty;
|
||||
typedef Property<Scalarul> ScalarulProperty;
|
||||
typedef Property<Scalarf> ScalarfProperty;
|
||||
typedef Property<Scalard> ScalardProperty;
|
||||
|
||||
typedef Property<Vector1i> Vector1iProperty;
|
||||
typedef Property<Vector1f> Vector1fProperty;
|
||||
typedef Property<Vector1d> Vector1dProperty;
|
||||
|
||||
typedef Property<Vector2i> Vector2iProperty;
|
||||
typedef Property<Vector3i> Vector3iProperty;
|
||||
@@ -294,9 +291,9 @@ typedef Property<Matrix3d> Matrix3dProperty;
|
||||
typedef Property<Matrix4d> Matrix4dProperty;
|
||||
|
||||
typedef Property<HVector3f> HVector3fProperty;
|
||||
typedef Property<HPoint3f> HPoint3fProperty;
|
||||
typedef Property<HPoint3f> HPoint3fProperty;
|
||||
|
||||
} // namespace uLib
|
||||
} // namespace uLib
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user