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

Merge pull request #731 from Areloch/importerObjectProcessingFix

Browse source 
Fixes some mishandled cases when preprocessing objects and functions for project import
This commit is contained in:
Brian Roberts 2022-02-24 01:50:23 -06:00 • committed by GitHub
commit da5cb56c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/tools/projectImporter/importers/pre40/T3Dpre4ProjectImporter.tscript
View file

@ -1038,6 +1038,12 @@ function T3Dpre4ProjectImporter::processMaterialObject(%this, %fileObject, %obje
%assetScriptPath = %assetDef.getScriptPath(); %assetScriptPath = %assetDef.getScriptPath();
if(fileExt(%assetScriptPath) $= "")
{
//try the default extension
%assetScriptPath = %assetScriptPath @ "." @ $TorqueScriptFileExtension;
}
if(isFile(%assetScriptPath) && isObject(%objectName)) if(isFile(%assetScriptPath) && isObject(%objectName))
{ {
//Regular material in a companion file, so we'll want to write it to the //Regular material in a companion file, so we'll want to write it to the

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

@ -476,7 +476,7 @@ function preprocessImportingFiles()
{ {
%line = $ProjectImporter::fileObject.readLine(); %line = $ProjectImporter::fileObject.readLine();
if(strIsMatchExpr("* new*(*)*", %line)) if(strIsMatchExpr("*new *(*)*", %line))
{ {
%start = strpos(%line, "new "); %start = strpos(%line, "new ");
%end = strpos(%line, "(", %start); %end = strpos(%line, "(", %start);
@ -486,6 +486,14 @@ function preprocessImportingFiles()
%className = getSubStr(%line, %start + 4, %end-%start-4); %className = getSubStr(%line, %start + 4, %end-%start-4);
} }
if(%className $= "")
{
//we clearly have some unusual formatting, potentially a programmatic
//object block creation going on here. so we'll just skip it and move on
%currentFileSectionObject.add(%line);
continue;
}
%nameEnd = strpos(%line, ")", %end); %nameEnd = strpos(%line, ")", %end);
%objectName = getSubStr(%line, %end+1, %nameEnd-%end-1); %objectName = getSubStr(%line, %end+1, %nameEnd-%end-1);
@ -498,6 +506,8 @@ function preprocessImportingFiles()
%objectName = getSubStr(%objectName, 0, %inheritanceSplit); %objectName = getSubStr(%objectName, 0, %inheritanceSplit);
} }
%objectName = trim(%objectName);
%parentFileSectionObject = %currentFileSectionObject; %parentFileSectionObject = %currentFileSectionObject;
%currentFileSectionObject = new ArrayObject(); %currentFileSectionObject = new ArrayObject();
@ -530,7 +540,7 @@ function preprocessImportingFiles()
%insideObjectBlock = true; %insideObjectBlock = true;
} }
} }
else if(strIsMatchExpr("* datablock*(*)*", %line)) else if(strIsMatchExpr("*datablock *(*)*", %line))
{ {
%start = strpos(%line, "datablock "); %start = strpos(%line, "datablock ");
%end = strpos(%line, "(", %start); %end = strpos(%line, "(", %start);
@ -540,6 +550,14 @@ function preprocessImportingFiles()
%className = getSubStr(%line, %start + 10, %end-%start-10); %className = getSubStr(%line, %start + 10, %end-%start-10);
} }
if(%className $= "")
{
//we clearly have some unusual formatting, potentially a programmatic
//object block creation going on here. so we'll just skip it and move on
%currentFileSectionObject.add(%line);
continue;
}
%nameEnd = strpos(%line, ")", %end); %nameEnd = strpos(%line, ")", %end);
%objectName = getSubStr(%line, %end+1, %nameEnd-%end-1); %objectName = getSubStr(%line, %end+1, %nameEnd-%end-1);
@ -552,6 +570,8 @@ function preprocessImportingFiles()
%objectName = getSubStr(%objectName, 0, %inheritanceSplit); %objectName = getSubStr(%objectName, 0, %inheritanceSplit);
} }
%objectName = trim(%objectName);
%parentFileSectionObject = %currentFileSectionObject; %parentFileSectionObject = %currentFileSectionObject;
%currentFileSectionObject = new ArrayObject(); %currentFileSectionObject = new ArrayObject();
@ -584,7 +604,7 @@ function preprocessImportingFiles()
%insideObjectBlock = true; %insideObjectBlock = true;
} }
} }
else if(strIsMatchExpr("* singleton*(*)*", %line)) else if(strIsMatchExpr("*singleton *(*)*", %line))
{ {
%start = strpos(%line, "singleton "); %start = strpos(%line, "singleton ");
%end = strpos(%line, "(", %start); %end = strpos(%line, "(", %start);
@ -594,6 +614,14 @@ function preprocessImportingFiles()
%className = getSubStr(%line, %start + 10, %end-%start-10); %className = getSubStr(%line, %start + 10, %end-%start-10);
} }
if(%className $= "")
{
//we clearly have some unusual formatting, potentially a programmatic
//object block creation going on here. so we'll just skip it and move on
%currentFileSectionObject.add(%line);
continue;
}
%nameEnd = strpos(%line, ")", %end); %nameEnd = strpos(%line, ")", %end);
%objectName = getSubStr(%line, %end+1, %nameEnd-%end-1); %objectName = getSubStr(%line, %end+1, %nameEnd-%end-1);
@ -606,6 +634,8 @@ function preprocessImportingFiles()
%objectName = getSubStr(%objectName, 0, %inheritanceSplit); %objectName = getSubStr(%objectName, 0, %inheritanceSplit);
} }
%objectName = trim(%objectName);
%parentFileSectionObject = %currentFileSectionObject; %parentFileSectionObject = %currentFileSectionObject;
%currentFileSectionObject = new ArrayObject(); %currentFileSectionObject = new ArrayObject();
@ -638,7 +668,7 @@ function preprocessImportingFiles()
%insideObjectBlock = true; %insideObjectBlock = true;
} }
} }
else if(strIsMatchExpr("*function*(*)*", %line)) else if(strIsMatchExpr("*function *(*)*", %line))
{ {
%start = strpos(%line, "function "); %start = strpos(%line, "function ");
%end = strpos(%line, "(", %start); %end = strpos(%line, "(", %start);