From 704e1b110ad9bb2500ad100d9ff47b8f9f8395d8 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 1 Jul 2017 20:08:54 -1000 Subject: [PATCH] Update nod --- Runtime/Collision/CollisionUtil.cpp | 4 ++-- nod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/Collision/CollisionUtil.cpp b/Runtime/Collision/CollisionUtil.cpp index 8a4d0a705..1bfe32d48 100644 --- a/Runtime/Collision/CollisionUtil.cpp +++ b/Runtime/Collision/CollisionUtil.cpp @@ -1062,7 +1062,7 @@ bool MovingSphereAABox(const zeus::CSphere& sphere, const zeus::CAABox& aabb, co bool useNextAxis1 = inBounds1 ? nextAxis2 : nextAxis1; bool useNextAxis2 = inBounds1 ? nextAxis1 : nextAxis2; - int pointFlags = ((1 << useNextAxis1) * (inBounds1 ? inMin2 : inMin1)) | ((1 << axis) * sign); + int pointFlags = ((1 << int(useNextAxis1)) * (inBounds1 ? inMin2 : inMin1)) | ((1 << axis) * sign); zeus::CVector3f aabbPoint2 = aabb.getPoint(pointFlags); float d; if (LineCircleIntersection2d(sphere.position, dir, zeus::CSphere(aabbPoint2, sphere.radius), @@ -1071,7 +1071,7 @@ bool MovingSphereAABox(const zeus::CSphere& sphere, const zeus::CAABox& aabb, co point = sphere.position + d * dir; if (point[useNextAxis2] > aabb.max[useNextAxis2]) { - zeus::CVector3f aabbPoint3 = aabb.getPoint(pointFlags | (1 << useNextAxis2)); + zeus::CVector3f aabbPoint3 = aabb.getPoint(pointFlags | (1 << int(useNextAxis2))); if (point[useNextAxis2] < expAABB.max[useNextAxis2]) { if (RaySphereIntersection(zeus::CSphere(aabbPoint3, sphere.radius), diff --git a/nod b/nod index 2a472651a..6454d68ab 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit 2a472651ae9dcdce7e5b5c3a1e3d3769ab347e15 +Subproject commit 6454d68abc2180a33aa4359c0ed3906519083c7e