TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add sanity check for default value results checking when filtering out default values

Browse source 
Add additional utility functions for updating parsed object data in the project importer
Adds logic to find and associate FX materials to their terrainMaterials and adding them to the terrian material asset if found on project importer
This commit is contained in:
JeffR 2022-02-02 01:11:33 -06:00
parent b4e346aa3f
commit 696c2e2eec
4 changed files with 242 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -870,11 +870,8 @@ function findFileInImporting(%checkFile)
//==============================================================================
// Checks if the object in question is defined in any of our pre-scanned list of importing files
//==============================================================================
function findObjectInFiles(%objectName, %arrayObj)
function findObjectInFilesRecurse(%objectName, %arrayObj)
{
if(%arrayObj $= "")
%arrayObj = $ProjectImporter::FileList;
for(%i=0; %i < %arrayObj.count(); %i++)
{
%objectLine = %arrayObj.getKey(%i);
@ -884,7 +881,7 @@ function findObjectInFiles(%objectName, %arrayObj)
return %objectLine;
//If this object isn't it, try recursing any children
%result = findObjectInFiles(%objectName, %objectLine);
%result = findObjectInFilesRecurse(%objectName, %objectLine);
if(%result !$= "")
return %result;
}
@ -893,6 +890,65 @@ function findObjectInFiles(%objectName, %arrayObj)
return "";
}
function findObjectInFiles(%objectName)
{
for(%i=0; %i < $ProjectImporter::FileList.count(); %i++)
{
%objectLine = $ProjectImporter::FileList.getValue(%i);
if(isObject(%objectLine))
{
if(%objectLine.objectName $= %objectName)
return %objectLine;
//If this object isn't it, try recursing any children
%result = findObjectInFilesRecurse(%objectName, %objectLine);
if(%result !$= "")
return %result;
}
}
return "";
}
//==============================================================================
// Checks if the object in question is defined in any of our pre-scanned list of importing files
//==============================================================================
function getObjectsInFilesByClassRecurse(%className, %arrayObj)
{
for(%i=0; %i < %arrayObj.count(); %i++)
{
%objectLine = %arrayObj.getKey(%i);
if(isObject(%objectLine))
{
if(%objectLine.classType $= %className)
$ProjectImporter::queryList = $ProjectImporter::queryList TAB %objectLine;
//If this object isn't it, try recursing any children
getObjectsInFilesByClassRecurse(%className, %objectLine);
}
}
}
function getObjectsInFilesByClass(%className)
{
$ProjectImporter::queryList = "";
for(%i=0; %i < $ProjectImporter::FileList.count(); %i++)
{
%objectLine = $ProjectImporter::FileList.getValue(%i);
if(isObject(%objectLine))
{
if(%objectLine.classType $= %className)
$ProjectImporter::queryList = $ProjectImporter::queryList TAB %objectLine;
//If this object isn't it, try recursing any children
getObjectsInFilesByClassRecurse(%className, %objectLine);
}
}
return ltrim($ProjectImporter::queryList);
}
//==============================================================================
// Takes a filename lacking an extension and then checks common file extensions
// to see if we can find the actual file in question
@ -1110,18 +1166,30 @@ function renameObjectName(%object, %newName)
%objectLine = %object.getKey(%e);
if(!isObject(%objectLine))
{
if(strIsMatchExpr("*singleton*(*)*", %objectLine) &&
strIsMatchExpr("*new*(*)*", %objectLine) &&
if(strIsMatchExpr("*singleton*(*)*", %objectLine) ||
strIsMatchExpr("*new*(*)*", %objectLine) ||
strIsMatchExpr("*datablock*(*)*", %objectLine))
{
%newLine = strreplace(%object.objectName, %newName);
echo("renameObjectName() - lines changed from:");
echo(%objectLine);
echo("to:");
echo(%newLine);
if(%object.objectName $= "")
{
%start = strpos(%objectLine, "(");
%end = strpos(%objectLine, ")", %start);
%preString = getSubStr(%objectLine, 0, %start+1);
%postString = getSubStr(%objectLine, %end);
%renamedString = %preString @ %newName @ %postString;
%newLine = %renamedString;
}
else
{
%newLine = strreplace(%objectLine, %object.objectName, %newName);
}
%object.setKey(%newLine, %e);
%object.objectName = %newName;
}
}
}
@ -1258,6 +1326,28 @@ function setObjectField(%object, %fieldName, %newValue)
}
}
//==============================================================================
// Inserts a new field to an object's block in the preprocessed data
//==============================================================================
function insertObjectLine(%object, %newLine)
{
for(%e=0; %e < %object.count(); %e++)
{
%objectLine = %object.getKey(%e);
if(strIsMatchExpr("*{*", %objectLine) ||
strIsMatchExpr("*singleton*(*)*", %objectLine) ||
strIsMatchExpr("*new*(*)*", %objectLine) ||
strIsMatchExpr("*datablock*(*)*", %objectLine))
{
continue;
}
%object.insert(%newLine, "", %e);
return;
}
}
//==============================================================================
// Takes a string and adds it to the importer's log. Optionally can print the line
// directly to console for debugging purposes