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

Fixes various reported issues with the ShapeEd update

Browse source 
- Updates addSequence for the TSShapeConstructor so it can properly understand if it's handed an assetId or not, and if it is, stores that as the source data for use later
- Has the added benefit of ensuring no erroneous double-ups of data causing accidental overwrites when saving the shapeConstructor because it thinks the data 'changed'
- Fixed saving of new added sequences in shape constructor to properly trip whitespace
- Adds ability to manually trigger a ShapeAsset to load the shape data
- Adjusted the logic for getting a shape/animation asset's constructor when adding a new sequence to avoid false reporting of no constructor existing(by manually loading it)
- Fixed formatting on ShapeEd Anim window to properly scale
- Added onWake calls for the ShapeEd select and properties windows to better prep them position/extents-wise so they should behave more consistently
- Fixed issue of Not closing material editor if it was opened via the Edit Selected Material button in the ShapeEd
- Fixed issue of highlighting of material not going away when ShapeEditor is closed
This commit is contained in:
JeffR 2025-10-13 00:07:46 -05:00
parent 7a0ae4c7af
commit e02981c848
9 changed files with 91 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -2147,11 +2147,13 @@ DefineTSShapeConstructorMethod(addSequence, bool,
{
String srcName;
String srcPath(source);
StringTableEntry assetId = StringTable->EmptyString();
SplitSequencePathAndName(srcPath, srcName);
if (AssetDatabase.isDeclaredAsset(srcPath))
{
StringTableEntry assetId = StringTable->insert(srcPath.c_str());
assetId = StringTable->insert(srcPath.c_str());
StringTableEntry assetType = AssetDatabase.getAssetType(assetId);
if (assetType == StringTable->insert("ShapeAsset"))
{
@ -2167,7 +2169,7 @@ DefineTSShapeConstructorMethod(addSequence, bool,
}
}
if (!mShape->addSequence(srcPath, srcName, name, start, end, padRot, padTrans))
if (!mShape->addSequence(srcPath, assetId, srcName, name, start, end, padRot, padTrans))
return false;
ADD_TO_CHANGE_SET();