|
|
|
@ -1,11 +1,11 @@
|
|
|
|
#include "projectilemanager.hpp"
|
|
|
|
#include "projectilemanager.hpp"
|
|
|
|
|
|
|
|
|
|
|
|
#include <OgreSceneManager.h>
|
|
|
|
#include <osg/PositionAttitudeTransform>
|
|
|
|
#include <OgreSceneNode.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <libs/openengine/bullet/physic.hpp>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <components/esm/projectilestate.hpp>
|
|
|
|
#include <components/esm/projectilestate.hpp>
|
|
|
|
|
|
|
|
#include <components/resource/resourcesystem.hpp>
|
|
|
|
|
|
|
|
#include <components/resource/scenemanager.hpp>
|
|
|
|
|
|
|
|
#include <components/sceneutil/controller.hpp>
|
|
|
|
|
|
|
|
|
|
|
|
#include "../mwworld/manualref.hpp"
|
|
|
|
#include "../mwworld/manualref.hpp"
|
|
|
|
#include "../mwworld/class.hpp"
|
|
|
|
#include "../mwworld/class.hpp"
|
|
|
|
@ -22,72 +22,70 @@
|
|
|
|
|
|
|
|
|
|
|
|
#include "../mwrender/effectmanager.hpp"
|
|
|
|
#include "../mwrender/effectmanager.hpp"
|
|
|
|
#include "../mwrender/animation.hpp"
|
|
|
|
#include "../mwrender/animation.hpp"
|
|
|
|
#include "../mwrender/renderconst.hpp"
|
|
|
|
#include "../mwrender/vismask.hpp"
|
|
|
|
|
|
|
|
|
|
|
|
#include "../mwsound/sound.hpp"
|
|
|
|
#include "../mwsound/sound.hpp"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "../mwphysics/physicssystem.hpp"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace MWWorld
|
|
|
|
namespace MWWorld
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
ProjectileManager::ProjectileManager(Ogre::SceneManager* sceneMgr, OEngine::Physic::PhysicEngine &engine)
|
|
|
|
ProjectileManager::ProjectileManager(osg::Group* parent, Resource::ResourceSystem* resourceSystem, MWPhysics::PhysicsSystem* physics)
|
|
|
|
: mPhysEngine(engine)
|
|
|
|
: mParent(parent)
|
|
|
|
, mSceneMgr(sceneMgr)
|
|
|
|
, mResourceSystem(resourceSystem)
|
|
|
|
|
|
|
|
, mPhysics(physics)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ProjectileManager::createModel(State &state, const std::string &model)
|
|
|
|
void ProjectileManager::createModel(State &state, const std::string &model)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
state.mObject = NifOgre::Loader::createObjects(state.mNode, model);
|
|
|
|
state.mNode = new osg::PositionAttitudeTransform;
|
|
|
|
for(size_t i = 0;i < state.mObject->mControllers.size();i++)
|
|
|
|
state.mNode->setNodeMask(MWRender::Mask_Effect);
|
|
|
|
{
|
|
|
|
mParent->addChild(state.mNode);
|
|
|
|
if(state.mObject->mControllers[i].getSource().isNull())
|
|
|
|
|
|
|
|
state.mObject->mControllers[i].setSource(Ogre::SharedPtr<MWRender::EffectAnimationTime> (new MWRender::EffectAnimationTime()));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MWRender::Animation::setRenderProperties(state.mObject, MWRender::RV_Effects,
|
|
|
|
mResourceSystem->getSceneManager()->createInstance(model, state.mNode);
|
|
|
|
MWRender::RQG_Main, MWRender::RQG_Alpha, 0.f, false, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
state.mEffectAnimationTime.reset(new MWRender::EffectAnimationTime);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SceneUtil::AssignControllerSourcesVisitor assignVisitor (state.mEffectAnimationTime);
|
|
|
|
|
|
|
|
state.mNode->accept(assignVisitor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ProjectileManager::update(NifOgre::ObjectScenePtr object, float duration)
|
|
|
|
void ProjectileManager::update(State& state, float duration)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
for(size_t i = 0; i < object->mControllers.size() ;i++)
|
|
|
|
state.mEffectAnimationTime->addTime(duration);
|
|
|
|
{
|
|
|
|
|
|
|
|
MWRender::EffectAnimationTime* value = dynamic_cast<MWRender::EffectAnimationTime*>(object->mControllers[i].getSource().get());
|
|
|
|
|
|
|
|
if (value)
|
|
|
|
|
|
|
|
value->addTime(duration);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
object->mControllers[i].update();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ProjectileManager::launchMagicBolt(const std::string &model, const std::string &sound,
|
|
|
|
void ProjectileManager::launchMagicBolt(const std::string &model, const std::string &sound,
|
|
|
|
const std::string &spellId, float speed, bool stack,
|
|
|
|
const std::string &spellId, float speed, bool stack,
|
|
|
|
const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName,
|
|
|
|
const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName,
|
|
|
|
const Ogre::Vector3& fallbackDirection)
|
|
|
|
const osg::Vec3f& fallbackDirection)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
float height = 0;
|
|
|
|
float height = 0;
|
|
|
|
if (OEngine::Physic::PhysicActor* actor = mPhysEngine.getCharacter(caster.getRefData().getHandle()))
|
|
|
|
|
|
|
|
height = actor->getHalfExtents().z * 2 * 0.75f; // Spawn at 0.75 * ActorHeight
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ogre::Vector3 pos(caster.getRefData().getPosition().pos);
|
|
|
|
height += mPhysics->getHalfExtents(caster).z() * 2.f * 0.75f; // Spawn at 0.75 * ActorHeight
|
|
|
|
pos.z += height;
|
|
|
|
|
|
|
|
|
|
|
|
osg::Vec3f pos(caster.getRefData().getPosition().asVec3());
|
|
|
|
|
|
|
|
pos.z() += height;
|
|
|
|
|
|
|
|
|
|
|
|
if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
|
|
|
|
if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
Ogre::Quaternion orient;
|
|
|
|
osg::Quat orient;
|
|
|
|
if (caster.getClass().isActor())
|
|
|
|
if (caster.getClass().isActor())
|
|
|
|
orient = Ogre::Quaternion(Ogre::Radian(caster.getRefData().getPosition().rot[2]), Ogre::Vector3::NEGATIVE_UNIT_Z) *
|
|
|
|
orient = osg::Quat(caster.getRefData().getPosition().rot[0], osg::Vec3f(-1,0,0))
|
|
|
|
Ogre::Quaternion(Ogre::Radian(caster.getRefData().getPosition().rot[0]), Ogre::Vector3::NEGATIVE_UNIT_X);
|
|
|
|
* osg::Quat(caster.getRefData().getPosition().rot[2], osg::Vec3f(0,0,-1));
|
|
|
|
else
|
|
|
|
else
|
|
|
|
orient = Ogre::Vector3::UNIT_Y.getRotationTo(fallbackDirection);
|
|
|
|
orient.makeRotate(osg::Vec3f(0,1,0), osg::Vec3f(fallbackDirection));
|
|
|
|
|
|
|
|
|
|
|
|
MagicBoltState state;
|
|
|
|
MagicBoltState state;
|
|
|
|
state.mSourceName = sourceName;
|
|
|
|
state.mSourceName = sourceName;
|
|
|
|
state.mId = model;
|
|
|
|
state.mId = model;
|
|
|
|
state.mSpellId = spellId;
|
|
|
|
state.mSpellId = spellId;
|
|
|
|
state.mCasterHandle = caster.getRefData().getHandle();
|
|
|
|
state.mCasterHandle = caster;
|
|
|
|
if (caster.getClass().isActor())
|
|
|
|
if (caster.getClass().isActor())
|
|
|
|
state.mActorId = caster.getClass().getCreatureStats(caster).getActorId();
|
|
|
|
state.mActorId = caster.getClass().getCreatureStats(caster).getActorId();
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@ -107,8 +105,9 @@ namespace MWWorld
|
|
|
|
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), model);
|
|
|
|
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), model);
|
|
|
|
MWWorld::Ptr ptr = ref.getPtr();
|
|
|
|
MWWorld::Ptr ptr = ref.getPtr();
|
|
|
|
|
|
|
|
|
|
|
|
state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(pos, orient);
|
|
|
|
|
|
|
|
createModel(state, ptr.getClass().getModel(ptr));
|
|
|
|
createModel(state, ptr.getClass().getModel(ptr));
|
|
|
|
|
|
|
|
state.mNode->setPosition(pos);
|
|
|
|
|
|
|
|
state.mNode->setAttitude(orient);
|
|
|
|
|
|
|
|
|
|
|
|
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
|
|
|
|
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
|
|
|
|
state.mSound = sndMgr->playManualSound3D(pos, sound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
|
|
|
|
state.mSound = sndMgr->playManualSound3D(pos, sound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
|
|
|
|
@ -116,20 +115,21 @@ namespace MWWorld
|
|
|
|
mMagicBolts.push_back(state);
|
|
|
|
mMagicBolts.push_back(state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ProjectileManager::launchProjectile(Ptr actor, Ptr projectile, const Ogre::Vector3 &pos,
|
|
|
|
void ProjectileManager::launchProjectile(Ptr actor, Ptr projectile, const osg::Vec3f &pos, const osg::Quat &orient, Ptr bow, float speed)
|
|
|
|
const Ogre::Quaternion &orient, Ptr bow, float speed)
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ProjectileState state;
|
|
|
|
ProjectileState state;
|
|
|
|
state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
|
|
|
|
state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
|
|
|
|
state.mBowId = bow.getCellRef().getRefId();
|
|
|
|
state.mBowId = bow.getCellRef().getRefId();
|
|
|
|
state.mVelocity = orient.yAxis() * speed;
|
|
|
|
state.mVelocity = orient * osg::Vec3f(0,1,0) * speed;
|
|
|
|
state.mId = projectile.getCellRef().getRefId();
|
|
|
|
state.mId = projectile.getCellRef().getRefId();
|
|
|
|
|
|
|
|
state.mCasterHandle = actor;
|
|
|
|
|
|
|
|
|
|
|
|
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), projectile.getCellRef().getRefId());
|
|
|
|
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), projectile.getCellRef().getRefId());
|
|
|
|
MWWorld::Ptr ptr = ref.getPtr();
|
|
|
|
MWWorld::Ptr ptr = ref.getPtr();
|
|
|
|
|
|
|
|
|
|
|
|
state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(pos, orient);
|
|
|
|
|
|
|
|
createModel(state, ptr.getClass().getModel(ptr));
|
|
|
|
createModel(state, ptr.getClass().getModel(ptr));
|
|
|
|
|
|
|
|
state.mNode->setPosition(pos);
|
|
|
|
|
|
|
|
state.mNode->setAttitude(orient);
|
|
|
|
|
|
|
|
|
|
|
|
mProjectiles.push_back(state);
|
|
|
|
mProjectiles.push_back(state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -144,60 +144,46 @@ namespace MWWorld
|
|
|
|
{
|
|
|
|
{
|
|
|
|
for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end();)
|
|
|
|
for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end();)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Ogre::Quaternion orient = it->mNode->getOrientation();
|
|
|
|
osg::Quat orient = it->mNode->getAttitude();
|
|
|
|
static float fTargetSpellMaxSpeed = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
|
|
|
|
static float fTargetSpellMaxSpeed = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
|
|
|
|
.find("fTargetSpellMaxSpeed")->getFloat();
|
|
|
|
.find("fTargetSpellMaxSpeed")->getFloat();
|
|
|
|
float speed = fTargetSpellMaxSpeed * it->mSpeed;
|
|
|
|
float speed = fTargetSpellMaxSpeed * it->mSpeed;
|
|
|
|
|
|
|
|
|
|
|
|
Ogre::Vector3 direction = orient.yAxis();
|
|
|
|
osg::Vec3f direction = orient * osg::Vec3f(0,1,0);
|
|
|
|
direction.normalise();
|
|
|
|
direction.normalize();
|
|
|
|
Ogre::Vector3 pos(it->mNode->getPosition());
|
|
|
|
osg::Vec3f pos(it->mNode->getPosition());
|
|
|
|
Ogre::Vector3 newPos = pos + direction * duration * speed;
|
|
|
|
osg::Vec3f newPos = pos + direction * duration * speed;
|
|
|
|
|
|
|
|
|
|
|
|
if (it->mSound.get())
|
|
|
|
if (it->mSound.get())
|
|
|
|
it->mSound->setPosition(newPos);
|
|
|
|
it->mSound->setPosition(newPos);
|
|
|
|
|
|
|
|
|
|
|
|
it->mNode->setPosition(newPos);
|
|
|
|
it->mNode->setPosition(newPos);
|
|
|
|
|
|
|
|
|
|
|
|
update(it->mObject, duration);
|
|
|
|
update(*it, duration);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MWWorld::Ptr caster = it->getCaster();
|
|
|
|
|
|
|
|
|
|
|
|
// Check for impact
|
|
|
|
// Check for impact
|
|
|
|
// TODO: use a proper btRigidBody / btGhostObject?
|
|
|
|
// TODO: use a proper btRigidBody / btGhostObject?
|
|
|
|
btVector3 from(pos.x, pos.y, pos.z);
|
|
|
|
MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, 0xff, MWPhysics::CollisionType_Projectile);
|
|
|
|
btVector3 to(newPos.x, newPos.y, newPos.z);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::vector<std::pair<float, std::string> > collisions = mPhysEngine.rayTest2(from, to, OEngine::Physic::CollisionType_Projectile);
|
|
|
|
|
|
|
|
bool hit=false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (std::vector<std::pair<float, std::string> >::iterator cIt = collisions.begin(); cIt != collisions.end() && !hit; ++cIt)
|
|
|
|
bool hit = false;
|
|
|
|
|
|
|
|
if (result.mHit)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
MWWorld::Ptr obstacle = MWBase::Environment::get().getWorld()->searchPtrViaHandle(cIt->second);
|
|
|
|
hit = true;
|
|
|
|
|
|
|
|
if (result.mHitObject.isEmpty())
|
|
|
|
MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaHandle(it->mCasterHandle);
|
|
|
|
|
|
|
|
if (caster.isEmpty())
|
|
|
|
|
|
|
|
caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->mActorId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!obstacle.isEmpty() && obstacle == caster)
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (caster.isEmpty())
|
|
|
|
|
|
|
|
caster = obstacle;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (obstacle.isEmpty())
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Terrain
|
|
|
|
// terrain
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
MWMechanics::CastSpell cast(caster, obstacle);
|
|
|
|
MWMechanics::CastSpell cast(caster, result.mHitObject);
|
|
|
|
cast.mHitPosition = pos;
|
|
|
|
cast.mHitPosition = pos;
|
|
|
|
cast.mId = it->mSpellId;
|
|
|
|
cast.mId = it->mSpellId;
|
|
|
|
cast.mSourceName = it->mSourceName;
|
|
|
|
cast.mSourceName = it->mSourceName;
|
|
|
|
cast.mStack = it->mStack;
|
|
|
|
cast.mStack = it->mStack;
|
|
|
|
cast.inflict(obstacle, caster, it->mEffects, ESM::RT_Target, false, true);
|
|
|
|
cast.inflict(result.mHitObject, caster, it->mEffects, ESM::RT_Target, false, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
hit = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Explodes when hitting water
|
|
|
|
// Explodes when hitting water
|
|
|
|
@ -206,12 +192,11 @@ namespace MWWorld
|
|
|
|
|
|
|
|
|
|
|
|
if (hit)
|
|
|
|
if (hit)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->mActorId);
|
|
|
|
|
|
|
|
MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, ESM::RT_Target, it->mSpellId, it->mSourceName);
|
|
|
|
MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, ESM::RT_Target, it->mSpellId, it->mSourceName);
|
|
|
|
|
|
|
|
|
|
|
|
MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
|
|
|
|
MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
|
|
|
|
|
|
|
|
|
|
|
|
mSceneMgr->destroySceneNode(it->mNode);
|
|
|
|
mParent->removeChild(it->mNode);
|
|
|
|
|
|
|
|
|
|
|
|
it = mMagicBolts.erase(it);
|
|
|
|
it = mMagicBolts.erase(it);
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
@ -227,34 +212,26 @@ namespace MWWorld
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// gravity constant - must be way lower than the gravity affecting actors, since we're not
|
|
|
|
// gravity constant - must be way lower than the gravity affecting actors, since we're not
|
|
|
|
// simulating aerodynamics at all
|
|
|
|
// simulating aerodynamics at all
|
|
|
|
it->mVelocity -= Ogre::Vector3(0, 0, 627.2f * 0.1f) * duration;
|
|
|
|
it->mVelocity -= osg::Vec3f(0, 0, 627.2f * 0.1f) * duration;
|
|
|
|
|
|
|
|
|
|
|
|
Ogre::Vector3 pos(it->mNode->getPosition());
|
|
|
|
osg::Vec3f pos(it->mNode->getPosition());
|
|
|
|
Ogre::Vector3 newPos = pos + it->mVelocity * duration;
|
|
|
|
osg::Vec3f newPos = pos + it->mVelocity * duration;
|
|
|
|
|
|
|
|
|
|
|
|
Ogre::Quaternion orient = Ogre::Vector3::UNIT_Y.getRotationTo(it->mVelocity);
|
|
|
|
osg::Quat orient;
|
|
|
|
it->mNode->setOrientation(orient);
|
|
|
|
orient.makeRotate(osg::Vec3f(0,1,0), it->mVelocity);
|
|
|
|
|
|
|
|
it->mNode->setAttitude(orient);
|
|
|
|
it->mNode->setPosition(newPos);
|
|
|
|
it->mNode->setPosition(newPos);
|
|
|
|
|
|
|
|
|
|
|
|
update(it->mObject, duration);
|
|
|
|
update(*it, duration);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MWWorld::Ptr caster = it->getCaster();
|
|
|
|
|
|
|
|
|
|
|
|
// Check for impact
|
|
|
|
// Check for impact
|
|
|
|
// TODO: use a proper btRigidBody / btGhostObject?
|
|
|
|
// TODO: use a proper btRigidBody / btGhostObject?
|
|
|
|
btVector3 from(pos.x, pos.y, pos.z);
|
|
|
|
MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(pos, newPos, caster, 0xff, MWPhysics::CollisionType_Projectile);
|
|
|
|
btVector3 to(newPos.x, newPos.y, newPos.z);
|
|
|
|
|
|
|
|
std::vector<std::pair<float, std::string> > collisions = mPhysEngine.rayTest2(from, to, OEngine::Physic::CollisionType_Projectile);
|
|
|
|
|
|
|
|
bool hit=false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (std::vector<std::pair<float, std::string> >::iterator cIt = collisions.begin(); cIt != collisions.end() && !hit; ++cIt)
|
|
|
|
if (result.mHit)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
MWWorld::Ptr obstacle = MWBase::Environment::get().getWorld()->searchPtrViaHandle(cIt->second);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->mActorId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Arrow intersects with player immediately after shooting :/
|
|
|
|
|
|
|
|
if (obstacle == caster)
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mId);
|
|
|
|
MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mId);
|
|
|
|
|
|
|
|
|
|
|
|
// Try to get a Ptr to the bow that was used. It might no longer exist.
|
|
|
|
// Try to get a Ptr to the bow that was used. It might no longer exist.
|
|
|
|
@ -268,15 +245,11 @@ namespace MWWorld
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (caster.isEmpty())
|
|
|
|
if (caster.isEmpty())
|
|
|
|
caster = obstacle;
|
|
|
|
caster = result.mHitObject;
|
|
|
|
|
|
|
|
|
|
|
|
MWMechanics::projectileHit(caster, obstacle, bow, projectileRef.getPtr(), pos + (newPos - pos) * cIt->first);
|
|
|
|
MWMechanics::projectileHit(caster, result.mHitObject, bow, projectileRef.getPtr(), result.mHitPos);
|
|
|
|
|
|
|
|
|
|
|
|
hit = true;
|
|
|
|
mParent->removeChild(it->mNode);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hit)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
mSceneMgr->destroySceneNode(it->mNode);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
it = mProjectiles.erase(it);
|
|
|
|
it = mProjectiles.erase(it);
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
@ -290,13 +263,13 @@ namespace MWWorld
|
|
|
|
{
|
|
|
|
{
|
|
|
|
for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
|
|
|
|
for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
mSceneMgr->destroySceneNode(it->mNode);
|
|
|
|
mParent->removeChild(it->mNode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mProjectiles.clear();
|
|
|
|
mProjectiles.clear();
|
|
|
|
for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
|
|
|
|
for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
mParent->removeChild(it->mNode);
|
|
|
|
MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
|
|
|
|
MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
|
|
|
|
mSceneMgr->destroySceneNode(it->mNode);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mMagicBolts.clear();
|
|
|
|
mMagicBolts.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -309,8 +282,8 @@ namespace MWWorld
|
|
|
|
|
|
|
|
|
|
|
|
ESM::ProjectileState state;
|
|
|
|
ESM::ProjectileState state;
|
|
|
|
state.mId = it->mId;
|
|
|
|
state.mId = it->mId;
|
|
|
|
state.mPosition = it->mNode->getPosition();
|
|
|
|
state.mPosition = ESM::Vector3(osg::Vec3f(it->mNode->getPosition()));
|
|
|
|
state.mOrientation = it->mNode->getOrientation();
|
|
|
|
state.mOrientation = ESM::Quaternion(osg::Quat(it->mNode->getAttitude()));
|
|
|
|
state.mActorId = it->mActorId;
|
|
|
|
state.mActorId = it->mActorId;
|
|
|
|
|
|
|
|
|
|
|
|
state.mBowId = it->mBowId;
|
|
|
|
state.mBowId = it->mBowId;
|
|
|
|
@ -327,8 +300,8 @@ namespace MWWorld
|
|
|
|
|
|
|
|
|
|
|
|
ESM::MagicBoltState state;
|
|
|
|
ESM::MagicBoltState state;
|
|
|
|
state.mId = it->mId;
|
|
|
|
state.mId = it->mId;
|
|
|
|
state.mPosition = it->mNode->getPosition();
|
|
|
|
state.mPosition = ESM::Vector3(osg::Vec3f(it->mNode->getPosition()));
|
|
|
|
state.mOrientation = it->mNode->getOrientation();
|
|
|
|
state.mOrientation = ESM::Quaternion(osg::Quat(it->mNode->getAttitude()));
|
|
|
|
state.mActorId = it->mActorId;
|
|
|
|
state.mActorId = it->mActorId;
|
|
|
|
|
|
|
|
|
|
|
|
state.mSpellId = it->mSpellId;
|
|
|
|
state.mSpellId = it->mSpellId;
|
|
|
|
@ -369,8 +342,9 @@ namespace MWWorld
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(esm.mPosition, esm.mOrientation);
|
|
|
|
|
|
|
|
createModel(state, model);
|
|
|
|
createModel(state, model);
|
|
|
|
|
|
|
|
state.mNode->setPosition(osg::Vec3f(esm.mPosition));
|
|
|
|
|
|
|
|
state.mNode->setAttitude(osg::Quat(esm.mOrientation));
|
|
|
|
|
|
|
|
|
|
|
|
mProjectiles.push_back(state);
|
|
|
|
mProjectiles.push_back(state);
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
@ -401,8 +375,9 @@ namespace MWWorld
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(esm.mPosition, esm.mOrientation);
|
|
|
|
|
|
|
|
createModel(state, model);
|
|
|
|
createModel(state, model);
|
|
|
|
|
|
|
|
state.mNode->setPosition(osg::Vec3f(esm.mPosition));
|
|
|
|
|
|
|
|
state.mNode->setAttitude(osg::Quat(esm.mOrientation));
|
|
|
|
|
|
|
|
|
|
|
|
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
|
|
|
|
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
|
|
|
|
state.mSound = sndMgr->playManualSound3D(esm.mPosition, esm.mSound, 1.0f, 1.0f,
|
|
|
|
state.mSound = sndMgr->playManualSound3D(esm.mPosition, esm.mSound, 1.0f, 1.0f,
|
|
|
|
@ -421,4 +396,12 @@ namespace MWWorld
|
|
|
|
return mMagicBolts.size() + mProjectiles.size();
|
|
|
|
return mMagicBolts.size() + mProjectiles.size();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MWWorld::Ptr ProjectileManager::State::getCaster()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!mCasterHandle.isEmpty())
|
|
|
|
|
|
|
|
return mCasterHandle;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return MWBase::Environment::get().getWorld()->searchPtrViaActorId(mActorId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
scrawl
10 years ago