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

layout consistency pass pt 3 - some afx bits, correct malformed shapeimage grouping causing a crash.

Browse source 
-must have addgroup and endgroup
This commit is contained in:
AzaezelX 2023-01-26 20:01:10 -06:00
parent 41cb2e63cf
commit a0bbe0ec18
4 changed files with 81 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Engine/source/afx/ce/afxProjectile.cpp
View file

@ -82,23 +82,23 @@ EndImplementEnumType;
void afxProjectileData::initPersistFields()
{
addField("networking", TypeS8, myOffset(networking),
"...");
addField("launchPosSpec", TypeString, myOffset(launch_pos_spec),
"...");
addField("launchDirBias", TypePoint3F, myOffset(launch_dir_bias),
"...");
addField("ignoreSourceTimeout", TypeBool, myOffset(ignore_src_timeout),
"...");
addField("dynamicCollisionMask", TypeS32, myOffset(dynamicCollisionMask),
"...");
addField("staticCollisionMask", TypeS32, myOffset(staticCollisionMask),
"...");
addField("overrideCollisionMasks", TypeBool, myOffset(override_collision_masks),
"...");
addGroup("Physics");
addField("ignoreSourceTimeout", TypeBool, myOffset(ignore_src_timeout), "...");
addField("dynamicCollisionMask", TypeS32, myOffset(dynamicCollisionMask), "...");
addField("staticCollisionMask", TypeS32, myOffset(staticCollisionMask), "...");
addField("overrideCollisionMasks", TypeBool, myOffset(override_collision_masks), "...");
endGroup("Physics");
addField("launchDirMethod", TYPEID<afxProjectileData::LaunchDirType>(), myOffset(launch_dir_method),
"Possible values: towardPos2Constraint, orientConstraint, or launchDirField.");
addGroup("Physics-Launch");
addField("launchPosSpec", TypeString, myOffset(launch_pos_spec), "...");
addField("launchDirBias", TypePoint3F, myOffset(launch_dir_bias), "...");
addField("launchDirMethod", TYPEID<afxProjectileData::LaunchDirType>(), myOffset(launch_dir_method),
"Possible values: towardPos2Constraint, orientConstraint, or launchDirField.");
endGroup("Physics-Launch");
addGroup("Networking");
addField("networking", TypeS8, myOffset(networking), "...");
endGroup("Networking");
Parent::initPersistFields();
}
@ -368,4 +368,4 @@ void afxProjectile::explode(const Point3F& p, const Point3F& n, const U32 collid
Sim::postEvent(this, new afxProjectileDeleteEvent, Sim::getCurrentTime() + DeleteWaitTime);
}
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

25
Engine/source/afx/ce/afxStaticShape.cpp
View file

@ -70,17 +70,22 @@ afxStaticShapeData::afxStaticShapeData(const afxStaticShapeData& other, bool tem
void afxStaticShapeData::initPersistFields()
{
addField("sequence", TypeString, myOffset(sequence),
addGroup("Animation");
addField("sequence", TypeString, myOffset(sequence),
"An animation sequence in the StaticShape to play.");
addField("ignoreSceneAmbient", TypeBool, myOffset(ignore_scene_amb),
"...");
addField("useCustomSceneAmbient", TypeBool, myOffset(use_custom_scene_amb),
"...");
addField("customSceneAmbient", TypeColorF, myOffset(custom_scene_amb),
"...");
addField("doSpawn", TypeBool, myOffset(do_spawn),
"When true, the StaticShape effect will leave behind the StaticShape object as a "
"permanent part of the scene.");
endGroup("Animation");
addGroup("Rendering");
addField("ignoreSceneAmbient", TypeBool, myOffset(ignore_scene_amb), "...");
addField("useCustomSceneAmbient", TypeBool, myOffset(use_custom_scene_amb), "...");
addField("customSceneAmbient", TypeColorF, myOffset(custom_scene_amb), "...");
endGroup("Rendering");
addGroup("Behaviour");
addField("doSpawn", TypeBool, myOffset(do_spawn),
"When true, the StaticShape effect will leave behind the StaticShape object as a "
"permanent part of the scene.");
endGroup("Behaviour");
Parent::initPersistFields();
}