Fix build errors and migrate packages to latest release.
This commit is contained in:
@@ -34,7 +34,7 @@ set_target_properties(J3ML PROPERTIES LINKER_LANGUAGE CXX)
|
||||
|
||||
CPMAddPackage(
|
||||
NAME jtest
|
||||
URL https://git.redacted.cc/josh/jtest/archive/Release-1.4.zip
|
||||
URL https://git.redacted.cc/josh/jtest/archive/Release-1.5.zip
|
||||
)
|
||||
|
||||
target_include_directories(J3ML PUBLIC ${jtest_SOURCE_DIR}/include)
|
||||
|
@@ -64,9 +64,9 @@ namespace J3ML::LinearAlgebra {
|
||||
explicit Matrix3x3(const Quaternion& orientation);
|
||||
/// Constructs this matrix3x3 from the given euler angle.
|
||||
|
||||
explicit Matrix3x3(const EulerAngleXYZ& orientation);
|
||||
//explicit Matrix3x3(const EulerAngleXYZ& orientation);
|
||||
|
||||
explicit Matrix3x3(const AxisAngle& orientation);
|
||||
//explicit Matrix3x3(const AxisAngle& orientation);
|
||||
|
||||
/// Constructs this Matrix3x3 from a pointer to an array of floats.
|
||||
explicit Matrix3x3(const float *data);
|
||||
|
@@ -110,7 +110,7 @@ namespace J3ML::LinearAlgebra {
|
||||
}
|
||||
|
||||
Matrix3x3::Matrix3x3(const Quaternion& orientation) {
|
||||
*this = Matrix3x3(EulerAngleXYZ(orientation));
|
||||
//*this = Matrix3x3(EulerAngleXYZ(orientation));
|
||||
}
|
||||
|
||||
float Matrix3x3::Determinant() const {
|
||||
@@ -188,7 +188,7 @@ namespace J3ML::LinearAlgebra {
|
||||
};
|
||||
}
|
||||
|
||||
Quaternion Matrix3x3::ToQuat() const {
|
||||
/*Quaternion Matrix3x3::ToQuat() const {
|
||||
auto m00 = At(0,0);
|
||||
auto m01 = At(0, 1);
|
||||
auto m02 = At(0, 2);
|
||||
@@ -207,7 +207,7 @@ namespace J3ML::LinearAlgebra {
|
||||
(m10 - m01) / w4,
|
||||
w
|
||||
};
|
||||
}
|
||||
}*/
|
||||
|
||||
void Matrix3x3::SetRotatePart(const Vector3 &a, float angle) {
|
||||
float s = std::sin(angle);
|
||||
|
Reference in New Issue
Block a user