isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-28 06:57:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Beta match SpheresIntersect (#1745)
Some checks failed
Analyze / ${{ matrix.who }} annotations (CONFIG) (push) Has been cancelled
Details
Analyze / ${{ matrix.who }} annotations (ISLE) (push) Has been cancelled
Details
Analyze / ${{ matrix.who }} annotations (LEGO1) (push) Has been cancelled
Details
Build / Download original binaries (push) Has been cancelled
Details
Build / Current ${{ matrix.toolchain.name }} (map[clang-tidy:true msys-env:mingw-w64-i686 msystem:mingw32 name:msys2 mingw32 shell:msys2 {0} werror:true]) (push) Has been cancelled
Details
Build / Current ${{ matrix.toolchain.name }} (map[name:MSVC setup-cmake:true setup-msvc:true setup-ninja:true shell:sh]) (push) Has been cancelled
Details
Build / MSVC 4.20 (push) Has been cancelled
Details
Build / MSVC 4.20 (BETA10) (push) Has been cancelled
Details
Format / C++ (push) Has been cancelled
Details
Naming / C++ (push) Has been cancelled
Details
Build / Verify decomp (push) Has been cancelled
Details
Build / Upload artifacts (push) Has been cancelled
Details

Browse Source 
* Beta match SpheresIntersect

* Extra beta addresses
This commit is contained in:
MS 2026-02-14 20:16:23 -05:00 committed by GitHub
parent 8a77540169
commit 2740065895
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/src/common/legoutils.cpp
View File

@ -90,11 +90,13 @@ void RotateY(LegoROI* p_roi, MxFloat p_angle)
} }
// FUNCTION: LEGO1 0x1003de80 // FUNCTION: LEGO1 0x1003de80
// FUNCTION: BETA10 0x100d3684
MxBool SpheresIntersect(const BoundingSphere& p_sphere1, const BoundingSphere& p_sphere2) MxBool SpheresIntersect(const BoundingSphere& p_sphere1, const BoundingSphere& p_sphere2)
{ {
// This doesn't look clean, but it matches. // This doesn't look clean, but it matches.
// p_sphere1.Center().GetData() doesn't work out // p_sphere1.Center().GetData() doesn't work out
return sqrt(DISTSQRD3(&p_sphere1.Center()[0], &p_sphere2.Center()[0])) < p_sphere1.Radius() + p_sphere2.Radius(); float distance = DISTSQRD3(p_sphere1.Center(), p_sphere2.Center());
return sqrt(distance) < p_sphere1.Radius() + p_sphere2.Radius();
} }
// FUNCTION: LEGO1 0x1003ded0 // FUNCTION: LEGO1 0x1003ded0

3
LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
View File

@ -186,6 +186,7 @@ void LegoCameraController::TransformPointOfView(const Matrix4& p_transform, MxU3
} }
// FUNCTION: LEGO1 0x10012740 // FUNCTION: LEGO1 0x10012740
// FUNCTION: BETA10 0x10069c35
Mx3DPointFloat LegoCameraController::GetWorldUp() Mx3DPointFloat LegoCameraController::GetWorldUp()
{ {
if (m_lego3DView && m_lego3DView->GetPointOfView()) { if (m_lego3DView && m_lego3DView->GetPointOfView()) {
@ -199,6 +200,7 @@ Mx3DPointFloat LegoCameraController::GetWorldUp()
} }
// FUNCTION: LEGO1 0x100127f0 // FUNCTION: LEGO1 0x100127f0
// FUNCTION: BETA10 0x10069cea
Mx3DPointFloat LegoCameraController::GetWorldLocation() Mx3DPointFloat LegoCameraController::GetWorldLocation()
{ {
if (m_lego3DView && m_lego3DView->GetPointOfView()) { if (m_lego3DView && m_lego3DView->GetPointOfView()) {
@ -212,6 +214,7 @@ Mx3DPointFloat LegoCameraController::GetWorldLocation()
} }
// FUNCTION: LEGO1 0x100128a0 // FUNCTION: LEGO1 0x100128a0
// FUNCTION: BETA10 0x10069daa
Mx3DPointFloat LegoCameraController::GetWorldDirection() Mx3DPointFloat LegoCameraController::GetWorldDirection()
{ {
if (m_lego3DView && m_lego3DView->GetPointOfView()) { if (m_lego3DView && m_lego3DView->GetPointOfView()) {

1
LEGO1/lego/sources/3dmanager/lego3dview.h
View File

@ -52,6 +52,7 @@ inline ViewManager* Lego3DView::GetViewManager()
return m_pViewManager; return m_pViewManager;
} }
// FUNCTION: BETA10 0x1006aae0
inline ViewROI* Lego3DView::GetPointOfView() inline ViewROI* Lego3DView::GetPointOfView()
{ {
return m_pPointOfView; return m_pPointOfView;

6
LEGO1/library_msvc.h
View File

@ -873,6 +873,12 @@
// LIBRARY: BETA10 0x100fa0e0 // LIBRARY: BETA10 0x100fa0e0
// atof // atof
// LIBRARY: BETA10 0x1005a500
// sqrt
// LIBRARY: BETA10 0x1005a530
// sqrtf
// LIBRARY: BETA10 0x1005a9c0 // LIBRARY: BETA10 0x1005a9c0
// fabs // fabs