mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +00:00
upconverter tweaks
This commit is contained in:
parent
c2fdb733fa
commit
9af2de3c4b
1 changed files with 14 additions and 44 deletions
|
|
@ -938,13 +938,13 @@ T3Dpre4ProjectImporter::genProcessor("HoverVehicleData", "engineSound engineSoun
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
// Datablocks - Long Lists
|
// Datablocks - Long Lists
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
|
// - RigidShapeData
|
||||||
$rigidEntriesList = "softImpactSound softImpactSoundAsset hardImpactSound hardImpactSoundAsset";
|
$rigidEntriesList = "softImpactSound softImpactSoundAsset hardImpactSound hardImpactSoundAsset";
|
||||||
$rigidEntriesList = $rigidEntriesList SPC "exitingWater exitingWaterAsset impactWaterEasy impactWaterEasyAsset";
|
$rigidEntriesList = $rigidEntriesList SPC "exitingWater exitingWaterAsset impactWaterEasy impactWaterEasyAsset";
|
||||||
$rigidEntriesList = $rigidEntriesList SPC "impactWaterMedium impactWaterMediumAsset impactWaterHard impactWaterHardAsset";
|
$rigidEntriesList = $rigidEntriesList SPC "impactWaterMedium impactWaterMediumAsset impactWaterHard impactWaterHardAsset";
|
||||||
$rigidEntriesList = $rigidEntriesList SPC "waterWakeSound waterWakeSoundAsset";
|
$rigidEntriesList = $rigidEntriesList SPC "waterWakeSound waterWakeSoundAsset";
|
||||||
T3Dpre4ProjectImporter::genProcessor("RigidShapeData",$rigidEntriesList);
|
T3Dpre4ProjectImporter::genProcessor("RigidShapeData",$rigidEntriesList);
|
||||||
|
// - PlayerData
|
||||||
$PlayerEntriesList = "shapeFP shapeFPAsset shapeNameFP shapeFPAsset";
|
$PlayerEntriesList = "shapeFP shapeFPAsset shapeNameFP shapeFPAsset";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "FootSoftSound FootSoftAsset FootHardSound FootHardAsset FootMetalSound FootMetal";
|
$PlayerEntriesList = $PlayerEntriesList SPC "FootSoftSound FootSoftAsset FootHardSound FootHardAsset FootMetalSound FootMetal";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "FootSnowSound FootSnowAsset FootShallowSound FootShallowSplashAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "FootSnowSound FootSnowAsset FootShallowSound FootShallowSplashAsset";
|
||||||
|
|
@ -955,50 +955,21 @@ $PlayerEntriesList = $PlayerEntriesList SPC "impactSoftSound ImpactSoftAsset imp
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "impactMetalSound ImpactMetalAsset impactSnowSound impactSnowAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "impactMetalSound ImpactMetalAsset impactSnowSound impactSnowAsset";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "impactWaterEasy impactWaterEasyAsset impactWaterMedium impactWaterMediumAsset impactWaterHard impactWaterHardAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "impactWaterEasy impactWaterEasyAsset impactWaterMedium impactWaterMediumAsset impactWaterHard impactWaterHardAsset";
|
||||||
$PlayerEntriesList = $PlayerEntriesList SPC "exitingWater ExitWaterAsset";
|
$PlayerEntriesList = $PlayerEntriesList SPC "exitingWater ExitWaterAsset";
|
||||||
|
|
||||||
|
|
||||||
T3Dpre4ProjectImporter::genProcessor("PlayerData", $PlayerEntriesList);
|
T3Dpre4ProjectImporter::genProcessor("PlayerData", $PlayerEntriesList);
|
||||||
|
// - Material
|
||||||
|
$MaterialEntriesList = "baseTex diffuseMapAsset diffuseMap diffuseMapAsset";
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "lightMap lightMapAsset toneMap toneMapAsset";
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "detailTex detailMapAsset detailMap detailMapAsset detailNormalMap detailNormalMapAsset";
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "overlayTex overlayMapAsset overlayMap overlayMapAsset";
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "bumpTex normalMapAsset normalMap normalMapAsset
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "ormConfigMap ormConfigMapAsset roughMap roughMapAsset";
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "aoMap aoMapAsset metalMap metalMapAsset";
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "glowMap glowMapAsset";
|
||||||
|
$MaterialEntriesList = $MaterialEntriesList SPC "customFootstepSound customFootstepSoundAsset customImpactSound customImpactSoundAsset";
|
||||||
|
T3Dpre4ProjectImporter::genProcessor("Material", $MaterialEntriesList);
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
// Materials
|
// Materials
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
//long form of the result of T3Dpre4ProjectImporter::genProcessor since that would result in a rediculously long oneliner
|
|
||||||
function T3Dpre4ProjectImporter::processMaterialLine(%this, %line)
|
|
||||||
{
|
|
||||||
%outLine = processLegacyField(%line, "baseTex", "diffuseMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "diffuseMap", "diffuseMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "lightMap", "lightMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "toneMap", "toneMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "detailTex", "detailMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "detailMap", "detailMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "overlayTex", "overlayMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "overlayMap", "overlayMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "bumpTex", "normalMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "normalMap", "normalMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "ormConfigMap", "ormConfigMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "roughMap", "roughMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "aoMap", "aoMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "metalMap", "metalMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "glowMap", "glowMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
%outLine = processLegacyField(%line, "detailNormalMap", "detailNormalMapAsset");
|
|
||||||
if(%outLine !$= %line) return %outLine;
|
|
||||||
return %line;
|
|
||||||
}
|
|
||||||
|
|
||||||
function T3Dpre4ProjectImporter::processMaterialObject(%this, %file, %objectName)
|
function T3Dpre4ProjectImporter::processMaterialObject(%this, %file, %objectName)
|
||||||
{
|
{
|
||||||
%matAsset = MaterialAsset::getAssetIdByMaterialName(%objectName);
|
%matAsset = MaterialAsset::getAssetIdByMaterialName(%objectName);
|
||||||
|
|
@ -1343,5 +1314,4 @@ function processGuiBitmapButtonCtrlField(%line, %originalFieldName, %newFieldNam
|
||||||
{
|
{
|
||||||
return %line;
|
return %line;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue