nakidai
/
vectozavr-shooter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small refactoring

master
Vectozavr 2022-03-05 17:40:25 +07:00
parent 0929f9c3a8
commit b6f6c94133
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/physics/HitBox.cpp
View File

@ -38,7 +38,7 @@ void HitBox::generateSimple(const Mesh &mesh) {
for(const auto& t : mesh.triangles()) { for(const auto& t : mesh.triangles()) {
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
auto point = mesh.model()*Vec3D(t[i]); auto point = Vec3D(t[i]);
if(point.x() > maxX) { if(point.x() > maxX) {
maxX = point.x(); maxX = point.x();
} }
@ -78,7 +78,7 @@ void HitBox::generateDetailed(const Mesh &mesh) {
for (const auto& t : mesh.triangles()) for (const auto& t : mesh.triangles())
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
points.insert(mesh.model()*Vec3D(t[i])); points.insert(Vec3D(t[i]));
_hitBox.reserve(points.size()); _hitBox.reserve(points.size());
for (const auto& it : points) for (const auto& it : points)

4
engine/physics/RigidBody.cpp
View File

@ -18,10 +18,6 @@ RigidBody::RigidBody(ObjectNameTag nameTag, const std::string &filename, const V
RigidBody::RigidBody(const Mesh &mesh, bool useSimpleBox) : Mesh(mesh), _hitBox(mesh, useSimpleBox) { RigidBody::RigidBody(const Mesh &mesh, bool useSimpleBox) : Mesh(mesh), _hitBox(mesh, useSimpleBox) {
} }
void RigidBody::recalculateHitBox(bool useSimpleBox) {
_hitBox = HitBox(*this, useSimpleBox);
}
Vec3D RigidBody::_findFurthestPoint(const Vec3D &direction) { Vec3D RigidBody::_findFurthestPoint(const Vec3D &direction) {
Vec3D maxPoint{0, 0, 0}; Vec3D maxPoint{0, 0, 0};

2
engine/physics/RigidBody.h
View File

@ -70,8 +70,6 @@ public:
[[nodiscard]] CollisionPoint EPA(const Simplex &simplex, std::shared_ptr<RigidBody> obj); [[nodiscard]] CollisionPoint EPA(const Simplex &simplex, std::shared_ptr<RigidBody> obj);
void solveCollision(const CollisionPoint &collision); void solveCollision(const CollisionPoint &collision);
void recalculateHitBox(bool useSimpleBox = true);
[[nodiscard]] Vec3D collisionNormal() const { return _collisionNormal; } [[nodiscard]] Vec3D collisionNormal() const { return _collisionNormal; }
[[nodiscard]] bool hasCollision() const { return _hasCollision; } [[nodiscard]] bool hasCollision() const { return _hasCollision; }
[[nodiscard]] bool inCollision() const { return _inCollision; } [[nodiscard]] bool inCollision() const { return _inCollision; }