Skip to content

Ped's camera synchronization #3987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 29, 2025
Merged

Ped's camera synchronization #3987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3d44c7
Ped's camera synchronization
tederis Jan 29, 2025
d318adf
Handle target camera rotation
tederis Jan 29, 2025
80a6056
Better way of floats comparison
tederis Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Client/mods/deathmatch/logic/CClientPed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3333,14 +3333,20 @@ void CClientPed::SetTargetRotation(float fRotation)
SetCurrentRotation(fRotation);
}

void CClientPed::SetTargetRotation(unsigned long ulDelay, float fRotation, float fCameraRotation)
void CClientPed::SetTargetRotation(unsigned long ulDelay, std::optional<float> rotation, std::optional<float> cameraRotation)
{
m_ulBeginRotationTime = CClientTime::GetTime();
m_ulEndRotationTime = m_ulBeginRotationTime + ulDelay;
m_fBeginRotation = (m_pPlayerPed) ? m_pPlayerPed->GetCurrentRotation() : m_fCurrentRotation;
m_fTargetRotationA = fRotation;
m_fBeginCameraRotation = GetCameraRotation();
m_fTargetCameraRotation = fCameraRotation;
if (rotation.has_value())
{
m_fBeginRotation = (m_pPlayerPed) ? m_pPlayerPed->GetCurrentRotation() : m_fCurrentRotation;
m_fTargetRotationA = rotation.value();
}
if (cameraRotation.has_value())
{
m_fBeginCameraRotation = GetCameraRotation();
m_fTargetCameraRotation = cameraRotation.value();
}
}

// Temporary
Expand Down
3 changes: 2 additions & 1 deletion Client/mods/deathmatch/logic/CClientPed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ struct SLastSyncedPedData
CVector vPosition;
CVector vVelocity;
float fRotation;
float cameraRotation{};
bool bOnFire;
bool bIsInWater;
bool isReloadingWeapon;
Expand Down Expand Up @@ -205,7 +206,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
float GetCurrentRotation();
void SetCurrentRotation(float fRotation, bool bIncludeTarget = true);
void SetTargetRotation(float fRotation);
void SetTargetRotation(unsigned long ulDelay, float fRotation, float fCameraRotation);
void SetTargetRotation(unsigned long ulDelay, std::optional<float> rotation, std::optional<float> cameraRotation);

float GetCameraRotation();
void SetCameraRotation(float fRotation);
Expand Down
42 changes: 40 additions & 2 deletions Client/mods/deathmatch/logic/CPedSync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ void CPedSync::Packet_PedStartSync(NetBitStreamInterface& BitStream)
float fHealth, fArmor;
BitStream.Read(fHealth);
BitStream.Read(fArmor);

if (BitStream.Can(eBitStreamVersion::PedSync_CameraRotation))
{
float cameraRotation{};
BitStream.Read(cameraRotation);

pPed->SetCameraRotation(cameraRotation);
}

// Set data
pPed->SetPosition(vecPosition);
Expand Down Expand Up @@ -179,10 +187,15 @@ void CPedSync::Packet_PedSync(NetBitStreamInterface& BitStream)
unsigned char ucFlags = 0;
BitStream.Read(ucFlags);

std::uint8_t flags2{};
if (BitStream.Can(eBitStreamVersion::PedSync_CameraRotation))
BitStream.Read(flags2);

CVector vecPosition{ CVector::NoInit{} }, vecMoveSpeed{ CVector::NoInit{} };
float fRotation, fHealth, fArmor;
bool bOnFire;
bool bIsInWater;
float cameraRotation;

