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

Merge branch 'CustomShaderFeatures' of https://github.com/Areloch/Torque3D into development

Browse source
This commit is contained in:
Areloch 2019-05-11 21:53:08 -05:00
commit 741fcaed5a
37 changed files with 1365 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,9 @@ void TSStatic::initPersistFields()
addField( "originSort", TypeBool, Offset( mUseOriginSort, TSStatic ),
"Enables translucent sorting of the TSStatic by its origin instead of the bounds." );
addField("overrideColor", TypeColorF, Offset(mOverrideColor, TSStatic),
"@brief The skin applied to the shape.\n\n");
endGroup("Rendering");
addGroup( "Reflection" );
@ -676,6 +679,12 @@ void TSStatic::prepRenderImage( SceneRenderState* state )
// Acculumation
rdata.setAccuTex(mAccuTex);
//Various arbitrary shader render bits to add
CustomShaderBindingData strudelCSB;
strudelCSB.setFloat4(StringTable->insert("overrideColor"), mOverrideColor);
rdata.addCustomShaderBinding(strudelCSB);
// If we have submesh culling enabled then prepare
// the object space frustum to pass to the shape.
Frustum culler;
@ -852,6 +861,8 @@ U32 TSStatic::packUpdate(NetConnection *con, U32 mask, BitStream *stream)
{
stream->writeRangedU32( reflectorDesc->getId(), DataBlockObjectIdFirst, DataBlockObjectIdLast );
}
stream->write(mOverrideColor);
return retMask;
}
@ -947,6 +958,8 @@ void TSStatic::unpackUpdate(NetConnection *con, BitStream *stream)
cubeDescId = stream->readRangedU32( DataBlockObjectIdFirst, DataBlockObjectIdLast );
}
stream->read(&mOverrideColor);
if ( isProperlyAdded() )
_updateShouldTick();
set_special_typing();