birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two more touchpoints that were causing ambiguous symbol errors

Browse Source
This commit is contained in:
karlberg
2021-05-07 19:19:36 -07:00
parent ae8a49c4ef
commit 86fe8bf8aa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/CryCommon/Cry_Camera.h
+2 -2
View File
@@ -1386,7 +1386,7 @@ inline bool CCamera::IsPointVisible(const Vec3& p) const
// return values
// CULL_EXCLUSION = sphere outside of frustum (very fast rejection-test)
// CULL_INTERSECT = sphere and frustum intersects or sphere in completely inside frustum
inline bool CCamera::IsSphereVisible_F(const Sphere& s) const
inline bool CCamera::IsSphereVisible_F(const ::Sphere& s) const
{
if ((m_fp[0] | s.center) > s.radius)
{
@@ -1427,7 +1427,7 @@ inline bool CCamera::IsSphereVisible_F(const Sphere& s) const
// CULL_EXCLUSION = sphere outside of frustum (very fast rejection-test)
// CULL_INTERSECT = sphere intersects the borders of the frustum, further checks necessary
// CULL_INCLUSION = sphere is complete inside the frustum, no further checks necessary
inline uint8 CCamera::IsSphereVisible_FH(const Sphere& s) const
inline uint8 CCamera::IsSphereVisible_FH(const ::Sphere& s) const
{
f32 nc, rc, lc, tc, bc, cc;
if ((nc = m_fp[0] | s.center) > s.radius)
Code/CryEngine/CryCommon/IPathfinder.h
+1 -1
View File
@@ -109,7 +109,7 @@ struct NavigationBlocker
, costMultMod(0)
, radialDecay(false) {AZ_Assert(false, "Should never get called"); }
Sphere sphere;
::Sphere sphere;
bool radialDecay;
bool directional;