Feature: replace atomic models with clump models #3003

CrosRoad95 · 2023-05-12T16:04:32Z

Goal of this pull request is to make possible to replace atomic models ( model with one submodel ) with clump models ( model with multiple submodels ).
To do this, i created new function that converts model engineConvertAtomicToClumpModel( modelId )
Only "atomic" models can be converted to clumps, otherwise function return false
Probably better solution would be to add function to change model type, but in practice you want "atomic" or "clump" objects, if you want new vehicles, peds models just request new id's.
In my opinion it should be separete function because attempt to put it into engineReplaceModel may lead to a lot of confusions.
Also, i consider another function to get model type, so for example by default: 370 returns "weapon", 404 "vehicle", 3425 "clump", 1337 "atomic".

engineConvertAtomicToClumpModel(1337)
a = createObject(1337, 4, 10, 5)
b = createObject(370, 15, 10, 5) -- don't need to convert to clump because this is model that already is clump
dff = engineLoadDFF ( "nt_windmill.dff" )
txd = engineLoadTXD ( "farmstuff.txd" )
engineImportTXD ( txd, 1337 )
engineImportTXD ( txd, 370 )
engineReplaceModel ( dff, 1337 )
engineReplaceModel ( dff, 370 )

addCommandHandler("restore", function()
  engineRestoreModel ( 1337 )
  engineRestoreModel ( 370 )
end)

before, only last atomic is visible:

after, all (2) atomics are visible:

1337 model on the left, 370 jetpack on the right

This pull request is still in progress, assume there are some memory leaks, i consider if it is important to revert model back to atomic

lopezloo · 2023-05-19T15:13:08Z

i consider if it is important to revert model back to atomic

It must be done on disconnect and engineRestoreModel. Is it already implemented?

Is the new API (engineConvertAtomicToClumpModel) really needed? Couldn't it be done automatically in engineReplaceModel (convert model to clump if specified model has multiple atomics)?

CrosRoad95 · 2023-05-19T15:50:03Z

i consider if it is important to revert model back to atomic

It must be done on disconnect and engineRestoreModel. Is it already implemented?

Is the new API (engineConvertAtomicToClumpModel) really needed? Couldn't it be done automatically in engineReplaceModel (convert model to clump if specified model has multiple atomics)?

it may be a case where people already have had models with multiple atomics/clump models but they didn't know and this change may cause old code to not be fully compatible thats why i added this function.

"engineRestoreModel" is working,
and yea, maybe i should keep track which model has been converted to clump, and on disconnect revert changes

CrosRoad95 · 2023-06-18T07:37:45Z

in ~2 weeks i'm going add functionality where models changes using "engineConvertAtomicToClumpModel(1337)" will be reverted back to atomic when you left the server. if anyone has any objectives, let me know

CrosRoad95 · 2023-06-27T18:43:58Z

Now it works a bit differently, instead of "convert" you change internal type of model, for now only availiable options are "clump" and "atomic", limitation is that you can change from atomic to clump, but not from clump to atomic until you previously set it to clump. I have made it to prevent potential crashes because i'm 100% sure that crash will happen if you convert ped to atomic, atomic to vehicle ect.

engineSetModelInfoType(1337, "clump") -- valid because it was atomic
engineSetModelInfoType(1337, "atomic") -- valid because it originally was "atomic"
engineSetModelInfoType(3425, "atomic") -- invalid because it originally was "clump"
engineSetModelInfoType(370, "clump") -- not supported, throw error because this is "weapon" and for now this conversion is not supported

there's second function "engineGetModelInfoType" that return internal type of model, so for example engineGetModelInfoType(370) is weapon, engineGetModelInfoType(1337) is atomic, engineGetModelInfoType(3425) is clump
now if you leave server, all models are reverted back to atomic if they were changed to clump.
Someone in future can implement support for other type change so for example you will be able to convert clump to atomic ( what is kinda useless )

first you have to change type, then replace it ( or probably restream world when type change )

there are things i, you need to test:

changing custom allocated models
maybe there are streaming issues?
maybe some models after conversion fails?

lopezloo · 2023-06-29T05:22:01Z

I think we should discuss more about possibility of merging this into existing API (engineReplaceModel). It's up to server owners to take care of models. If they have models with multiple atomics then it's their liability.

CrosRoad95 · 2023-07-01T12:53:50Z

I think we should discuss more about possibility of merging this into existing API (engineReplaceModel). It's up to server owners to take care of models. If they have models with multiple atomics then it's their liability.

removed all new lua functions, now if you replace model it get converted to clump automatically, restore will convert model back to atomic if needed, same when you leave the server.
Maybe functions responsible for conversion could be improved but apart of that i think this pr is ready to finish

Pirulax · 2023-07-09T18:09:12Z

What would be the use-case for this though?
Could you provide a few examples?

CrosRoad95 · 2023-07-09T18:12:13Z

mostly for future pull requests, it opens doors to many features.

tederis · 2023-07-25T10:56:50Z

Client/game_sa/CRenderWareSA.cpp

+    return ((void(__cdecl*)(RpAtomic*, int))0x732230)(pRpAtomic, id);
+}
+
+typedef struct


