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

layout consistency pass pt 2 -place shapebase inheriting initpersistfields up top so the child layout appends to the parent

Browse source
This commit is contained in:
AzaezelX 2023-01-24 19:30:09 -06:00
parent f07c8745b2
commit ace18d0246
22 changed files with 162 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -534,9 +534,11 @@ bool ShapeBaseData::_setMass( void* object, const char* index, const char* data
void ShapeBaseData::initPersistFields()
{
addGroup( "Shapes" );
INITPERSISTFIELD_SHAPEASSET(Shape, ShapeBaseData, "The source shape asset.");
addField("computeCRC", TypeBool, Offset(computeCRC, ShapeBaseData),
"If true, verify that the CRC of the client's shape model matches the "
"server's CRC for the shape model when loaded by the client.");
addField("silentBBoxValidation", TypeBool, Offset(silent_bbox_check, ShapeBaseData));
INITPERSISTFIELD_SHAPEASSET(DebrisShape, ShapeBaseData, "The shape asset to use for auto-generated breakups via blowup(). @note may not be functional.");
endGroup( "Shapes" );
@ -614,12 +616,6 @@ void ShapeBaseData::initPersistFields()
"transform and FOV (instead of the default eye transform)." );
endGroup("Camera");
addGroup( "Misc" );
addField( "computeCRC", TypeBool, Offset(computeCRC, ShapeBaseData),
"If true, verify that the CRC of the client's shape model matches the "
"server's CRC for the shape model when loaded by the client." );
endGroup( "Misc" );
addGroup( "Reflection" );
addField( "cubeReflectorDesc", TypeRealString, Offset( cubeDescName, ShapeBaseData ),
"References a ReflectorDesc datablock that defines performance and quality properties for dynamic reflections.\n");
@ -631,6 +627,12 @@ void ShapeBaseData::initPersistFields()
addField("remapTextureTags", TypeString, Offset(remap_txr_tags, ShapeBaseData));
// disallow some field substitutions
onlyKeepClearSubstitutions("debris"); // subs resolving to "~~", or "~0" are OK
onlyKeepClearSubstitutions("explosion");
onlyKeepClearSubstitutions("underwaterExplosion");
Parent::initPersistFields();
addGroup("BL Projected Shadows");
addField("shadowSize", TypeS32, Offset(shadowSize, ShapeBaseData),
"Size of the projected shadow texture (must be power of 2).");
@ -644,11 +646,6 @@ void ShapeBaseData::initPersistFields()
"on the shape bounds but can be adjusted with this field).");
endGroup("BL Projected Shadows");
// disallow some field substitutions
onlyKeepClearSubstitutions("debris"); // subs resolving to "~~", or "~0" are OK
onlyKeepClearSubstitutions("explosion");
onlyKeepClearSubstitutions("underwaterExplosion");
Parent::initPersistFields();
}
DefineEngineMethod( ShapeBaseData, checkDeployPos, bool, ( TransformF txfm ),,