Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-09 01:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename VehiclePhysics to HavokVehiclePhysics (#1331)

Browse Source 
since that is it's true name
and there's another VehiclePhysics component that is simply named that
This commit is contained in:
Aaron Kimbrell 2023-12-04 09:20:41 -06:00 committed by GitHub
parent 731b828c12
commit 3d85f6639e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dCommon/dEnums/eReplicaComponentType.h
View File

@ -34,7 +34,7 @@ enum class eReplicaComponentType : uint32_t {
PLATFORM_BOUNDARY, PLATFORM_BOUNDARY,
MODULE, MODULE,
ARCADE, ARCADE,
VEHICLE_PHYSICS, // Havok demo based HAVOK_VEHICLE_PHYSICS,
MOVEMENT_AI, MOVEMENT_AI,
EXHIBIT, EXHIBIT,
OVERHEAD_ICON, OVERHEAD_ICON,
@ -50,7 +50,7 @@ enum class eReplicaComponentType : uint32_t {
PROPERTY_ENTRANCE, PROPERTY_ENTRANCE,
FX, FX,
PROPERTY_MANAGEMENT, PROPERTY_MANAGEMENT,
VEHICLE_PHYSICS_NEW, // internal physics based on havok VEHICLE_PHYSICS,
PHYSICS_SYSTEM, PHYSICS_SYSTEM,
QUICK_BUILD, QUICK_BUILD,
SWITCH, SWITCH,

26
dGame/Entity.cpp
View File

@ -62,7 +62,7 @@
#include "ModelComponent.h" #include "ModelComponent.h"
#include "ZCompression.h" #include "ZCompression.h"
#include "PetComponent.h" #include "PetComponent.h"
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "PossessableComponent.h" #include "PossessableComponent.h"
#include "PossessorComponent.h" #include "PossessorComponent.h"
#include "ModuleAssemblyComponent.h" #include "ModuleAssemblyComponent.h"
@ -299,10 +299,10 @@ void Entity::Initialize() {
AddComponent<PhantomPhysicsComponent>()->SetPhysicsEffectActive(false); AddComponent<PhantomPhysicsComponent>()->SetPhysicsEffectActive(false);
} }
if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::VEHICLE_PHYSICS) > 0) { if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::HAVOK_VEHICLE_PHYSICS) > 0) {
auto* vehiclePhysicsComponent = AddComponent<VehiclePhysicsComponent>(); auto* havokVehiclePhysicsComponent = AddComponent<HavokVehiclePhysicsComponent>();
vehiclePhysicsComponent->SetPosition(m_DefaultPosition); havokVehiclePhysicsComponent->SetPosition(m_DefaultPosition);
vehiclePhysicsComponent->SetRotation(m_DefaultRotation); havokVehiclePhysicsComponent->SetRotation(m_DefaultRotation);
} }
if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::SOUND_TRIGGER, -1) != -1) { if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::SOUND_TRIGGER, -1) != -1) {
@ -744,7 +744,7 @@ void Entity::Initialize() {
!HasComponent(eReplicaComponentType::PHANTOM_PHYSICS) && !HasComponent(eReplicaComponentType::PHANTOM_PHYSICS) &&
!HasComponent(eReplicaComponentType::PROPERTY) && !HasComponent(eReplicaComponentType::PROPERTY) &&
!HasComponent(eReplicaComponentType::RACING_CONTROL) && !HasComponent(eReplicaComponentType::RACING_CONTROL) &&
!HasComponent(eReplicaComponentType::VEHICLE_PHYSICS) !HasComponent(eReplicaComponentType::HAVOK_VEHICLE_PHYSICS)
) )
//if (HasComponent(eReplicaComponentType::BASE_COMBAT_AI)) //if (HasComponent(eReplicaComponentType::BASE_COMBAT_AI))
{ {
@ -1023,9 +1023,9 @@ void Entity::WriteComponents(RakNet::BitStream* outBitStream, eReplicaPacketType
rigidbodyPhantomPhysics->Serialize(outBitStream, bIsInitialUpdate); rigidbodyPhantomPhysics->Serialize(outBitStream, bIsInitialUpdate);
} }
VehiclePhysicsComponent* vehiclePhysicsComponent; HavokVehiclePhysicsComponent* havokVehiclePhysicsComponent;
if (TryGetComponent(eReplicaComponentType::VEHICLE_PHYSICS, vehiclePhysicsComponent)) { if (TryGetComponent(eReplicaComponentType::HAVOK_VEHICLE_PHYSICS, havokVehiclePhysicsComponent)) {
vehiclePhysicsComponent->Serialize(outBitStream, bIsInitialUpdate); havokVehiclePhysicsComponent->Serialize(outBitStream, bIsInitialUpdate);
} }
PhantomPhysicsComponent* phantomPhysicsComponent; PhantomPhysicsComponent* phantomPhysicsComponent;
@ -1846,7 +1846,7 @@ const NiPoint3& Entity::GetPosition() const {
return simple->GetPosition(); return simple->GetPosition();
} }
auto* vehicel = GetComponent<VehiclePhysicsComponent>(); auto* vehicel = GetComponent<HavokVehiclePhysicsComponent>();
if (vehicel != nullptr) { if (vehicel != nullptr) {
return vehicel->GetPosition(); return vehicel->GetPosition();
@ -1874,7 +1874,7 @@ const NiQuaternion& Entity::GetRotation() const {
return simple->GetRotation(); return simple->GetRotation();
} }
auto* vehicel = GetComponent<VehiclePhysicsComponent>(); auto* vehicel = GetComponent<HavokVehiclePhysicsComponent>();
if (vehicel != nullptr) { if (vehicel != nullptr) {
return vehicel->GetRotation(); return vehicel->GetRotation();
@ -1902,7 +1902,7 @@ void Entity::SetPosition(NiPoint3 position) {
simple->SetPosition(position); simple->SetPosition(position);
} }
auto* vehicel = GetComponent<VehiclePhysicsComponent>(); auto* vehicel = GetComponent<HavokVehiclePhysicsComponent>();
if (vehicel != nullptr) { if (vehicel != nullptr) {
vehicel->SetPosition(position); vehicel->SetPosition(position);
@ -1930,7 +1930,7 @@ void Entity::SetRotation(NiQuaternion rotation) {
simple->SetRotation(rotation); simple->SetRotation(rotation);
} }
auto* vehicel = GetComponent<VehiclePhysicsComponent>(); auto* vehicel = GetComponent<HavokVehiclePhysicsComponent>();
if (vehicel != nullptr) { if (vehicel != nullptr) {
vehicel->SetRotation(rotation); vehicel->SetRotation(rotation);

2
dGame/dComponents/CMakeLists.txt
View File

@ -43,7 +43,7 @@ set(DGAME_DCOMPONENTS_SOURCES "BaseCombatAIComponent.cpp"
"SoundTriggerComponent.cpp" "SoundTriggerComponent.cpp"
"SwitchComponent.cpp" "SwitchComponent.cpp"
"TriggerComponent.cpp" "TriggerComponent.cpp"
"VehiclePhysicsComponent.cpp" "HavokVehiclePhysicsComponent.cpp"
"VendorComponent.cpp" "VendorComponent.cpp"
"ZoneControlComponent.cpp" "ZoneControlComponent.cpp"
PARENT_SCOPE PARENT_SCOPE

2
dGame/dComponents/CharacterComponent.cpp
View File

@ -10,7 +10,7 @@
#include "InventoryComponent.h" #include "InventoryComponent.h"
#include "ControllablePhysicsComponent.h" #include "ControllablePhysicsComponent.h"
#include "EntityManager.h" #include "EntityManager.h"
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "GameMessages.h" #include "GameMessages.h"
#include "Item.h" #include "Item.h"
#include "Amf3.h" #include "Amf3.h"

22
dGame/dComponents/VehiclePhysicsComponent.cpp → dGame/dComponents/HavokVehiclePhysicsComponent.cpp
View File

@ -1,7 +1,7 @@
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "EntityManager.h" #include "EntityManager.h"
VehiclePhysicsComponent::VehiclePhysicsComponent(Entity* parent) : PhysicsComponent(parent) { HavokVehiclePhysicsComponent::HavokVehiclePhysicsComponent(Entity* parent) : PhysicsComponent(parent) {
m_Velocity = NiPoint3::ZERO; m_Velocity = NiPoint3::ZERO;
m_AngularVelocity = NiPoint3::ZERO; m_AngularVelocity = NiPoint3::ZERO;
m_IsOnGround = true; m_IsOnGround = true;
@ -12,45 +12,45 @@ VehiclePhysicsComponent::VehiclePhysicsComponent(Entity* parent) : PhysicsCompon
m_EndBehavior = GeneralUtils::GenerateRandomNumber<uint32_t>(0, 7); m_EndBehavior = GeneralUtils::GenerateRandomNumber<uint32_t>(0, 7);
} }
void VehiclePhysicsComponent::SetVelocity(const NiPoint3& vel) { void HavokVehiclePhysicsComponent::SetVelocity(const NiPoint3& vel) {
if (vel == m_Velocity) return; if (vel == m_Velocity) return;
m_DirtyPosition = true; m_DirtyPosition = true;
m_Velocity = vel; m_Velocity = vel;
} }
void VehiclePhysicsComponent::SetAngularVelocity(const NiPoint3& vel) { void HavokVehiclePhysicsComponent::SetAngularVelocity(const NiPoint3& vel) {
if (vel == m_AngularVelocity) return; if (vel == m_AngularVelocity) return;
m_DirtyPosition = true; m_DirtyPosition = true;
m_AngularVelocity = vel; m_AngularVelocity = vel;
} }
void VehiclePhysicsComponent::SetIsOnGround(bool val) { void HavokVehiclePhysicsComponent::SetIsOnGround(bool val) {
if (val == m_IsOnGround) return; if (val == m_IsOnGround) return;
m_DirtyPosition = true; m_DirtyPosition = true;
m_IsOnGround = val; m_IsOnGround = val;
} }
void VehiclePhysicsComponent::SetIsOnRail(bool val) { void HavokVehiclePhysicsComponent::SetIsOnRail(bool val) {
if (val == m_IsOnRail) return; if (val == m_IsOnRail) return;
m_DirtyPosition = true; m_DirtyPosition = true;
m_IsOnRail = val; m_IsOnRail = val;
} }
void VehiclePhysicsComponent::SetRemoteInputInfo(const RemoteInputInfo& remoteInputInfo) { void HavokVehiclePhysicsComponent::SetRemoteInputInfo(const RemoteInputInfo& remoteInputInfo) {
if (m_RemoteInputInfo == remoteInputInfo) return; if (m_RemoteInputInfo == remoteInputInfo) return;
this->m_RemoteInputInfo = remoteInputInfo; this->m_RemoteInputInfo = remoteInputInfo;
m_DirtyRemoteInput = true; m_DirtyRemoteInput = true;
} }
void VehiclePhysicsComponent::SetDirtyVelocity(bool val) { void HavokVehiclePhysicsComponent::SetDirtyVelocity(bool val) {
m_DirtyVelocity = val; m_DirtyVelocity = val;
} }
void VehiclePhysicsComponent::SetDirtyAngularVelocity(bool val) { void HavokVehiclePhysicsComponent::SetDirtyAngularVelocity(bool val) {
m_DirtyAngularVelocity = val; m_DirtyAngularVelocity = val;
} }
void VehiclePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) { void HavokVehiclePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) {
outBitStream->Write(bIsInitialUpdate || m_DirtyPosition); outBitStream->Write(bIsInitialUpdate || m_DirtyPosition);
if (bIsInitialUpdate || m_DirtyPosition) { if (bIsInitialUpdate || m_DirtyPosition) {
@ -111,7 +111,7 @@ void VehiclePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bool bI
outBitStream->Write0(); outBitStream->Write0();
} }
void VehiclePhysicsComponent::Update(float deltaTime) { void HavokVehiclePhysicsComponent::Update(float deltaTime) {
if (m_SoftUpdate > 5) { if (m_SoftUpdate > 5) {
Game::entityManager->SerializeEntity(m_Parent); Game::entityManager->SerializeEntity(m_Parent);
m_SoftUpdate = 0; m_SoftUpdate = 0;

6
dGame/dComponents/VehiclePhysicsComponent.h → dGame/dComponents/HavokVehiclePhysicsComponent.h
View File

@ -33,11 +33,11 @@ struct RemoteInputInfo {
/** /**
* Physics component for vehicles. * Physics component for vehicles.
*/ */
class VehiclePhysicsComponent : public PhysicsComponent { class HavokVehiclePhysicsComponent : public PhysicsComponent {
public: public:
inline static const eReplicaComponentType ComponentType = eReplicaComponentType::VEHICLE_PHYSICS; inline static const eReplicaComponentType ComponentType = eReplicaComponentType::HAVOK_VEHICLE_PHYSICS;
VehiclePhysicsComponent(Entity* parentEntity); HavokVehiclePhysicsComponent(Entity* parentEntity);
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override; void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;

4
dGame/dComponents/InventoryComponent.cpp
View File

@ -19,7 +19,7 @@
#include "PossessorComponent.h" #include "PossessorComponent.h"
#include "PossessableComponent.h" #include "PossessableComponent.h"
#include "ModuleAssemblyComponent.h" #include "ModuleAssemblyComponent.h"
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "CharacterComponent.h" #include "CharacterComponent.h"
#include "dZoneManager.h" #include "dZoneManager.h"
#include "PropertyManagementComponent.h" #include "PropertyManagementComponent.h"
@ -981,7 +981,7 @@ void InventoryComponent::HandlePossession(Item* item) {
auto* mount = Game::entityManager->CreateEntity(info, nullptr, m_Parent); auto* mount = Game::entityManager->CreateEntity(info, nullptr, m_Parent);
// Check to see if the mount is a vehicle, if so, flip it // Check to see if the mount is a vehicle, if so, flip it
auto* vehicleComponent = mount->GetComponent<VehiclePhysicsComponent>(); auto* vehicleComponent = mount->GetComponent<HavokVehiclePhysicsComponent>();
if (vehicleComponent) characterComponent->SetIsRacing(true); if (vehicleComponent) characterComponent->SetIsRacing(true);
// Setup the destroyable stats // Setup the destroyable stats

2
dGame/dComponents/RacingControlComponent.cpp
View File

@ -17,7 +17,7 @@
#include "PossessorComponent.h" #include "PossessorComponent.h"
#include "eRacingTaskParam.h" #include "eRacingTaskParam.h"
#include "Spawner.h" #include "Spawner.h"
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "dServer.h" #include "dServer.h"
#include "dZoneManager.h" #include "dZoneManager.h"
#include "dConfig.h" #include "dConfig.h"

2
dGame/dGameMessages/GameMessages.cpp
View File

@ -71,7 +71,7 @@
#include "MovingPlatformComponent.h" #include "MovingPlatformComponent.h"
#include "PetComponent.h" #include "PetComponent.h"
#include "ModuleAssemblyComponent.h" #include "ModuleAssemblyComponent.h"
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "RenderComponent.h" #include "RenderComponent.h"
#include "PossessableComponent.h" #include "PossessableComponent.h"
#include "PossessorComponent.h" #include "PossessorComponent.h"

8
dGame/dUtilities/SlashCommandHandler.cpp
View File

@ -59,7 +59,7 @@
#include "dpShapeSphere.h" #include "dpShapeSphere.h"
#include "PossessableComponent.h" #include "PossessableComponent.h"
#include "PossessorComponent.h" #include "PossessorComponent.h"
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "BuffComponent.h" #include "BuffComponent.h"
#include "SkillComponent.h" #include "SkillComponent.h"
#include "VanityUtilities.h" #include "VanityUtilities.h"
@ -942,9 +942,9 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
auto* possassableEntity = Game::entityManager->GetEntity(possessorComponent->GetPossessable()); auto* possassableEntity = Game::entityManager->GetEntity(possessorComponent->GetPossessable());
if (possassableEntity != nullptr) { if (possassableEntity != nullptr) {
auto* vehiclePhysicsComponent = possassableEntity->GetComponent<VehiclePhysicsComponent>(); auto* havokVehiclePhysicsComponent = possassableEntity->GetComponent<HavokVehiclePhysicsComponent>();
if (vehiclePhysicsComponent) { if (havokVehiclePhysicsComponent) {
vehiclePhysicsComponent->SetPosition(pos); havokVehiclePhysicsComponent->SetPosition(pos);
Game::entityManager->SerializeEntity(possassableEntity); Game::entityManager->SerializeEntity(possassableEntity);
} else GameMessages::SendTeleport(possassableEntity->GetObjectID(), pos, NiQuaternion(), sysAddr); } else GameMessages::SendTeleport(possassableEntity->GetObjectID(), pos, NiQuaternion(), sysAddr);
} }

24
dNet/ClientPackets.cpp
View File

@ -27,7 +27,7 @@
#include "Zone.h" #include "Zone.h"
#include "PossessorComponent.h" #include "PossessorComponent.h"
#include "PossessableComponent.h" #include "PossessableComponent.h"
#include "VehiclePhysicsComponent.h" #include "HavokVehiclePhysicsComponent.h"
#include "dConfig.h" #include "dConfig.h"
#include "CharacterComponent.h" #include "CharacterComponent.h"
#include "Database.h" #include "Database.h"
@ -187,17 +187,17 @@ void ClientPackets::HandleClientPositionUpdate(const SystemAddress& sysAddr, Pac
if (possessableComponent->GetPossessionType() != ePossessionType::ATTACHED_VISIBLE) updateChar = false; if (possessableComponent->GetPossessionType() != ePossessionType::ATTACHED_VISIBLE) updateChar = false;
} }
auto* vehiclePhysicsComponent = possassableEntity->GetComponent<VehiclePhysicsComponent>(); auto* havokVehiclePhysicsComponent = possassableEntity->GetComponent<HavokVehiclePhysicsComponent>();
if (vehiclePhysicsComponent != nullptr) { if (havokVehiclePhysicsComponent != nullptr) {
vehiclePhysicsComponent->SetPosition(position); havokVehiclePhysicsComponent->SetPosition(position);
vehiclePhysicsComponent->SetRotation(rotation); havokVehiclePhysicsComponent->SetRotation(rotation);
vehiclePhysicsComponent->SetIsOnGround(onGround); havokVehiclePhysicsComponent->SetIsOnGround(onGround);
vehiclePhysicsComponent->SetIsOnRail(onRail); havokVehiclePhysicsComponent->SetIsOnRail(onRail);
vehiclePhysicsComponent->SetVelocity(velocity); havokVehiclePhysicsComponent->SetVelocity(velocity);
vehiclePhysicsComponent->SetDirtyVelocity(velocityFlag); havokVehiclePhysicsComponent->SetDirtyVelocity(velocityFlag);
vehiclePhysicsComponent->SetAngularVelocity(angVelocity); havokVehiclePhysicsComponent->SetAngularVelocity(angVelocity);
vehiclePhysicsComponent->SetDirtyAngularVelocity(angVelocityFlag); havokVehiclePhysicsComponent->SetDirtyAngularVelocity(angVelocityFlag);
vehiclePhysicsComponent->SetRemoteInputInfo(remoteInput); havokVehiclePhysicsComponent->SetRemoteInputInfo(remoteInput);
} else { } else {
// Need to get the mount's controllable physics // Need to get the mount's controllable physics
auto* controllablePhysicsComponent = possassableEntity->GetComponent<ControllablePhysicsComponent>(); auto* controllablePhysicsComponent = possassableEntity->GetComponent<ControllablePhysicsComponent>();