TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1551 from Azaezel/alpha41/deDupeDsq

Browse source 
dsqs are a  subset of dts data
This commit is contained in:
Brian Roberts 2025-09-14 16:59:31 -05:00 committed by GitHub
parent 50815c1a5a cd5f897e55
commit 5d84b612bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 36 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -993,21 +993,24 @@ 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++)
if (tss->meshes.empty())
{
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))
Torque::Path dsqPath(cachedPath);
dsqPath.setExtension("dsq");
FileStream animOutStream;
for (S32 i = 0; i < tss->sequences.size(); i++)
{
tss->exportSequence(&animOutStream, tss->sequences[i], false);
animOutStream.close();
}
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);

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

@ -737,23 +737,25 @@ 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++)
if (tss->meshes.empty())
{
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))
Torque::Path dsqPath(cachedPath);
dsqPath.setExtension("dsq");
FileStream animOutStream;
for (S32 i = 0; i < tss->sequences.size(); i++)
{
tss->exportSequence(&animOutStream, tss->sequences[i], false);
animOutStream.close();
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/tsShape.h
View file

@ -681,7 +681,7 @@ class TSShape
S32 setDetailSize(S32 oldSize, S32 newSize);
bool removeDetail(S32 size);
bool isShapeFileType(Torque::Path filePath);
static bool isShapeFileType(Torque::Path filePath);
bool addSequence(const Torque::Path& path, const String& fromSeq, const String& name, S32 startFrame, S32 endFrame, bool padRotKeys, bool padTransKeys);
bool removeSequence(const String& name);

19
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shapeAnimation.tscript
View file

@ -11,23 +11,14 @@ function ShapeAnimationAsset::buildBrowserElement(%this, %previewData)
{
%previewData.assetName = %this.animationName;
%previewData.assetPath = %this.scriptFile;
//Lotta prepwork
/*%previewData.doubleClickCommand = %assetDef@".materialDefinitionName.reload(); "
@ "$Tools::materialEditorList = \"\";"
@ "EWorldEditor.clearSelection();"
@ "MaterialEditorGui.currentObject = 0;"
@ "MaterialEditorGui.currentMode = \"asset\";"
@ "MaterialEditorGui.currentMaterial = "@%assetDef@".materialDefinitionName;"
@ "MaterialEditorGui.setActiveMaterial( "@%assetDef@".materialDefinitionName );"
@ "EditorGui.setEditor(MaterialEditorPlugin); "
@ "AssetBrowser.hideDialog();";*/
%previewData.previewImage = "ToolsModule:animationIcon_image";
%previewData.assetFriendlyName = %this.assetName;
%previewData.assetDesc = %this.description;
%previewData.tooltip = %this.friendlyName @ "\n"
@ %this @ "\nShape File path: "
@ %this.getShapePath();
%previewData.tooltip = "Asset Name: " @ %this.assetName @ "\n" @
"Asset Type: Animation Asset\n" @
"Asset Definition ID: " @ %this @ "\n" @
"Animation File path: " @ %this.getAnimationPath();
}