Allow allocating models server-side #2533

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.

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

Jump to bottom

Open

TheNormalnij wants to merge 60 commits into multitheftauto:master

from TheNormalnij:TheNormalnij/model_allocation_server

Open

Allow allocating models server-side #2533

TheNormalnij wants to merge 60 commits into multitheftauto:master from TheNormalnij:TheNormalnij/model_allocation_server

+16,959 −9,220

Conversation

@TheNormalnij

Copy link

Member

@TheNormalnij TheNormalnij commented Jan 30, 2022 •

edited

Loading

Fixes #2427

-- Get all allocated models
table getAllocatedModels([string modelType])
-- Get free id's list
table getFreeModels()
-- Allocate model
bool allocateModelFromParent(number parentId)
-- Unload model, works for custom models
bool unloadModel(nuber modelId)

@TheNormalnij TheNormalnij added the enhancement label

Jan 30, 2022

@TheNormalnij TheNormalnij added this to the Backlog milestone

Jan 30, 2022

@TheNormalnij TheNormalnij self-assigned this

Jan 30, 2022

@github-actions github-actions bot added the stale label

May 1, 2022

@github-actions

Copy link

Contributor

github-actions bot commented May 1, 2022

This draft pull request is stale because it has been open for at least 90 days with no activity. Please continue on your draft pull request or it will be closed in 30 days automatically.

@TheNormalnij


 Some basic progress

@TheNormalnij TheNormalnij force-pushed the TheNormalnij/model_allocation_server branch from efff3b5 to 5698387 Compare

May 10, 2022 21:41

@TheNormalnij

Copy link

Member Author

TheNormalnij commented May 10, 2022

WIP

@TheNormalnij TheNormalnij removed the stale label

May 10, 2022

@TheNormalnij


 Refactor handling, vehicle manager

e4bfd86

@Fernando-A-Rocha Fernando-A-Rocha mentioned this pull request

May 25, 2022

engineRequestModel returns the texture names/elements of its parent ID when requested #2630

Open

1 task

TheNormalnij added 14 commits

May 29, 2022 23:42

@TheNormalnij


 Update vehicle config

dc5bbf6

@TheNormalnij


 Restructure configs

b7be58e

@TheNormalnij


 Merge remote-tracking branch 'mta_main/master' into TheNormalnij/mode...

be0d106

...l_allocation_server

@TheNormalnij


 Fix dependencies

231ca90

@TheNormalnij


 Fix linux build

b83eba2

@TheNormalnij


 Fix client-server packet desync

84cc9e5

@TheNormalnij


 Implement all base lua API

bb32626

@TheNormalnij


 Peds and object, fix getFreeModels

e7a8dfc

@TheNormalnij


 Fix out of limits allocating

2fe28e6

@TheNormalnij


 fix getType

9b244ba

@TheNormalnij


 Fix GetVehicleModel crashes

4f49306

@TheNormalnij


 Handle model conflicts

b1b19c2

@TheNormalnij


 Little refactor

7cc086f

@TheNormalnij


 Backup new configs

8c69d0c

@TheNormalnij TheNormalnij marked this pull request as ready for review

June 12, 2022 20:30

@TheNormalnij

Copy link

Member Author

TheNormalnij commented Jun 13, 2022

Fixes #2571

TheNormalnij added 3 commits

June 13, 2022 18:11

@TheNormalnij


 Change HasDoors check for SetVehicleDoorState

f6a2701

@TheNormalnij


 Remove GetInitialDoorStates hardcoded part

a53f37a

@TheNormalnij


 Merge remote-tracking branch 'mta_main/master' into TheNormalnij/mode...

5a879d8

...l_allocation_server

patrikjuvonen added 7 commits

April 8, 2023 16:26

@patrikjuvonen


 Fix header comments

309f5b1

[ci skip]

@patrikjuvonen


 Fix header comments

5f018f6

[ci skip]

@patrikjuvonen


 Fix header comments

a1a3a5e

[ci skip]

@patrikjuvonen


 Fix header comments

911b091

[ci skip]

@patrikjuvonen


 Fix header comments

04f6f98

[ci skip]

@patrikjuvonen


 Fix header comments

1288dae

[ci skip]

@patrikjuvonen


 Fix header comments

9b534e9

[ci skip]

patrikjuvonen

patrikjuvonen suggested changes

Apr 8, 2023

View reviewed changes

Server/mods/deathmatch/logic/CVehiclesConfig.h Show resolved Hide resolved

Server/mods/deathmatch/logic/CVehiclesConfig.cpp Show resolved Hide resolved

Server/mods/deathmatch/logic/CVehicleColors.h Show resolved Hide resolved

Server/mods/deathmatch/logic/CVehicleColors.cpp Show resolved Hide resolved

Server/mods/deathmatch/logic/CPedConfig.h Show resolved Hide resolved

Server/mods/deathmatch/logic/CPedConfig.cpp Show resolved Hide resolved

Server/mods/deathmatch/logic/CObjectConfig.h Show resolved Hide resolved

Server/mods/deathmatch/logic/CObjectConfig.cpp Show resolved Hide resolved

Server/mods/deathmatch/logic/CHandlingConfig.h Show resolved Hide resolved

Server/mods/deathmatch/logic/CHandlingConfig.cpp Show resolved Hide resolved

@patrikjuvonen patrikjuvonen marked this pull request as draft

April 8, 2023 13:36

@patrikjuvonen patrikjuvonen added the feedback label

Apr 8, 2023

@github-actions github-actions bot added the stale label

Jul 8, 2023

@github-actions

Copy link

Contributor

github-actions bot commented Jul 8, 2023

This draft pull request is stale because it has been open for at least 90 days with no activity. Please continue on your draft pull request or it will be closed in 30 days automatically.

@TheNormalnij


 Merge remote-tracking branch 'mta_main/master' into TheNormalnij/mode...

791dd4c

...l_allocation_server

@TheNormalnij TheNormalnij removed the stale label

Jul 15, 2023

@TheNormalnij


 Fix file headers

ddb35c7

@TheNormalnij TheNormalnij marked this pull request as ready for review

July 15, 2023 16:19

@TheNormalnij TheNormalnij mentioned this pull request

Oct 1, 2023

Door & panel states (damage) not syncing for vehicles with custom model IDs #2571

Open

TheNormalnij added 2 commits

October 9, 2023 17:42

@TheNormalnij


 Merge branch 'master' into TheNormalnij/model_allocation_server

4edb200

@TheNormalnij


 Fix conflicts

4dab556

@TheNormalnij TheNormalnij removed the feedback label

Mar 25, 2024

TracerDS

TracerDS suggested changes

Jun 6, 2024

View reviewed changes

Copy link

Contributor

@TracerDS TracerDS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thats a huge PR, good job so far

Client/game_sa/CModelInfoSA.cpp

eModelInfoType CModelInfoSA::GetModelType()

