mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-11 00:10:46 +00:00
Fixes various reported issues with the ShapeEd update
- 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:
parent
7a0ae4c7af
commit
e02981c848
9 changed files with 91 additions and 50 deletions
|
|
@ -30,6 +30,7 @@
|
|||
#include "ts/tsMaterialList.h"
|
||||
#include "core/stream/fileStream.h"
|
||||
#include "core/volume.h"
|
||||
#include "assets/assetManager.h"
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -1376,7 +1377,7 @@ bool TSShape::isShapeFileType(Torque::Path filePath)
|
|||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool TSShape::addSequence(const Torque::Path& path, const String& fromSeq,
|
||||
bool TSShape::addSequence(const Torque::Path& path, const String& assetId, const String& fromSeq,
|
||||
const String& name, S32 startFrame, S32 endFrame,
|
||||
bool padRotKeys, bool padTransKeys)
|
||||
{
|
||||
|
|
@ -1810,7 +1811,11 @@ bool TSShape::addSequence(const Torque::Path& path, const String& fromSeq,
|
|||
seq.dirtyFlags |= TSShapeInstance::MatFrameDirty;
|
||||
|
||||
// Store information about how this sequence was created
|
||||
seq.sourceData.from = String::ToString("%s\t%s", path.getFullPath().c_str(), oldName.c_str());
|
||||
String fromData = path.getFullPath();
|
||||
if (assetId.isNotEmpty() && AssetDatabase.isDeclaredAsset(assetId.c_str()))
|
||||
fromData = assetId;
|
||||
|
||||
seq.sourceData.from = String::ToString("%s\t%s", fromData.c_str(), oldName.c_str());
|
||||
seq.sourceData.total = srcSeq->numKeyframes;
|
||||
seq.sourceData.start = startFrame;
|
||||
seq.sourceData.end = endFrame;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue