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

streamline shape asset

Browse source 
shape asset now has the same import "@" as image asset
cut out extra filename parameters that arent needed
refresh hopefully fixed
This commit is contained in:
marauder2k7 2025-06-20 15:58:20 +01:00
parent 542563feaf
commit fd7342668c
15 changed files with 185 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Engine/source/ts/assimp/assimpShapeLoader.cpp
View file

@ -993,6 +993,23 @@ TSShape* assimpLoadShape(const Torque::Path &path)
tss->write(&dtsStream);
}
Torque::Path dsqPath(cachedPath);
dsqPath.setExtension("dsq");
FileStream animOutStream;
for (S32 i = 0; i < tss->sequences.size(); i++)
{
const String& seqName = tss->getName(tss->sequences[i].nameIndex);
Con::printf("Writing DSQ Animation File for sequence '%s'", seqName.c_str());
dsqPath.setFileName(cachedPath.getFileName() + "_" + seqName);
if (animOutStream.open(dsqPath.getFullPath(), Torque::FS::File::Write))
{
tss->exportSequence(&animOutStream, tss->sequences[i], false);
animOutStream.close();
}
}
loader.updateMaterialsScript(path);
}
loader.releaseImport();

17
Engine/source/ts/collada/colladaShapeLoader.cpp
View file

@ -737,6 +737,23 @@ TSShape* loadColladaShape(const Torque::Path &path)
tss->write(&dtsStream);
}
Torque::Path dsqPath(cachedPath);
dsqPath.setExtension("dsq");
FileStream animOutStream;
for (S32 i = 0; i < tss->sequences.size(); i++)
{
const String& seqName = tss->getName(tss->sequences[i].nameIndex);
Con::printf("Writing DSQ Animation File for sequence '%s'", seqName.c_str());
dsqPath.setFileName(cachedPath.getFileName() + "_" + seqName);
if (animOutStream.open(dsqPath.getFullPath(), Torque::FS::File::Write))
{
tss->exportSequence(&animOutStream, tss->sequences[i], false);
animOutStream.close();
}
}
#endif // DAE2DTS_TOOL
// Add collada materials to materials.tscript

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

@ -2138,7 +2138,7 @@ DefineTSShapeConstructorMethod(addSequence, bool,
if (assetType == StringTable->insert("ShapeAsset"))
{
ShapeAsset* asset = AssetDatabase.acquireAsset<ShapeAsset>(assetId);
srcPath = asset->getShapeFilePath();
srcPath = asset->getShapeFile();
AssetDatabase.releaseAsset(assetId);
}
else if (assetType == StringTable->insert("ShapeAnimationAsset"))

2
Engine/source/ts/tsShapeConstruct.h
View file

@ -236,7 +236,7 @@ public:
StringTableEntry getShapePath() const
{
if (mShapeAsset.notNull())
return mShapeAsset->getShapeFilePath();
return mShapeAsset->getShapeFile();
else
return StringTable->EmptyString();
}