{

return ((eModelInfoType(*)())m_pInterface->VFTBL->GetModelType)();

return (eModelInfoType)((uint8_t(*)())m_pInterface->VFTBL->GetModelType)();

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change std::uint8_t to uint8_t. Let's stick to C++ headers and namespaces

Copy link

Member Author

@TheNormalnij TheNormalnij Jun 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer uint8_t in all cases. cstdint types are standard these days.
I think std:: for numbers adds too much noise.

Copy link

Contributor

@TracerDS TracerDS Jun 7, 2024 •

edited

Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer uint8_t in all cases. cstdint types are standard these days. I think std:: for numbers adds too much noise.

cstdint doesnt guarantee standard types in the global namespace but does guarantee having them in the std namespace
stdint.h doesnt guarantee standard types in the std namespace but does guarantee having them in the global namespace

If we go with cstdint (as we should) then std:: is required by a C++ standard (unless you do using on them)

In the end, its the matter of preference, right?

Client/mods/deathmatch/logic/CClientModelManager.cpp

CClientModelManager::CClientModelManager() : m_Models(std::make_unique<std::shared_ptr<CClientModel>[]>(g_pGame->GetBaseIDforCOL()))

{

const unsigned int uiMaxModelID = g_pGame->GetBaseIDforCOL();

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

auto or std::uint32_t?

Client/mods/deathmatch/logic/CClientModelManager.cpp

bool CClientModelManager::RemoveClientModel(const int modelId)

{

if (m_Models[modelId] == nullptr)

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (!m_Models[modelId])

Client/mods/deathmatch/logic/CClientModelManager.cpp

int CClientModelManager::GetFirstFreeModelID(void)

{

const unsigned int uiMaxModelID = g_pGame->GetBaseIDforCOL();

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

auto or std::uint32_t?

Client/mods/deathmatch/logic/CClientModelManager.cpp

void CClientModelManager::DeallocateModelsAllocatedByResource(CResource* pResource)

{

const unsigned int uiMaxModelID = g_pGame->GetBaseIDforCOL();

for (unsigned int i = 0; i < uiMaxModelID; i++)

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

auto maybe?

Server/mods/deathmatch/logic/models/CModelVehicle.h

class CModelVehicle : public CModelBase

{

public:

CModelVehicle(uint32_t uiModelID, const SModelVehicleDefs& SModelVehicleDefs);

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::uint32_t instead of uint32_t

Server/mods/deathmatch/logic/models/CModelVehicle.h

Comment on lines +48 to +65

CHandlingEntry* GetVehicleHandling() { return m_pVehicleHandling; };

const CHandlingEntry* GetOriginalHandling() { return &m_modelDef.handling; };

void SetVehicleDefaultHandling(CHandlingEntry& pEntry) { m_modelDef.handling = pEntry; }

void SetVehicleHandling(CHandlingEntry* pEntry) { m_pVehicleHandling = pEntry; };

void SetVehicleHandlingChanged(bool bState) { m_bVehicleHandlingChanged = bState; };

bool HasVehicleHandlingChanged() { return m_bVehicleHandlingChanged; };

void SetVehicleDafaultColors(CVehicleColors colors) { m_modelDef.vehicleColors = colors; };

bool HasDamageModel();

bool HasDoors() { return m_modelDef.bHasDoors; };

bool IsTrailer() { return m_modelDef.eVehicleModelType == eVehicleType::TRAILER; };

const char* GetVehicleName() { return m_modelDef.strVehicleName; };

eVehicleType GetVehicleType() { return m_modelDef.eVehicleModelType; }

uint8_t GetVariantsCount() { return m_modelDef.uiVariantsCount; };

uint8_t GetAttributes() { return m_modelDef.cAttributes; };

uint8_t GetPassengesCount() { return m_modelDef.uiMaxPassengers; };

eVehicleVariationType GetVariationType() { return m_modelDef.eVariationType; };

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove trailing ; from end of the lines, add const to getters, add noexcept if you can

Server/mods/deathmatch/logic/models/CModelVehicle.h

CVehicleColor GetRandomColor() { return m_modelDef.vehicleColors.GetRandomColor(); }

void AddColor(const CVehicleColor& color) { return m_modelDef.vehicleColors.AddColor(color); };

void GetRandomVariation(unsigned char& ucVariant, unsigned char& ucVariant2);

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::uint8_t instead of unsigned char

Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.cpp

uint32_t uiModelsCount = listSimpleAllocatedModels.size();

BitStream.Write(uiModelsCount);

for (auto model : listSimpleAllocatedModels)

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const auto& model

Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.cpp

if (BitStream.Can(eBitStreamVersion::SimpleModelAllocation))

{

uint32_t uiModelsCount = listSimpleAllocatedModels.size();

Copy link

Contributor

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::uint32_t instead of uint32_t

@TracerDS

Copy link

Contributor

TracerDS commented Aug 5, 2024

Any updates?

@Fernando-A-Rocha

Copy link

Contributor

Fernando-A-Rocha commented Sep 1, 2024

Is this a draft?

@YSAFE

Copy link

YSAFE commented Oct 8, 2024

Is it still in progress?

@Fernando-A-Rocha

Copy link

Contributor

Fernando-A-Rocha commented Dec 12, 2024

Directly related to #2251

@Fernando-A-Rocha Fernando-A-Rocha mentioned this pull request

Dec 12, 2024

Enhance Custom Model Support: Remove ID Limitations and Enable User-Defined IDs #3881

Closed

1 task

@botder botder modified the milestones: 1.6.1, Next Release (1.6.2)

Jul 15, 2025

@Nico8340

Copy link

Member

Nico8340 commented Jul 30, 2025

Any updates?

@G-Moris G-Moris mentioned this pull request

Jul 31, 2025

Remove bad vehicle model offset for 1.7 #4324

Merged

Labels

enhancement

7 participants

@TheNormalnij @TracerDS @Fernando-A-Rocha @YSAFE @Nico8340 @patrikjuvonen @botder

Uh oh!

Allow allocating models server-side #2533

Are you sure you want to change the base?

Allow allocating models server-side #2533

Conversation

@TheNormalnij TheNormalnij commented Jan 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 1, 2022

Uh oh!

TheNormalnij commented May 10, 2022

Uh oh!

TheNormalnij commented Jun 13, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jul 8, 2023

Uh oh!

@TracerDS TracerDS left a comment

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TheNormalnij TheNormalnij Jun 7, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

@TracerDS TracerDS Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

TracerDS commented Aug 5, 2024

Uh oh!

Fernando-A-Rocha commented Sep 1, 2024

Uh oh!

YSAFE commented Oct 8, 2024

Uh oh!

Fernando-A-Rocha commented Dec 12, 2024

Uh oh!

Nico8340 commented Jul 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

@TheNormalnij TheNormalnij commented Jan 30, 2022 •

edited

Loading

@TracerDS TracerDS Jun 7, 2024 •

edited

Loading