TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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/examples/renderMeshExample.cpp
View file

@ -59,7 +59,7 @@ RenderMeshExample::RenderMeshExample()
// Set it as a "static" object that casts shadows
mTypeMask |= StaticObjectType | StaticShapeObjectType;
INIT_MATERIALASSET(Material);
INIT_ASSET(Material);
}
RenderMeshExample::~RenderMeshExample()
@ -143,7 +143,7 @@ U32 RenderMeshExample::packUpdate( NetConnection *conn, U32 mask, BitStream *str
// Write out any of the updated editable properties
if (stream->writeFlag(mask & UpdateMask))
{
PACK_MATERIALASSET(conn, Material);
PACK_ASSET(conn, Material);
}
return retMask;
@ -164,7 +164,7 @@ void RenderMeshExample::unpackUpdate(NetConnection *conn, BitStream *stream)
if ( stream->readFlag() ) // UpdateMask
{
UNPACK_MATERIALASSET(conn, Material);
UNPACK_ASSET(conn, Material);
if ( isProperlyAdded() )
updateMaterial();

2
Engine/source/T3D/examples/renderMeshExample.h
View file

@ -74,7 +74,7 @@ class RenderMeshExample : public SceneObject
BaseMatInstance* mMaterialInst;
DECLARE_MATERIALASSET(RenderMeshExample, Material);
DECLARE_MATERIALASSET_NET_SETGET(RenderMeshExample, Material, UpdateMask);
DECLARE_ASSET_NET_SETGET(RenderMeshExample, Material, UpdateMask);
// The GFX vertex and primitive buffers
GFXVertexBufferHandle< VertexType > mVertexBuffer;

6
Engine/source/T3D/examples/renderShapeExample.cpp
View file

@ -145,7 +145,7 @@ U32 RenderShapeExample::packUpdate( NetConnection *conn, U32 mask, BitStream *st
// Write out any of the updated editable properties
if ( stream->writeFlag( mask & UpdateMask ) )
{
PACK_SHAPEASSET(conn, Shape);
PACK_ASSET(conn, Shape);
// Allow the server object a chance to handle a new shape
createShape();
@ -169,7 +169,7 @@ void RenderShapeExample::unpackUpdate(NetConnection *conn, BitStream *stream)
if ( stream->readFlag() ) // UpdateMask
{
UNPACK_SHAPEASSET(conn, Shape);
UNPACK_ASSET(conn, Shape);
if ( isProperlyAdded() )
createShape();
@ -258,4 +258,4 @@ void RenderShapeExample::prepRenderImage( SceneRenderState *state )
// Allow the shape to submit the RenderInst(s) for itself
mShapeInstance->render( rdata );
}
}

2
Engine/source/T3D/examples/renderShapeExample.h
View file

@ -62,7 +62,7 @@ class RenderShapeExample : public SceneObject
// Rendering variables
//--------------------------------------------------------------------------
DECLARE_SHAPEASSET(RenderShapeExample, Shape, onShapeChanged);
DECLARE_SHAPEASSET_SETGET(RenderShapeExample, Shape);
DECLARE_ASSET_SETGET(RenderShapeExample, Shape);
// The actual shape instance
TSShapeInstance* mShapeInstance;