TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-28 19:13:47 +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

8
Engine/source/T3D/convexShape.cpp
View file

@ -290,7 +290,7 @@ ConvexShape::ConvexShape()
mSurfaceUVs.clear();
mSurfaceTextures.clear();
INIT_MATERIALASSET(Material);
INIT_ASSET(Material);
}
ConvexShape::~ConvexShape()
@ -528,7 +528,7 @@ U32 ConvexShape::packUpdate( NetConnection *conn, U32 mask, BitStream *stream )
if ( stream->writeFlag( mask & UpdateMask ) )
{
PACK_MATERIALASSET(conn, Material);
PACK_ASSET(conn, Material);
U32 surfCount = mSurfaces.size();
stream->writeInt( surfCount, 32 );
@ -584,7 +584,7 @@ void ConvexShape::unpackUpdate( NetConnection *conn, BitStream *stream )
if ( stream->readFlag() ) // UpdateMask
{
UNPACK_MATERIALASSET(conn, Material);
UNPACK_ASSET(conn, Material);
mSurfaces.clear();
mSurfaceUVs.clear();
@ -2171,4 +2171,4 @@ void ConvexShape::Geometry::generate(const Vector< PlaneF > &planes, const Vecto
}
}
DEF_MATERIALASSET_BINDS(ConvexShape, Material);
DEF_ASSET_BINDS(ConvexShape, Material);