Compare commits
No commits in common. "a40fc777629a4968388ded281ada46f251c436de" and "7e4041e50fcec154535d44fa732d60b9bdaf81b9" have entirely different histories.
a40fc77762
...
7e4041e50f
2 changed files with 53 additions and 58 deletions
|
@ -1,9 +1,5 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Upcoming Changes
|
|
||||||
|
|
||||||
Refactoring of internally used function.
|
|
||||||
|
|
||||||
## Version 2.1.0
|
## Version 2.1.0
|
||||||
|
|
||||||
Refactoring of internally used function(s).
|
Refactoring of internally used function(s).
|
||||||
|
|
107
src/sc_sacd.cpp
107
src/sc_sacd.cpp
|
@ -146,68 +146,67 @@ std::array<SC_SACD_Vec3, 3> SC_SACD_Get_Box_Normals_Normalized(
|
||||||
return normals;
|
return normals;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::array<SC_SACD_Vec3, 8> SC_SACD_Get_Box_Corners(
|
std::vector<SC_SACD_Vec3> SC_SACD_Get_Box_Corners(
|
||||||
const SC_SACD_Generic_Box *box) {
|
const SC_SACD_Generic_Box *box) {
|
||||||
SC_SACD_Vec3 corner_0 =
|
std::vector<SC_SACD_Vec3> corners;
|
||||||
box->transform *
|
|
||||||
SC_SACD_Vec3{-box->width / 2.0F, -box->height / 2.0F, -box->depth / 2.0F};
|
|
||||||
corner_0.x += box->x;
|
|
||||||
corner_0.y += box->y;
|
|
||||||
corner_0.z += box->z;
|
|
||||||
|
|
||||||
SC_SACD_Vec3 corner_1 =
|
corners.push_back(box->transform * SC_SACD_Vec3{-box->width / 2.0F,
|
||||||
box->transform *
|
-box->height / 2.0F,
|
||||||
SC_SACD_Vec3{box->width / 2.0F, -box->height / 2.0F, -box->depth / 2.0F};
|
-box->depth / 2.0F});
|
||||||
corner_1.x += box->x;
|
corners.back().x += box->x;
|
||||||
corner_1.y += box->y;
|
corners.back().y += box->y;
|
||||||
corner_1.z += box->z;
|
corners.back().z += box->z;
|
||||||
|
|
||||||
SC_SACD_Vec3 corner_2 =
|
corners.push_back(box->transform * SC_SACD_Vec3{box->width / 2.0F,
|
||||||
box->transform *
|
-box->height / 2.0F,
|
||||||
SC_SACD_Vec3{-box->width / 2.0F, box->height / 2.0F, -box->depth / 2.0F};
|
-box->depth / 2.0F});
|
||||||
corner_2.x += box->x;
|
corners.back().x += box->x;
|
||||||
corner_2.y += box->y;
|
corners.back().y += box->y;
|
||||||
corner_2.z += box->z;
|
corners.back().z += box->z;
|
||||||
|
|
||||||
SC_SACD_Vec3 corner_3 =
|
corners.push_back(box->transform * SC_SACD_Vec3{-box->width / 2.0F,
|
||||||
box->transform *
|
box->height / 2.0F,
|
||||||
SC_SACD_Vec3{box->width / 2.0F, box->height / 2.0F, -box->depth / 2.0F};
|
-box->depth / 2.0F});
|
||||||
corner_3.x += box->x;
|
corners.back().x += box->x;
|
||||||
corner_3.y += box->y;
|
corners.back().y += box->y;
|
||||||
corner_3.z += box->z;
|
corners.back().z += box->z;
|
||||||
|
|
||||||
SC_SACD_Vec3 corner_4 =
|
corners.push_back(box->transform * SC_SACD_Vec3{box->width / 2.0F,
|
||||||
box->transform *
|
box->height / 2.0F,
|
||||||
SC_SACD_Vec3{-box->width / 2.0F, -box->height / 2.0F, box->depth / 2.0F};
|
-box->depth / 2.0F});
|
||||||
corner_4.x += box->x;
|
corners.back().x += box->x;
|
||||||
corner_4.y += box->y;
|
corners.back().y += box->y;
|
||||||
corner_4.z += box->z;
|
corners.back().z += box->z;
|
||||||
|
|
||||||
SC_SACD_Vec3 corner_5 =
|
corners.push_back(box->transform * SC_SACD_Vec3{-box->width / 2.0F,
|
||||||
box->transform *
|
-box->height / 2.0F,
|
||||||
SC_SACD_Vec3{box->width / 2.0F, -box->height / 2.0F, box->depth / 2.0F};
|
box->depth / 2.0F});
|
||||||
corner_5.x += box->x;
|
corners.back().x += box->x;
|
||||||
corner_5.y += box->y;
|
corners.back().y += box->y;
|
||||||
corner_5.z += box->z;
|
corners.back().z += box->z;
|
||||||
|
|
||||||
SC_SACD_Vec3 corner_6 =
|
corners.push_back(box->transform * SC_SACD_Vec3{box->width / 2.0F,
|
||||||
box->transform *
|
-box->height / 2.0F,
|
||||||
SC_SACD_Vec3{-box->width / 2.0F, box->height / 2.0F, box->depth / 2.0F};
|
box->depth / 2.0F});
|
||||||
corner_6.x += box->x;
|
corners.back().x += box->x;
|
||||||
corner_6.y += box->y;
|
corners.back().y += box->y;
|
||||||
corner_6.z += box->z;
|
corners.back().z += box->z;
|
||||||
|
|
||||||
SC_SACD_Vec3 corner_7 =
|
corners.push_back(box->transform * SC_SACD_Vec3{-box->width / 2.0F,
|
||||||
box->transform *
|
box->height / 2.0F,
|
||||||
SC_SACD_Vec3{box->width / 2.0F, box->height / 2.0F, box->depth / 2.0F};
|
box->depth / 2.0F});
|
||||||
corner_7.x += box->x;
|
corners.back().x += box->x;
|
||||||
corner_7.y += box->y;
|
corners.back().y += box->y;
|
||||||
corner_7.z += box->z;
|
corners.back().z += box->z;
|
||||||
|
|
||||||
return {
|
corners.push_back(box->transform * SC_SACD_Vec3{box->width / 2.0F,
|
||||||
corner_0, corner_1, corner_2, corner_3,
|
box->height / 2.0F,
|
||||||
corner_4, corner_5, corner_6, corner_7,
|
box->depth / 2.0F});
|
||||||
};
|
corners.back().x += box->x;
|
||||||
|
corners.back().y += box->y;
|
||||||
|
corners.back().z += box->z;
|
||||||
|
|
||||||
|
return corners;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct SC_SACD_MinMax {
|
struct SC_SACD_MinMax {
|
||||||
|
@ -218,7 +217,7 @@ std::vector<SC_SACD_MinMax> SC_SACD_Get_Box_MinMax(
|
||||||
const SC_SACD_Generic_Box *box, const std::span<SC_SACD_Vec3> normals) {
|
const SC_SACD_Generic_Box *box, const std::span<SC_SACD_Vec3> normals) {
|
||||||
std::vector<SC_SACD_MinMax> minmaxes;
|
std::vector<SC_SACD_MinMax> minmaxes;
|
||||||
|
|
||||||
auto corners = SC_SACD_Get_Box_Corners(box);
|
std::vector<SC_SACD_Vec3> corners = SC_SACD_Get_Box_Corners(box);
|
||||||
|
|
||||||
// Assuming normals are not normalized, and will not normalize anyway.
|
// Assuming normals are not normalized, and will not normalize anyway.
|
||||||
// MinMax count should be same as normals count.
|
// MinMax count should be same as normals count.
|
||||||
|
|
Loading…
Reference in a new issue