Compare commits
No commits in common. "428c5d054aa11d0d87cb9d1752eee996d89ac7d3" and "a930d8b8aa2e59009d02807f53414540c117ec5c" have entirely different histories.
428c5d054a
...
a930d8b8aa
3 changed files with 1 additions and 12 deletions
|
@ -6,7 +6,7 @@ set(SC_3D_CollisionDetectionHelpers_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/src/sc_
|
||||||
|
|
||||||
add_library(SC_3D_CollisionDetectionHelpers ${SC_3D_CollisionDetectionHelpers_SOURCES})
|
add_library(SC_3D_CollisionDetectionHelpers ${SC_3D_CollisionDetectionHelpers_SOURCES})
|
||||||
|
|
||||||
set_target_properties(SC_3D_CollisionDetectionHelpers PROPERTIES VERSION 2.0.1 SOVERSION 2)
|
set_target_properties(SC_3D_CollisionDetectionHelpers PROPERTIES VERSION 2.0.0 SOVERSION 2)
|
||||||
|
|
||||||
if(NOT DEFINED CMAKE_BUILD_TYPE OR "${CMAKE_BUILD_TYPE}" STREQUAL "")
|
if(NOT DEFINED CMAKE_BUILD_TYPE OR "${CMAKE_BUILD_TYPE}" STREQUAL "")
|
||||||
message("Defaulting to \"Debug\" build type.")
|
message("Defaulting to \"Debug\" build type.")
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Version 2.0.1
|
|
||||||
|
|
||||||
Added check in SC_SACD_Sphere_Box_Collision(...) to see if sphere and box has
|
|
||||||
same center.
|
|
||||||
|
|
||||||
## Version 2.0.0
|
## Version 2.0.0
|
||||||
|
|
||||||
Add collision detection with Spheres.
|
Add collision detection with Spheres.
|
||||||
|
|
|
@ -296,12 +296,6 @@ int SC_SACD_Sphere_Box_Collision(const SC_SACD_Sphere *sphere,
|
||||||
SC_SACD_Vec3 sphere_pos{sphere->x, sphere->y, sphere->z};
|
SC_SACD_Vec3 sphere_pos{sphere->x, sphere->y, sphere->z};
|
||||||
SC_SACD_Vec3 sphere_box_normal =
|
SC_SACD_Vec3 sphere_box_normal =
|
||||||
SC_SACD_Vec3{box->x, box->y, box->z} - sphere_pos;
|
SC_SACD_Vec3{box->x, box->y, box->z} - sphere_pos;
|
||||||
if (sphere_box_normal.x < 0.0001F && sphere_box_normal.x > -0.0001F &&
|
|
||||||
sphere_box_normal.y < 0.0001F && sphere_box_normal.y > -0.0001F &&
|
|
||||||
sphere_box_normal.z < 0.0001F && sphere_box_normal.z > -0.0001F) {
|
|
||||||
// Sphere center is box center.
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
sphere_box_normal =
|
sphere_box_normal =
|
||||||
sphere_box_normal /
|
sphere_box_normal /
|
||||||
std::sqrt(SC_SACD_Dot_Product(sphere_box_normal, sphere_box_normal));
|
std::sqrt(SC_SACD_Dot_Product(sphere_box_normal, sphere_box_normal));
|
||||||
|
|
Loading…
Reference in a new issue