Allow allocating models server-side #2533

TheNormalnij · 2022-01-30T16:37:12Z

-- 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)

github-actions · 2022-05-01T02:29:39Z

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 · 2022-05-10T21:55:03Z

WIP

…l_allocation_server

TheNormalnij · 2022-06-13T15:08:09Z

Fixes #2571

…l_allocation_server

[ci skip]

Server/mods/deathmatch/logic/CVehiclesConfig.h

Server/mods/deathmatch/logic/CVehiclesConfig.cpp

Server/mods/deathmatch/logic/CVehicleColors.h

Server/mods/deathmatch/logic/CVehicleColors.cpp

Server/mods/deathmatch/logic/CPedConfig.h

Server/mods/deathmatch/logic/CPedConfig.cpp

Server/mods/deathmatch/logic/CObjectConfig.h

Server/mods/deathmatch/logic/CObjectConfig.cpp

Server/mods/deathmatch/logic/CHandlingConfig.h

Server/mods/deathmatch/logic/CHandlingConfig.cpp

github-actions · 2023-07-08T01:54:55Z

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.

…l_allocation_server

TracerDS

Thats a huge PR, good job so far

TracerDS · 2024-06-06T11:24:13Z

Client/game_sa/CModelInfoSA.cpp

@@ -2022,7 +2022,7 @@ void CModelInfoSA::RestoreAllObjectsPropertiesGroups()

 eModelInfoType CModelInfoSA::GetModelType()
 {
-    return ((eModelInfoType(*)())m_pInterface->VFTBL->GetModelType)();
+    return (eModelInfoType)((uint8_t(*)())m_pInterface->VFTBL->GetModelType)();


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

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

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?

TracerDS · 2024-06-06T11:24:31Z

Client/mods/deathmatch/logic/CClientModelManager.cpp

 *  LICENSE:     See LICENSE in the top level directory
 *  FILE:        mods/deathmatch/logic/CClientModelManager.cpp
 *  PURPOSE:     Model manager class
 *
 *****************************************************************************/

 #include "StdInc.h"
+
 CClientModelManager::CClientModelManager() : m_Models(std::make_unique<std::shared_ptr<CClientModel>[]>(g_pGame->GetBaseIDforCOL()))
 {
    const unsigned int uiMaxModelID = g_pGame->GetBaseIDforCOL();


auto or std::uint32_t?

TracerDS · 2024-06-06T11:24:53Z

Client/mods/deathmatch/logic/CClientModelManager.cpp

@@ -57,6 +56,18 @@ bool CClientModelManager::Remove(const std::shared_ptr<CClientModel>& pModel)
    return false;
 }

+bool CClientModelManager::RemoveClientModel(const int modelId)
+{
+    if (m_Models[modelId] == nullptr)


if (!m_Models[modelId])

TracerDS · 2024-06-06T11:25:06Z

Client/mods/deathmatch/logic/CClientModelManager.cpp

+
+    return Remove(modelId);
+}
+
 int CClientModelManager::GetFirstFreeModelID(void)
 {
    const unsigned int uiMaxModelID = g_pGame->GetBaseIDforCOL();


auto or std::uint32_t?

TracerDS · 2024-06-06T11:25:15Z

Client/mods/deathmatch/logic/CClientModelManager.cpp

@@ -124,6 +135,47 @@ void CClientModelManager::DeallocateModelsAllocatedByResource(CResource* pResour
    for (unsigned int i = 0; i < uiMaxModelID; i++)


auto maybe?

TracerDS · 2024-06-06T12:04:20Z

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

+class CModelVehicle : public CModelBase
+{
+public:
+    CModelVehicle(uint32_t uiModelID, const SModelVehicleDefs& SModelVehicleDefs);


std::uint32_t instead of uint32_t

TracerDS · 2024-06-06T12:04:47Z

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

+    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; };


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

TracerDS · 2024-06-06T12:04:59Z

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);


std::uint8_t instead of unsigned char

TracerDS · 2024-06-06T12:05:15Z

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

+        uint32_t uiModelsCount = listSimpleAllocatedModels.size();
+        BitStream.Write(uiModelsCount);
+
+        for (auto model : listSimpleAllocatedModels)


const auto& model

TracerDS · 2024-06-06T12:05:26Z

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

+
+    if (BitStream.Can(eBitStreamVersion::SimpleModelAllocation))
+    {
+        uint32_t uiModelsCount = listSimpleAllocatedModels.size();


std::uint32_t instead of uint32_t

TheNormalnij added the enhancement New feature or request label Jan 30, 2022

TheNormalnij added this to the Backlog milestone Jan 30, 2022

TheNormalnij self-assigned this Jan 30, 2022

github-actions bot added the stale Inactive for over 90 days, to be closed label May 1, 2022

Some basic progress

5698387

TheNormalnij force-pushed the TheNormalnij/model_allocation_server branch from efff3b5 to 5698387 Compare May 10, 2022 21:41

TheNormalnij removed the stale Inactive for over 90 days, to be closed label May 10, 2022

Refactor handling, vehicle manager

e4bfd86

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

Update vehicle config

dc5bbf6

Restructure configs

b7be58e

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

be0d106

…l_allocation_server

Fix dependencies

231ca90

Fix linux build

b83eba2

Fix client-server packet desync

84cc9e5

Implement all base lua API

bb32626

Peds and object, fix getFreeModels

e7a8dfc

Fix out of limits allocating

2fe28e6

fix getType

9b244ba

Fix GetVehicleModel crashes

4f49306

Handle model conflicts

b1b19c2

Little refactor

7cc086f

Backup new configs

8c69d0c

TheNormalnij marked this pull request as ready for review June 12, 2022 20:30

TheNormalnij added 3 commits June 13, 2022 18:11

Change HasDoors check for SetVehicleDoorState

f6a2701

Remove GetInitialDoorStates hardcoded part

a53f37a

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

5a879d8

…l_allocation_server

patrikjuvonen added 16 commits April 8, 2023 15:42

Update CPedConfig.h

edbb2a7

[ci skip]

Update CObjectConfig.h

e63ff7b

[ci skip]

Update CModelVehicle.h

2b60f79

[ci skip]

Update CModelVehicle.h

4e6c087

[ci skip]

Update CModelVehicle.cpp

11ec287

[ci skip]

Update CPlayerJoinCompletePacket.cpp

323970e

[ci skip]

Fix header comments

b2c7172

Fix header comments

e07956c

[ci skip]

Fix header comments

8af33b3

[ci skip]

Fix header comments

309f5b1

[ci skip]

Fix header comments

5f018f6

[ci skip]

Fix header comments

a1a3a5e

[ci skip]

Fix header comments

911b091

[ci skip]

Fix header comments

04f6f98

[ci skip]

Fix header comments

1288dae

[ci skip]

Fix header comments

9b534e9

[ci skip]

patrikjuvonen suggested changes Apr 8, 2023

View reviewed changes

patrikjuvonen marked this pull request as draft April 8, 2023 13:36

patrikjuvonen added the feedback Further information is requested label Apr 8, 2023

github-actions bot added the stale Inactive for over 90 days, to be closed label Jul 8, 2023

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

791dd4c

…l_allocation_server

TheNormalnij removed the stale Inactive for over 90 days, to be closed label Jul 15, 2023

Fix file headers

ddb35c7

TheNormalnij marked this pull request as ready for review July 15, 2023 16:19

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

Merge branch 'master' into TheNormalnij/model_allocation_server

4edb200

Fix conflicts

4dab556

TheNormalnij removed the feedback Further information is requested label Mar 25, 2024

TracerDS suggested changes Jun 6, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow allocating models server-side #2533

Allow allocating models server-side #2533

TheNormalnij commented Jan 30, 2022 •

edited

github-actions bot commented May 1, 2022

TheNormalnij commented May 10, 2022

TheNormalnij commented Jun 13, 2022

github-actions bot commented Jul 8, 2023

TracerDS left a comment

TracerDS Jun 6, 2024

TheNormalnij Jun 7, 2024

TracerDS Jun 7, 2024 •

edited

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

TracerDS Jun 6, 2024

		@@ -124,6 +135,47 @@ void CClientModelManager::DeallocateModelsAllocatedByResource(CResource* pResour
		for (unsigned int i = 0; i < uiMaxModelID; i++)

Allow allocating models server-side #2533

Are you sure you want to change the base?

Allow allocating models server-side #2533

Conversation

TheNormalnij commented Jan 30, 2022 • edited

github-actions bot commented May 1, 2022

TheNormalnij commented May 10, 2022

TheNormalnij commented Jun 13, 2022

github-actions bot commented Jul 8, 2023

TracerDS left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TracerDS Jun 7, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheNormalnij commented Jan 30, 2022 •

edited

TracerDS Jun 7, 2024 •

edited