feat(object): set position and facing in CGUnit_C ctor
Some checks failed
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:cl compiler_name:MSVC cxx:cl os:windows-latest system_name:Windows test_path:WhoaTest]) (push) Has been cancelled
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:clang compiler_name:Clang cxx:clang++ os:macos-latest system_name:macOS test_path:WhoaTest]) (push) Has been cancelled
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:gcc compiler_name:GCC cxx:g++ os:ubuntu-latest system_name:Linux test_path:WhoaTest]) (push) Has been cancelled

This commit is contained in:
fallenoak 2026-02-25 22:11:31 -06:00
parent 8851d2e5e1
commit 5492b3f231
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
10 changed files with 140 additions and 2 deletions

View File

@ -96,7 +96,11 @@ const char* CGUnit_C::GetDisplayRaceNameFromRecord(const ChrRacesRec* raceRec, U
return raceRec->m_name;
}
CGUnit_C::CGUnit_C(uint32_t time, CClientObjCreate& objCreate) : CGObject_C(time, objCreate) {
CGUnit_C::CGUnit_C(uint32_t time, CClientObjCreate& objCreate)
: CGObject_C(time, objCreate)
, m_movement(&this->m_localMovement)
, m_localMovement(objCreate.move.status.position28, objCreate.move.status.facing34, this->GetGUID(), this)
{
// TODO
this->RefreshDataPointers();

View File

@ -4,6 +4,7 @@
#include "object/client/CClientObjCreate.hpp"
#include "object/client/CGObject_C.hpp"
#include "object/client/CGUnit.hpp"
#include "object/client/CMovementData_C.hpp"
#include "object/Types.hpp"
#include "util/GUID.hpp"
@ -48,6 +49,9 @@ class CGUnit_C : public CGObject_C, public CGUnit {
private:
// Private member variables
CMovementData_C* m_movement;
// TODO
CMovementData_C m_localMovement;
// TODO
CreatureDisplayInfoRec* m_displayInfo;
CreatureDisplayInfoExtraRec* m_displayInfoExtra;

View File

@ -0,0 +1,7 @@
#include "object/client/CMovementData_C.hpp"
CMovementData_C::CMovementData_C(const C3Vector& position, float facing, const WOWGUID& guid, CGUnit_C* unit)
: CMovementShared(0, position, facing, guid)
{
// TODO
}

View File

@ -0,0 +1,14 @@
#ifndef OBJECT_CLIENT_C_MOVEMENT_DATA_C_HPP
#define OBJECT_CLIENT_C_MOVEMENT_DATA_C_HPP
#include "object/movement/CMovementShared.hpp"
class CGUnit_C;
class CMovementData_C : public CMovementShared {
public:
// Public member functions
CMovementData_C(const C3Vector& position, float facing, const WOWGUID& guid, CGUnit_C* unit);
};
#endif

View File

@ -0,0 +1,15 @@
#ifndef OBJECT_CLIENT_C_MOVEMENT_C_HPP
#define OBJECT_CLIENT_C_MOVEMENT_C_HPP
#include "object/client/CMovementData_C.hpp"
#include "util/GUID.hpp"
#include <tempest/Vector.hpp>
class CMovement_C : public CMovementData_C {
public:
// Public member functions
CMovement_C(const C3Vector& position, float facing, const WOWGUID& guid, CGUnit_C* unit)
: CMovementData_C(position, facing, guid, unit) {};
};
#endif

View File

@ -0,0 +1,15 @@
#include "object/movement/CMovementShared.hpp"
CMovementShared::CMovementShared(const WOWGUID& transportGUID, const C3Vector& position, float facing, const WOWGUID& guid)
: CPassenger(transportGUID, position, guid)
{
this->m_facing = facing;
this->m_anchorPosition = position;
this->m_anchorFacing = facing;
this->m_anchorPitch = 0.0f;
this->m_cosAnchorPitch = 1.0f;
this->m_sinAnchorPitch = 0.0f;
this->m_spline = nullptr;
}

View File

@ -0,0 +1,31 @@
#ifndef OBJECT_MOVEMENT_C_MOVEMENT_SHARED_HPP
#define OBJECT_MOVEMENT_C_MOVEMENT_SHARED_HPP
#include "object/movement/CPassenger.hpp"
#include "util/GUID.hpp"
#include <tempest/Vector.hpp>
struct CMoveSpline;
class CMovementShared : public CPassenger {
public:
// Public member functions
CMovementShared(const WOWGUID& transportGUID, const C3Vector& position, float facing, const WOWGUID& guid);
protected:
// Protected member variables
// TODO
C3Vector m_anchorPosition;
float m_anchorFacing;
float m_anchorPitch;
// TODO
C3Vector m_direction;
C2Vector m_direction2d;
float m_cosAnchorPitch;
float m_sinAnchorPitch;
// TODO
CMoveSpline* m_spline;
// TODO
};
#endif

View File

@ -48,7 +48,7 @@ CDataStore& operator>>(CDataStore& msg, CMovementStatus& move) {
msg.Get(move.uint14);
msg.Get(move.uint0);
msg >> move.position18;
msg >> move.position28;
msg.Get(move.facing34);
if (move.moveFlags & 0x200) {

View File

@ -0,0 +1,18 @@
#include "object/movement/CPassenger.hpp"
#include <tempest/Matrix.hpp>
C3Vector CPassenger::GetPosition() const {
return GetPosition(this->m_position);
}
C3Vector CPassenger::GetPosition(const C3Vector& position) const {
// If on transport, transform position by transport matrix
if (this->m_transportGUID) {
C44Matrix transportMatrix;
// MovementGetTransportMtxX(this->m_transportGUID, &transportMatrix);
return position * transportMatrix;
}
return position;
}

View File

@ -0,0 +1,30 @@
#ifndef OBJECT_MOVEMENT_C_PASSENGER_HPP
#define OBJECT_MOVEMENT_C_PASSENGER_HPP
#include "util/GUID.hpp"
#include <tempest/Vector.hpp>
class CPassenger {
public:
// Public member functions
CPassenger(const WOWGUID& transportGUID, const C3Vector& position, const WOWGUID& guid)
: m_transportGUID(transportGUID)
, m_position(position)
, m_facing(0.0f)
, m_guid(guid) {};
C3Vector GetPosition() const;
C3Vector GetPosition(const C3Vector& position) const;
protected:
// Protected member variables
// TODO
WOWGUID m_transportGUID;
C3Vector m_position;
// TODO
float m_facing;
// TODO
const WOWGUID& m_guid;
// TODO
};
#endif