if (BitStream.Can(eBitStreamVersion::PedSync_Revision))
{
Expand Down Expand Up @@ -231,6 +244,13 @@ void CPedSync::Packet_PedSync(NetBitStreamInterface& BitStream)
if (ucFlags & 0x10)
BitStream.Read(fArmor);

if (flags2 & 0x01)
{
SCameraRotationSync camRotation;
BitStream.Read(&camRotation);
cameraRotation = camRotation.data.fRotation;
}

// And the burning state
if (BitStream.Version() >= 0x04E && ucFlags & 0x20)
BitStream.ReadBit(bOnFire);
Expand All @@ -246,13 +266,15 @@ void CPedSync::Packet_PedSync(NetBitStreamInterface& BitStream)
if (ucFlags & 0x01)
pPed->SetTargetPosition(vecPosition, PED_SYNC_RATE);
if (ucFlags & 0x02)
pPed->SetTargetRotation(PED_SYNC_RATE, fRotation, 0.0f);
pPed->SetTargetRotation(PED_SYNC_RATE, fRotation, std::nullopt);
if (ucFlags & 0x04)
pPed->SetMoveSpeed(vecMoveSpeed);
if (ucFlags & 0x08)
pPed->LockHealth(fHealth);
if (ucFlags & 0x10)
pPed->LockArmor(fArmor);
if (flags2 & 0x01)
pPed->SetTargetRotation(PED_SYNC_RATE, std::nullopt, cameraRotation);
if (BitStream.Version() >= 0x04E && ucFlags & 0x20)
pPed->SetOnFire(bOnFire);
if (BitStream.Version() >= 0x55 && ucFlags & 0x40)
Expand Down Expand Up @@ -312,8 +334,12 @@ void CPedSync::WritePedInformation(NetBitStreamInterface* pBitStream, CClientPed
if (pPed->HasSyncedAnim() && (!pPed->IsRunningAnimation() || pPed->m_animationOverridedByClient))
ucFlags |= 0x80;

std::uint8_t flags2{};
if (!IsNearlyEqual(pPed->GetCameraRotation(), pPed->m_LastSyncedData->cameraRotation) && pBitStream->Can(eBitStreamVersion::PedSync_CameraRotation))
flags2 |= 0x01;

// Do we really have to sync this ped?
if (ucFlags == 0)
if (ucFlags == 0 && flags2 == 0)
return;

// Write the ped id
Expand All @@ -325,6 +351,10 @@ void CPedSync::WritePedInformation(NetBitStreamInterface* pBitStream, CClientPed
// Write flags
pBitStream->Write(ucFlags);

// Write flags 2
if (pBitStream->Can(eBitStreamVersion::PedSync_CameraRotation))
pBitStream->Write(flags2);

// Write position if needed
if (ucFlags & 0x01)
{
Expand Down Expand Up @@ -389,6 +419,14 @@ void CPedSync::WritePedInformation(NetBitStreamInterface* pBitStream, CClientPed
pPed->m_LastSyncedData->fArmour = pPed->GetArmor();
}

if (flags2 & 0x01)
{
SCameraRotationSync camRotation;
camRotation.data.fRotation = pPed->GetCameraRotation();
pBitStream->Write(&camRotation);
pPed->m_LastSyncedData->cameraRotation = camRotation.data.fRotation;
}

if (ucFlags & 0x20 && pBitStream->Version() >= 0x04E)
{
pBitStream->WriteBit(pPed->IsOnFire());
Expand Down
4 changes: 4 additions & 0 deletions Server/mods/deathmatch/logic/CPed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,9 @@ class CPed : public CElement
float GetRotation() { return m_fRotation; }
void SetRotation(float fRotation) { m_fRotation = fRotation; }

float GetCameraRotation() const { return m_cameraRotation; }
void SetCameraRotation(float fRotation) { m_cameraRotation = fRotation; }

void GetRotation(CVector& vecRotation);
void GetMatrix(CMatrix& matrix);
void SetMatrix(const CMatrix& matrix);
Expand Down Expand Up @@ -346,6 +349,7 @@ class CPed : public CElement
bool m_reloadingWeapon{};
CVehicle* m_pJackingVehicle;
SPlayerAnimData m_animData{};
float m_cameraRotation{};

CVehicle* m_pVehicle;
unsigned int m_uiVehicleSeat;
Expand Down
3 changes: 3 additions & 0 deletions Server/mods/deathmatch/logic/CPedSync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,9 @@ void CPedSync::Packet_PedSync(CPedSyncPacket& Packet)
if (Data.ucFlags & 0x10)
pPed->SetArmor(Data.fArmor);

if (Data.flags2 & 0x01)
pPed->SetCameraRotation(Data.cameraRotation);

if (Data.ucFlags & 0x20)
pPed->SetOnFire(Data.bOnFire);

Expand Down
3 changes: 3 additions & 0 deletions Server/mods/deathmatch/logic/packets/CPedStartSyncPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ bool CPedStartSyncPacket::Write(NetBitStreamInterface& BitStream) const
BitStream.Write(m_pPed->GetHealth());
BitStream.Write(m_pPed->GetArmor());

if (BitStream.Can(eBitStreamVersion::PedSync_CameraRotation))
BitStream.Write(m_pPed->GetCameraRotation());

return true;
}
27 changes: 27 additions & 0 deletions Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ bool CPedSyncPacket::Read(NetBitStreamInterface& BitStream)
return false;
Data.ucFlags = ucFlags;

if (BitStream.Can(eBitStreamVersion::PedSync_CameraRotation))
{
if (!BitStream.Read(Data.flags2))
return false;
}
else
Data.flags2 = 0;

// Did we recieve position?
if (ucFlags & 0x01)
{
Expand All @@ -57,6 +65,14 @@ bool CPedSyncPacket::Read(NetBitStreamInterface& BitStream)
return false;
}

if (Data.flags2 & 0x01)
{
SCameraRotationSync camRotation;
if (!BitStream.Read(&camRotation))
return false;
Data.cameraRotation = camRotation.data.fRotation;
}

// On Fire
if (ucFlags & 0x20)
{
Expand Down Expand Up @@ -100,6 +116,9 @@ bool CPedSyncPacket::Write(NetBitStreamInterface& BitStream) const

BitStream.Write(Data.ucFlags);

if (BitStream.Can(eBitStreamVersion::PedSync_CameraRotation))
BitStream.Write(Data.flags2);

if (BitStream.Can(eBitStreamVersion::PedSync_Revision))
{
// Position and rotation
Expand Down Expand Up @@ -140,6 +159,14 @@ bool CPedSyncPacket::Write(NetBitStreamInterface& BitStream) const
BitStream.Write(Data.fHealth);
if (Data.ucFlags & 0x10)
BitStream.Write(Data.fArmor);

if (Data.flags2 & 0x01)
{
SCameraRotationSync camRotation;
camRotation.data.fRotation = Data.cameraRotation;
BitStream.Write(&camRotation);
}

if (Data.ucFlags & 0x20)
BitStream.WriteBit(Data.bOnFire);
if (Data.ucFlags & 0x60 && BitStream.Can(eBitStreamVersion::IsPedReloadingWeapon))
Expand Down
2 changes: 2 additions & 0 deletions Server/mods/deathmatch/logic/packets/CPedSyncPacket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class CPedSyncPacket final : public CPacket
{
ElementID ID;
unsigned char ucFlags;
std::uint8_t flags2;
unsigned char ucSyncTimeContext;
SPositionSync position;
SPedRotationSync rotation;
Expand All @@ -32,6 +33,7 @@ class CPedSyncPacket final : public CPacket
bool bOnFire;
bool bIsInWater;
bool isReloadingWeapon;
float cameraRotation;

bool ReadSpatialData(NetBitStreamInterface& BitStream);
// Backward compatibility
Expand Down
5 changes: 5 additions & 0 deletions Shared/sdk/SharedUtil.Math.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,9 @@ namespace SharedUtil
{
return std::uniform_real_distribution<float>{minRange, maxRange}(randomEngine);
}

inline bool IsNearlyEqual(float a, float b, float epsilon = std::numeric_limits<float>().epsilon()) noexcept
{
return std::fabs(a - b) <= epsilon;
}
} // namespace SharedUtil
4 changes: 4 additions & 0 deletions Shared/sdk/net/bitstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,10 @@ enum class eBitStreamVersion : unsigned short
// 2025-01-10
WorldSpecialProperty_FlyingComponents,

// Ped's camera synchronization
// 2025-01-29
PedSync_CameraRotation,

// This allows us to automatically increment the BitStreamVersion when things are added to this enum.
// Make sure you only add things above this comment.
Next,
Expand Down
Loading