Perhaps it's better not to use C-style struct declaration.

tederis · 2023-07-25T11:26:51Z

Client/mods/deathmatch/logic/CClientModel.cpp

+
+    CModelInfo* pModelInfo = g_pGame->GetModelInfo(m_iModelID, true);
+
+    if (!pModelInfo->IsValid() || m_eModelType != eClientModelType::OBJECT)


GetModelInfo can return nullptr what should be taken into account in this conditional expression.

tederis · 2023-07-25T11:27:26Z

Client/mods/deathmatch/logic/CClientModel.cpp

+{
+    CModelInfo* pModelInfo = g_pGame->GetModelInfo(m_iModelID, true);
+
+    if (!pModelInfo->IsValid() || m_eModelType != eClientModelType::OBJECT)


Client/game_sa/CModelInfoSA.cpp

tederis · 2023-07-25T11:42:52Z

Client/game_sa/CModelInfoSA.cpp

+    m_pInterface->pRwObject = nullptr;
+    ((void(__thiscall*)(CAtomicModelInfoSAInterface * pThis, RpAtomic * pAtomic)) vfbl->SetAtomic)(m_pInterface, pClonedAtomic);
+
+    ppModelInfo[m_dwModelID] = m_pInterface;


The same potential memory leak

Client/game_sa/CModelInfoSA.cpp

…mtasa-blue into feature/clump-models

CrosRoad95 added 6 commits May 11, 2023 19:57

b

0173302

next

c0e3998

first working version

f93bb59

cleanup

59e636d

improvments, cleanup

12d49f7

cleanup

2677719

lopezloo added the enhancement New feature or request label May 12, 2023

cleanup

f279e81

CrosRoad95 marked this pull request as ready for review May 12, 2023 18:37

Merge branch 'master' into feature/clump-models

7952e9b

CrosRoad95 added 2 commits May 19, 2023 17:50

Merge branch 'master' into feature/clump-models

f16fbc4

Merge branch 'master' into feature/clump-models

022140d

CrosRoad95 added 2 commits June 27, 2023 14:53

Merge branch 'master' into feature/clump-models

f83483a

improvments

bd76dea

CrosRoad95 added 5 commits June 29, 2023 16:16

add test function to get atomics count

1ef7796

Merge branch 'master' into feature/clump-models

b6ac5d0

refactor it, improve

144e08b

cleanup

cb5b47a

cleanup

e92a9d8

CrosRoad95 added 3 commits July 4, 2023 16:35

Merge branch 'master' into feature/clump-models

ea38ccf

Merge branch 'master' into feature/clump-models

16d3874

Merge branch 'master' into feature/clump-models

afe3871

tederis reviewed Jul 25, 2023

View reviewed changes

CrosRoad95 added 5 commits July 25, 2023 15:55

Merge branch 'master' into feature/clump-models

4da3cbc

fixes acording to tederis suggestions

52852e9

Merge branch 'master' into feature/clump-models

cddc15e

merge master

b868886

Merge branch 'feature/clump-models' of https://github.com/CrosRoad95/…

1346cb1

…mtasa-blue into feature/clump-models

CrosRoad95 closed this by deleting the head repository Dec 2, 2023

tut001 mentioned this pull request Sep 6, 2024

After the model replacement, the frames are not properly loaded #3699

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: replace atomic models with clump models #3003

Feature: replace atomic models with clump models #3003

CrosRoad95 commented May 12, 2023 •

edited

Loading

lopezloo commented May 19, 2023 •

edited

Loading

CrosRoad95 commented May 19, 2023

CrosRoad95 commented Jun 18, 2023

CrosRoad95 commented Jun 27, 2023

lopezloo commented Jun 29, 2023 •

edited

Loading

CrosRoad95 commented Jul 1, 2023

Pirulax commented Jul 9, 2023

CrosRoad95 commented Jul 9, 2023

tederis Jul 25, 2023

tederis Jul 25, 2023

tederis Jul 25, 2023

tederis Jul 25, 2023


		CModelInfo* pModelInfo = g_pGame->GetModelInfo(m_iModelID, true);

		if (!pModelInfo->IsValid() \|\| m_eModelType != eClientModelType::OBJECT)

Feature: replace atomic models with clump models #3003

Feature: replace atomic models with clump models #3003

Conversation

CrosRoad95 commented May 12, 2023 • edited Loading

lopezloo commented May 19, 2023 • edited Loading

CrosRoad95 commented May 19, 2023

CrosRoad95 commented Jun 18, 2023

CrosRoad95 commented Jun 27, 2023

lopezloo commented Jun 29, 2023 • edited Loading

CrosRoad95 commented Jul 1, 2023

Pirulax commented Jul 9, 2023

CrosRoad95 commented Jul 9, 2023

tederis Jul 25, 2023

Choose a reason for hiding this comment

tederis Jul 25, 2023

Choose a reason for hiding this comment

tederis Jul 25, 2023

Choose a reason for hiding this comment

tederis Jul 25, 2023

Choose a reason for hiding this comment

CrosRoad95 commented May 12, 2023 •

edited

Loading

lopezloo commented May 19, 2023 •

edited

Loading

lopezloo commented Jun 29, 2023 •

edited

Loading