mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-15 18:49:54 +00:00
32108adc31
- enchanted arrow explode upon hit the water plane - non enchanted arrow disappear (or more accurately, they hit nothingness) - enchanted arrow shot underwater explode immediately - non enchanted arrow disappear immediately Also, solve a bug that occured previously and could theoritically still happens where we use the last tested collision position for instead of the last registered hit: Use the hit position as saved inside Projectile::hit() instead of the last position saved inside the callback. If a projectile collides with several objects (bottom of the sea and water surface for instance), the last collision tested won't necessarily be the impact position as we have no control over the order in which the tests are performed.
123 lines
3.2 KiB
C++
123 lines
3.2 KiB
C++
#include <memory>
|
|
|
|
#include <BulletCollision/CollisionShapes/btSphereShape.h>
|
|
#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
|
|
|
|
#include <components/misc/convert.hpp>
|
|
|
|
#include "../mwworld/class.hpp"
|
|
|
|
#include "collisiontype.hpp"
|
|
#include "mtphysics.hpp"
|
|
#include "projectile.hpp"
|
|
|
|
namespace MWPhysics
|
|
{
|
|
Projectile::Projectile(const MWWorld::Ptr& caster, const osg::Vec3f& position, float radius, PhysicsTaskScheduler* scheduler, PhysicsSystem* physicssystem)
|
|
: mHitWater(false)
|
|
, mActive(true)
|
|
, mCaster(caster)
|
|
, mPhysics(physicssystem)
|
|
, mTaskScheduler(scheduler)
|
|
{
|
|
mShape = std::make_unique<btSphereShape>(radius);
|
|
mConvexShape = static_cast<btConvexShape*>(mShape.get());
|
|
|
|
mCollisionObject = std::make_unique<btCollisionObject>();
|
|
mCollisionObject->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT);
|
|
mCollisionObject->setActivationState(DISABLE_DEACTIVATION);
|
|
mCollisionObject->setCollisionShape(mShape.get());
|
|
mCollisionObject->setUserPointer(this);
|
|
|
|
setPosition(position);
|
|
|
|
const int collisionMask = CollisionType_World | CollisionType_HeightMap |
|
|
CollisionType_Actor | CollisionType_Door | CollisionType_Water | CollisionType_Projectile;
|
|
mTaskScheduler->addCollisionObject(mCollisionObject.get(), CollisionType_Projectile, collisionMask);
|
|
|
|
commitPositionChange();
|
|
}
|
|
|
|
Projectile::~Projectile()
|
|
{
|
|
if (!mActive)
|
|
mPhysics->reportCollision(mHitPosition, mHitNormal);
|
|
mTaskScheduler->removeCollisionObject(mCollisionObject.get());
|
|
}
|
|
|
|
void Projectile::commitPositionChange()
|
|
{
|
|
std::scoped_lock lock(mMutex);
|
|
if (mTransformUpdatePending)
|
|
{
|
|
auto& trans = mCollisionObject->getWorldTransform();
|
|
trans.setOrigin(Misc::Convert::toBullet(mPosition));
|
|
mCollisionObject->setWorldTransform(trans);
|
|
mTransformUpdatePending = false;
|
|
}
|
|
}
|
|
|
|
void Projectile::setPosition(const osg::Vec3f &position)
|
|
{
|
|
std::scoped_lock lock(mMutex);
|
|
mPosition = position;
|
|
mTransformUpdatePending = true;
|
|
}
|
|
|
|
osg::Vec3f Projectile::getPosition() const
|
|
{
|
|
std::scoped_lock lock(mMutex);
|
|
return mPosition;
|
|
}
|
|
|
|
void Projectile::hit(MWWorld::Ptr target, btVector3 pos, btVector3 normal)
|
|
{
|
|
if (!mActive.load(std::memory_order_acquire))
|
|
return;
|
|
std::scoped_lock lock(mMutex);
|
|
mHitTarget = target;
|
|
mHitPosition = pos;
|
|
mHitNormal = normal;
|
|
mActive.store(false, std::memory_order_release);
|
|
}
|
|
|
|
MWWorld::Ptr Projectile::getCaster() const
|
|
{
|
|
std::scoped_lock lock(mMutex);
|
|
return mCaster;
|
|
}
|
|
|
|
void Projectile::setCaster(MWWorld::Ptr caster)
|
|
{
|
|
std::scoped_lock lock(mMutex);
|
|
mCaster = caster;
|
|
}
|
|
|
|
void Projectile::setValidTargets(const std::vector<MWWorld::Ptr>& targets)
|
|
{
|
|
std::scoped_lock lock(mMutex);
|
|
mValidTargets = targets;
|
|
}
|
|
|
|
bool Projectile::isValidTarget(const MWWorld::Ptr& target) const
|
|
{
|
|
std::scoped_lock lock(mMutex);
|
|
if (mCaster == target)
|
|
return false;
|
|
|
|
if (target.isEmpty() || mValidTargets.empty())
|
|
return true;
|
|
|
|
bool validTarget = false;
|
|
for (const auto& targetActor : mValidTargets)
|
|
{
|
|
if (targetActor == target)
|
|
{
|
|
validTarget = true;
|
|
break;
|
|
}
|
|
}
|
|
return validTarget;
|
|
}
|
|
|
|
}
|