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

Physics3D: Rename Physics3DBody to PhysBody3D

Browse Source
This commit is contained in:
SirLynix
2024-02-10 14:20:47 +01:00
parent 9e3ca2472b
commit 8c41ac30c9
10 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/Nazara/Physics3D/PhysBody3D.hpp Normal file
View File

@@ -0,0 +1,32 @@
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Physics3D module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once
#ifndef NAZARA_PHYSICS3D_PHYSBODY3D_HPP
#define NAZARA_PHYSICS3D_PHYSBODY3D_HPP
#include <NazaraUtils/Prerequisites.hpp>
#include <Nazara/Physics3D/Config.hpp>
namespace Nz
{
class NAZARA_PHYSICS3D_API PhysBody3D
{
public:
PhysBody3D() = default;
PhysBody3D(const PhysBody3D&) = delete;
PhysBody3D(PhysBody3D&&) = delete;
virtual ~PhysBody3D();
virtual UInt32 GetBodyIndex() const = 0;
PhysBody3D& operator=(const PhysBody3D&) = delete;
PhysBody3D& operator=(PhysBody3D&&) = delete;
};
}
#include <Nazara/Physics3D/PhysBody3D.inl>
#endif // NAZARA_PHYSICS3D_PHYSBODY3D_HPP

0
include/Nazara/Physics3D/Physics3DBody.inl → include/Nazara/Physics3D/PhysBody3D.inl
View File

4
include/Nazara/Physics3D/PhysCharacter3D.hpp
View File

@@ -11,7 +11,7 @@
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics3D/Config.hpp>
#include <Nazara/Physics3D/Physics3DBody.hpp>
#include <Nazara/Physics3D/PhysBody3D.hpp>
#include <Nazara/Physics3D/Physiscs3DStepListener.hpp>
#include <NazaraUtils/MovablePtr.hpp>
#include <memory>
@@ -28,7 +28,7 @@ namespace Nz
class Collider3D;
class PhysWorld3D;
class NAZARA_PHYSICS3D_API PhysCharacter3D : public Physics3DBody, public Physiscs3DStepListener
class NAZARA_PHYSICS3D_API PhysCharacter3D : public PhysBody3D, public Physiscs3DStepListener
{
friend PhysWorld3D;

8
include/Nazara/Physics3D/PhysWorld3D.hpp
View File

@@ -27,7 +27,7 @@ namespace JPH
namespace Nz
{
class Physics3DBody;
class PhysBody3D;
class PhysCharacter3D;
class PhysCharacter3DImpl;
class Collider3D;
@@ -82,20 +82,20 @@ namespace Nz
struct PointCollisionInfo
{
Physics3DBody* hitBody = nullptr;
PhysBody3D* hitBody = nullptr;
};
struct RaycastHit
{
float fraction;
Physics3DBody* hitBody = nullptr;
PhysBody3D* hitBody = nullptr;
Vector3f hitNormal;
Vector3f hitPosition;
};
struct ShapeCollisionInfo
{
Physics3DBody* hitBody = nullptr;
PhysBody3D* hitBody = nullptr;
Vector3f collisionPosition1;
Vector3f collisionPosition2;
Vector3f penetrationAxis;

32
include/Nazara/Physics3D/Physics3DBody.hpp
View File

@@ -1,32 +0,0 @@
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
// This file is part of the "Nazara Engine - Physics3D module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once
#ifndef NAZARA_PHYSICS3D_PHYSICS3DBODY_HPP
#define NAZARA_PHYSICS3D_PHYSICS3DBODY_HPP
#include <NazaraUtils/Prerequisites.hpp>
#include <Nazara/Physics3D/Config.hpp>
namespace Nz
{
class NAZARA_PHYSICS3D_API Physics3DBody
{
public:
Physics3DBody() = default;
Physics3DBody(const Physics3DBody&) = delete;
Physics3DBody(Physics3DBody&&) = delete;
virtual ~Physics3DBody();
virtual UInt32 GetBodyIndex() const = 0;
Physics3DBody& operator=(const Physics3DBody&) = delete;
Physics3DBody& operator=(Physics3DBody&&) = delete;
};
}
#include <Nazara/Physics3D/Physics3DBody.inl>
#endif // NAZARA_PHYSICS3D_PHYSICS3DBODY_HPP

4
include/Nazara/Physics3D/RigidBody3D.hpp
View File

@@ -14,7 +14,7 @@
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics3D/Collider3D.hpp>
#include <Nazara/Physics3D/Config.hpp>
#include <Nazara/Physics3D/Physics3DBody.hpp>
#include <Nazara/Physics3D/PhysBody3D.hpp>
#include <NazaraUtils/MovablePtr.hpp>
namespace JPH
@@ -27,7 +27,7 @@ namespace Nz
{
class PhysWorld3D;
class NAZARA_PHYSICS3D_API RigidBody3D : public Physics3DBody
class NAZARA_PHYSICS3D_API RigidBody3D : public PhysBody3D
{
public:
struct DynamicSettings;