TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1603 from Azaezel/alpha41/assetNetworkFollowup

Browse source 
followup to https://github.com/TorqueGameEngines/Torque3D/pull/1601
This commit is contained in:
Brian Roberts 2025-12-09 21:31:30 -06:00 • committed by GitHub
commit bebce304b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/T3D/assets/assetMacroHelpers.h
View file

@ -140,7 +140,7 @@ DefineEngineMethod(className, set##name, void, (const char* assetName), , assetT
#define PACKDATA_ASSET(name)\ #define PACKDATA_ASSET(name)\
if (stream->writeFlag(m##name##Asset.notNull()))\ if (stream->writeFlag(m##name##Asset.notNull()))\
{\ {\
stream->writeString(m##name##Asset.getAssetId());\ AssetDatabase.packDataAsset(stream, m##name##Asset.getAssetId());\
}\ }\
else if(stream->writeFlag(m##name##Name != StringTable->EmptyString()))\ else if(stream->writeFlag(m##name##Name != StringTable->EmptyString()))\
{\ {\
@ -151,7 +151,7 @@ DefineEngineMethod(className, set##name, void, (const char* assetName), , assetT
#define UNPACKDATA_ASSET(name)\ #define UNPACKDATA_ASSET(name)\
if (stream->readFlag())\ if (stream->readFlag())\
{\ {\
m##name##AssetId = stream->readSTString();\ m##name##AssetId = AssetDatabase.unpackDataAsset(stream);\
_set##name(m##name##AssetId);\ _set##name(m##name##AssetId);\
}\ }\
else if (stream->readFlag())\ else if (stream->readFlag())\
@ -168,8 +168,7 @@ DefineEngineMethod(className, set##name, void, (const char* assetName), , assetT
#define PACK_ASSET(netconn, name)\ #define PACK_ASSET(netconn, name)\
if (stream->writeFlag(m##name##Asset.notNull()))\ if (stream->writeFlag(m##name##Asset.notNull()))\
{\ {\
NetStringHandle assetIdStr = m##name##Asset.getAssetId();\ AssetDatabase.packDataAsset(stream, m##name##Asset.getAssetId());\
netconn->packNetStringHandleU(stream, assetIdStr);\
}\ }\
else if (stream->writeFlag(m##name##Name != StringTable->EmptyString()))\ else if (stream->writeFlag(m##name##Name != StringTable->EmptyString()))\
{\ {\
@ -181,7 +180,7 @@ DefineEngineMethod(className, set##name, void, (const char* assetName), , assetT
#define UNPACK_ASSET(netconn, name)\ #define UNPACK_ASSET(netconn, name)\
if (stream->readFlag())\ if (stream->readFlag())\
{\ {\
m##name##AssetId = StringTable->insert(netconn->unpackNetStringHandleU(stream).getString());\ m##name##AssetId = AssetDatabase.unpackDataAsset(stream);\
_set##name(m##name##AssetId);\ _set##name(m##name##AssetId);\
}\ }\
else if (stream->readFlag())\ else if (stream->readFlag())\