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

Adds handling in project import to process SFXDescriptions and Profiles into assets and remove the redundant OG declarations

Browse source
This commit is contained in:
Areloch 2021-09-05 23:47:11 -05:00
parent 0ca66b99db
commit 6439cb84d4
2 changed files with 89 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

112
Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript
View file

@ -1089,13 +1089,10 @@ function T3Dpre4ProjectImporter::processSFXProfileObject(%this, %file, %objectNa
//Throw a warn that this file's already been claimed and move on
if(%soundAsset !$= "")
{
error("T3Dpre4ProjectImporter::processSFXProfileObject() - attempting to process SFXProfile " @ %objectName
@ " but its filename is already associated to another sound asset.");
return false;
warn("T3Dpre4ProjectImporter::processSFXProfileObject() - attempting to process SFXProfile " @ %objectName
@ " but its filename is already associated to another sound asset. Continuing, but be aware.");
}
//Otherwise, process it into an asset
else
{
%assetName = %objectName;
%moduleName = AssetBrowser.dirHandler.getModuleFromAddress(%soundFilename).ModuleId;
@ -1142,29 +1139,46 @@ function T3Dpre4ProjectImporter::processSFXProfileObject(%this, %file, %objectNa
%asset.isStreaming = %descriptionName.isStreaming;
}
else
{
%objFileFinder = "";
//first check our cache
if(isObject($ProjectImporter::SFXDescriptionCache) &&
$ProjectImporter::SFXDescriptionCache.getIndexFromKey(%descriptionName) !$= "")
{
%key = $ProjectImporter::SFXDescriptionCache.getIndexFromKey(%descriptionName);
%objFileFinder = $ProjectImporter::SFXDescriptionCache.getValue(%key);
}
else
{
%objFileFinder = findObjectInFiles(%descriptionName);
}
if(%objFileFinder !$= "")
{
%valueArray = new ArrayObject();
%valueArray.add("sourceGroup" SPC findObjectField("sourceGroup", %objFileFinder));
%valueArray.add("volume" SPC findObjectField("volume", %objFileFinder));
%valueArray.add("pitch" SPC findObjectField("pitch", %objFileFinder));
%valueArray.add("isLooping" SPC findObjectField("isLooping", %objFileFinder));
%valueArray.add("priority" SPC findObjectField("priority", %objFileFinder));
%valueArray.add("useHardware" SPC findObjectField("useHardware", %objFileFinder));
%valueArray.add("is3D" SPC findObjectField("is3D", %objFileFinder));
%valueArray.add("minDistance" SPC findObjectField("minDistance", %objFileFinder));
%valueArray.add("maxDistance" SPC findObjectField("maxDistance", %objFileFinder));
%valueArray.add("scatterDistance" SPC findObjectField("scatterDistance", %objFileFinder));
%valueArray.add("coneInsideAngle" SPC findObjectField("coneInsideAngle", %objFileFinder));
%valueArray.add("coneOutsideAngle" SPC findObjectField("coneOutsideAngle", %objFileFinder));
%valueArray.add("coneOutsideVolume" SPC findObjectField("coneOutsideVolume", %objFileFinder));
%valueArray.add("rolloffFactor" SPC findObjectField("rolloffFactor", %objFileFinder));
%valueArray.add("isStreaming" SPC findObjectField("isStreaming", %objFileFinder));
%fileObj = getField(%objFileFinder, 0);
%objFileFinder.delete();
%valueArray.add("sourceGroup" SPC findObjectField("sourceGroup", %fileObj));
%valueArray.add("volume" SPC findObjectField("volume", %fileObj));
%valueArray.add("pitch" SPC findObjectField("pitch", %fileObj));
%valueArray.add("isLooping" SPC findObjectField("isLooping", %fileObj));
%valueArray.add("priority" SPC findObjectField("priority", %fileObj));
%valueArray.add("useHardware" SPC findObjectField("useHardware", %fileObj));
%valueArray.add("is3D" SPC findObjectField("is3D", %fileObj));
%valueArray.add("minDistance" SPC findObjectField("minDistance", %fileObj));
%valueArray.add("maxDistance" SPC findObjectField("maxDistance", %fileObj));
%valueArray.add("scatterDistance" SPC findObjectField("scatterDistance", %fileObj));
%valueArray.add("coneInsideAngle" SPC findObjectField("coneInsideAngle", %fileObj));
%valueArray.add("coneOutsideAngle" SPC findObjectField("coneOutsideAngle", %fileObj));
%valueArray.add("coneOutsideVolume" SPC findObjectField("coneOutsideVolume", %fileObj));
%valueArray.add("rolloffFactor" SPC findObjectField("rolloffFactor", %fileObj));
%valueArray.add("isStreaming" SPC findObjectField("isStreaming", %fileObj));
if(isObject($ProjectImporter::SFXDescriptionCache))
{
$ProjectImporter::SFXDescriptionCache.add(%descriptionName, %objFileFinder);
}
for(%v=0; %v < %valueArray.Count(); %v++)
{
@ -1175,6 +1189,8 @@ function T3Dpre4ProjectImporter::processSFXProfileObject(%this, %file, %objectNa
if(%varVal !$= "")
%asset.setFieldValue(%var, %varVal);
}
%valueArray.delete();
}
}
}
@ -1186,51 +1202,31 @@ function T3Dpre4ProjectImporter::processSFXProfileObject(%this, %file, %objectNa
if(!%success)
return false;
}
//Now mark the original SFXProfile for removal from the file as it's redundant
//now that we have the asset def
/*if(%matAsset $= "" || %matAsset $= "Core_Rendering:NoMaterial")
{
%assetName = %objectName;
%moduleName = AssetBrowser.dirHandler.getModuleFromAddress(%file).ModuleId;
%assetPath = filePath(%file) @ "/";
%tamlpath = %assetPath @ %assetName @ ".asset.taml";
if(isFile(%tamlpath))
{
error("T3Dpre4ProjectImporter::processMaterialObject() - Failed to create as taml file already exists: " @ %file);
return false;
}
%asset = new MaterialAsset()
{
AssetName = %assetName;
versionId = 1;
shaderData = "";
materialDefinitionName = %assetName;
scriptFile = fileBase(%file);
};
TamlWrite(%asset, %tamlpath);
%moduleDef = ModuleDatabase.findModule(%moduleName, 1);
%success = AssetDatabase.addDeclaredAsset(%moduleDef, %tamlpath);
if(!%success)
return false;
}*/
$ProjectImporter::ToRemoveObjectList.add(%objectName, %file TAB 0);
return true;
}
function T3Dpre4ProjectImporter::processAudioProfileObject(%this, %file, %objectName)
{
{
return %this.processSFXProfileObject(%file, %objectName);
}
function T3Dpre4ProjectImporter::processSFXDescriptionObject(%this, %file, %objectName)
{
$ProjectImporter::ToRemoveObjectList.add(%objectName, %file TAB 0);
return true;
}
function T3Dpre4ProjectImporter::processAudioDescriptionObject(%this, %file, %objectName)
{
$ProjectImporter::ToRemoveObjectList.add(%objectName, %file TAB 0);
return true;
}
//==============================================================================

38
Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
View file

@ -166,6 +166,16 @@ function ProjectImportWizardPage2::openPage(%this)
$ProjectImporter::importTool.delete();
$ProjectImporter::importTool = new ScriptObject($ProjectImporter::versionMode @ "Importer");
if(isObject($ProjectImporter::SFXDescriptionCache))
$ProjectImporter::SFXDescriptionCache.delete();
$ProjectImporter::SFXDescriptionCache = new ArrayObject();
if(isObject($ProjectImporter::ToRemoveObjectList))
$ProjectImporter::ToRemoveObjectList.delete();
$ProjectImporter::ToRemoveObjectList = new ArrayObject();
}
function ProjectImportWizardPage2::processPage(%this)
@ -312,6 +322,28 @@ function ProjectImportWizardPage6::openPage(%this)
{
$ProjectImporter::importTool.processScriptExtensions();
}
//All good? now go through and wipe any objects flagged in our files for deletion
%objRemovePM = new PersistenceManager();
for(%o = 0; %o < $ProjectImporter::ToRemoveObjectList.count(); %o++)
{
%name = $ProjectImporter::ToRemoveObjectList.getKey(%o);
%file = getField($ProjectImporter::ToRemoveObjectList.getValue(%o),0);
if(%name !$= "" && isFile(%file))
{
if(!isObject(%name))
{
//spoof it
%tmpObj = new SimObject(%name);
%objRemovePM.setDirty(%name, %file);
}
%objRemovePM.removeObjectFromFile(%name, %file);
%tmpObj.delete();
}
}
}
function ProjectImportWizardPage6::processPage(%this)
@ -758,7 +790,7 @@ function findObjectInFiles(%objectName)
if(%objectName $= %objName)
{
return %fileObj;
return %fileObj TAB %file TAB %lineNum;
}
}
else if(strIsMatchExpr("*datablock*(*)*", %line) && strpos(%line, "::") == -1)
@ -770,7 +802,7 @@ function findObjectInFiles(%objectName)
if(%objectName $= %objName)
{
return %fileObj;
return %fileObj TAB %file TAB %lineNum;
}
}
else if(strIsMatchExpr("*singleton*(*)*", %line) && strpos(%line, "::") == -1)
@ -782,7 +814,7 @@ function findObjectInFiles(%objectName)
if(%objectName $= %objName)
{
return %fileObj;
return %fileObj TAB %file TAB %lineNum;
}
}