mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-05 22:19:42 +00:00
Code Issues Releases Wiki Activity

[VR Client] Synchronize player's melee attacks

Browse source
This commit is contained in:
David Cernat 2022-02-22 15:49:17 +02:00
parent 3b40882ba3
commit 455356160e
2 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmp/LocalPlayer.hpp
View file

@ -122,6 +122,9 @@ namespace mwmp
void playAnimation();
void playSpeech();
bool sentVRSwingStart = false;
bool sentVRSwingEnd = false;
MWWorld::Ptr getPlayerPtr();
private:

81
apps/openmw/mwvr/realisticcombat.cpp
View file

@ -5,6 +5,18 @@
#include "../mwmechanics/weapontype.hpp"
/*
Start of tes3mp addition
Include additional headers for multiplayer purposes
*/
#include "../mwmp/Main.hpp"
#include "../mwmp/LocalPlayer.hpp"
#include "../mwmp/MechanicsHelper.hpp"
/*
End of tes3mp addition
*/
#include <components/debug/debuglog.hpp>
#include <iomanip>
@ -236,6 +248,23 @@ namespace MWVR {
}
}
/*
Start of tes3mp addition
Record the attack animation chosen so we can send it in the next PlayerAttack packet
*/
mwmp::LocalPlayer* localPlayer = mwmp::Main::get().getLocalPlayer();
if (mSwingType == ESM::Weapon::AT_Chop)
localPlayer->attack.attackAnimation = "chop";
else if (mSwingType == ESM::Weapon::AT_Slash)
localPlayer->attack.attackAnimation = "slash";
else if (mSwingType == ESM::Weapon::AT_Thrust)
localPlayer->attack.attackAnimation = "thrust";
/*
End of tes3mp addition
*/
switch (mState)
{
case SwingState_Cooldown:
@ -256,7 +285,21 @@ namespace MWVR {
void StateMachine::update_cooldownState()
{
if (mTimeSinceEnteredState >= mMinimumPeriod)
{
/*
Start of tes3mp addition
Reset the booleans tracking VR swing start and end
*/
mwmp::LocalPlayer* localPlayer = mwmp::Main::get().getLocalPlayer();
localPlayer ->sentVRSwingStart = false;
localPlayer->sentVRSwingEnd = false;
/*
End of tes3mp addition
*/
transition_cooldownToReady();
}
}
void StateMachine::transition_cooldownToReady()
@ -272,6 +315,25 @@ namespace MWVR {
void StateMachine::transition_readyToLaunch()
{
/*
Start of tes3mp addition
Send an ID_PLAYER_ATTACK packet with this attack
*/
if (!mwmp::Main::get().getLocalPlayer()->sentVRSwingStart)
{
mwmp::LocalPlayer* localPlayer = mwmp::Main::get().getLocalPlayer();
localPlayer->sentVRSwingStart = true;
MechanicsHelper::resetAttack(&localPlayer->attack);
localPlayer->attack.type = mwmp::Attack::MELEE;
localPlayer->attack.pressed = true;
localPlayer->attack.shouldSend = true;
localPlayer->updateAttackOrCast();
}
/*
End of tes3mp addition
*/
transition(SwingState_Launch);
}
@ -305,6 +367,25 @@ namespace MWVR {
void StateMachine::transition_launchToSwing()
{
/*
Start of tes3mp addition
Send an ID_PLAYER_ATTACK packet with this attack
*/
if (!mwmp::Main::get().getLocalPlayer()->sentVRSwingEnd)
{
mwmp::LocalPlayer* localPlayer = mwmp::Main::get().getLocalPlayer();
localPlayer->sentVRSwingEnd = true;
MechanicsHelper::resetAttack(&localPlayer->attack);
localPlayer->attack.type = mwmp::Attack::MELEE;
localPlayer->attack.pressed = false;
localPlayer->attack.shouldSend = true;
localPlayer->updateAttackOrCast();
}
/*
End of tes3mp addition
*/
playSwish();
transition(SwingState_Swing);