sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unity build compilation

This commit is contained in:
SirLynix 2023-04-05 13:23:37 +02:00 committed by Jérôme Leclercq
parent d610baf920
commit 60ed70d3fd
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Nazara/BulletPhysics3D/BulletPhysWorld3D.cpp
View File

@ -15,6 +15,8 @@
#include <Nazara/BulletPhysics3D/Debug.hpp> #include <Nazara/BulletPhysics3D/Debug.hpp>
namespace Nz namespace Nz
{
namespace NAZARA_ANONYMOUS_NAMESPACE
{ {
class CallbackHitResult : public btCollisionWorld::RayResultCallback class CallbackHitResult : public btCollisionWorld::RayResultCallback
{ {
@ -47,6 +49,7 @@ namespace Nz
Vector3f m_from; Vector3f m_from;
Vector3f m_to; Vector3f m_to;
}; };
}
struct BulletPhysWorld3D::BulletWorld struct BulletPhysWorld3D::BulletWorld
{ {
@ -104,6 +107,8 @@ namespace Nz
bool BulletPhysWorld3D::RaycastQuery(const Vector3f& from, const Vector3f& to, const FunctionRef<std::optional<float>(const RaycastHit& hitInfo)>& callback) bool BulletPhysWorld3D::RaycastQuery(const Vector3f& from, const Vector3f& to, const FunctionRef<std::optional<float>(const RaycastHit& hitInfo)>& callback)
{ {
NAZARA_USE_ANONYMOUS_NAMESPACE
CallbackHitResult resultHandler(from, to, callback); CallbackHitResult resultHandler(from, to, callback);
m_world->dynamicWorld.rayTest(ToBullet(from), ToBullet(to), resultHandler); m_world->dynamicWorld.rayTest(ToBullet(from), ToBullet(to), resultHandler);

2
src/Nazara/JoltPhysics3D/JoltPhysWorld3D.cpp
View File

@ -350,6 +350,8 @@ namespace Nz
bool JoltPhysWorld3D::RaycastQuery(const Vector3f& from, const Vector3f& to, const FunctionRef<std::optional<float>(const RaycastHit& hitInfo)>& callback) bool JoltPhysWorld3D::RaycastQuery(const Vector3f& from, const Vector3f& to, const FunctionRef<std::optional<float>(const RaycastHit& hitInfo)>& callback)
{ {
NAZARA_USE_ANONYMOUS_NAMESPACE
JPH::RRayCast rayCast; JPH::RRayCast rayCast;
rayCast.mDirection = ToJolt(to - from); rayCast.mDirection = ToJolt(to - from);
rayCast.mOrigin = ToJolt(from); rayCast.mOrigin = ToJolt(from);