TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 00:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code duplication prune. should aid in stability

Browse source
This commit is contained in:
AzaezelX 2021-10-03 02:56:26 -05:00
parent 10f2453cee
commit 98a079a797
123 changed files with 632 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/decal/decalData.cpp
View file

@ -76,7 +76,7 @@ ConsoleDocClass( DecalData,
DecalData::DecalData()
{
size = 5;
INIT_MATERIALASSET(Material);
INIT_ASSET(Material);
lifeSpan = 5000;
fadeTime = 1000;
@ -258,7 +258,7 @@ void DecalData::packData( BitStream *stream )
stream->write( lookupName );
stream->write( size );
PACKDATA_MATERIALASSET(Material);
PACKDATA_ASSET(Material);
stream->write( lifeSpan );
stream->write( fadeTime );
@ -287,7 +287,7 @@ void DecalData::unpackData( BitStream *stream )
assignName(lookupName);
stream->read( &size );
UNPACKDATA_MATERIALASSET(Material);
UNPACKDATA_ASSET(Material);
_updateMaterial();
stream->read( &lifeSpan );

4
Engine/source/T3D/decal/decalData.h
View file

@ -78,7 +78,7 @@ class DecalData : public SimDataBlock
F32 fadeEndPixelSize;
DECLARE_MATERIALASSET(DecalData, Material);
DECLARE_MATERIALASSET_SETGET(DecalData, Material);
DECLARE_ASSET_SETGET(DecalData, Material);
/// Material instance for decal.
BaseMatInstance *matInst;
@ -139,4 +139,4 @@ inline SimSet* DecalData::getSet()
return set;
}
#endif // _DECALDATA_H_
#endif // _DECALDATA_H_