TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #383 from Azaezel/alpha40_shapeAssetTransmissionFix

Browse source 
get shapeassetID read. TODO: find further flaws and unrem the filter
This commit is contained in:
Brian Roberts 2020-11-27 19:03:44 -06:00 • committed by GitHub
commit 9f802fa23f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/T3D/shapeBase.cpp
View file

@ -803,8 +803,10 @@ void ShapeBaseData::packData(BitStream* stream)
stream->write(shadowSphereAdjust);
stream->writeString(shapeName);
stream->writeString(shapeAsset.getAssetId());
//if (stream->writeFlag(shapeAsset.notNull()))
stream->writeString(shapeAsset.getAssetId());
//else
stream->writeString(shapeName);
stream->writeString(cloakTexName);
if(stream->writeFlag(mass != gShapeBaseDataProto.mass))
@ -882,10 +884,11 @@ void ShapeBaseData::unpackData(BitStream* stream)
stream->read(&shadowProjectionDistance);
stream->read(&shadowSphereAdjust);
shapeName = stream->readSTString();
char buffer[256];
stream->readString(buffer);
//if (stream->readFlag())
shapeAssetId = stream->readSTString();
//else
shapeName = stream->readSTString();
cloakTexName = stream->readSTString();
if(stream->readFlag())