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

Standardizes project import copy behavior to validate if we're in-place importing to avoid erroring out needlessly with a new utility function

Browse source 
Fixed wrong variable preventing ImportConfig Editor from refreshing when selecting different configs
Standardized DefaultImportConfig's settings against Legacy Import setting, specifically collision resolution behavior and appending _mat suffix to materials
This commit is contained in:
JeffR 2022-02-25 00:03:33 -06:00
parent da5cb56c83
commit b8b94fdec9
5 changed files with 467 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

648
Templates/BaseGame/game/tools/assetBrowser/assetImportConfigs.xml
View file

@ -1,243 +1,459 @@
<?xml version="1.0" encoding="UTF-8" standalone ="yes"?> <?xml version="1.0" encoding="UTF-8" standalone ="yes"?>
<AssetImportSettings> <AssetImportSettings>
<Group name="DefaultImportConfig"> <Group
<Group name="Animations"> name="DefaultImportConfig">
<Setting name="animFPS">2</Setting> <Group
<Setting name="animTiming">Seconds</Setting> name="Animations">
<Setting name="ImportAnimations">1</Setting> <Setting
<Setting name="SeparateAnimations">1</Setting> name="animFPS">2</Setting>
<Setting
name="animTiming">Seconds</Setting>
<Setting
name="ImportAnimations">1</Setting>
<Setting
name="SeparateAnimations">1</Setting>
</Group> </Group>
<Group name="Collision"> <Group
<Setting name="CollisionMeshPrefix">Col</Setting> name="Collision">
<Setting name="GenCollisionType">CollisionMesh</Setting> <Setting
<Setting name="GenerateCollisions">1</Setting> name="CollisionMeshPrefix">Col</Setting>
<Setting name="GenerateLOSCollisions">1</Setting> <Setting
<Setting name="GenLOSCollisionType">CollisionMesh</Setting> name="GenCollisionType">CollisionMesh</Setting>
<Setting name="LOSCollisionMeshPrefix">LOS</Setting> <Setting
name="GenerateCollisions">1</Setting>
<Setting
name="GenerateLOSCollisions">1</Setting>
<Setting
name="GenLOSCollisionType">CollisionMesh</Setting>
<Setting
name="LOSCollisionMeshPrefix">LOS</Setting>
</Group> </Group>
<Group name="General"> <Group
<Setting name="AddDirectoryPrefixToAssetName">0</Setting> name="General">
<Setting name="AutomaticallyPromptMissingFiles">0</Setting> <Setting
<Setting name="DuplicatAutoResolution">AutoPrune</Setting> name="AddDirectoryPrefixToAssetName">0</Setting>
<Setting name="DuplicateAutoResolution">AutoPrune</Setting> <Setting
<Setting name="PreventImportWithErrors">1</Setting> name="AutomaticallyPromptMissingFiles">0</Setting>
<Setting name="WarningsAsErrors">0</Setting> <Setting
name="DuplicatAutoResolution">AutoPrune</Setting>
<Setting
name="DuplicateAutoResolution">FolderPrefix</Setting>
<Setting
name="PreventImportWithErrors">1</Setting>
<Setting
name="WarningsAsErrors">0</Setting>
</Group> </Group>
<Group name="Images"> <Group
<Setting name="AddedImageSuffix">_image</Setting> name="Images">
<Setting name="AlwaysAddImageSuffix">1</Setting> <Setting
<Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting> name="AddedImageSuffix">_image</Setting>
<Setting name="CompositeTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM,_C</Setting> <Setting
<Setting name="Compressed">1</Setting> name="AlwaysAddImageSuffix">1</Setting>
<Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting> <Setting
<Setting name="GenerateMaterialOnImport">0</Setting> name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
<Setting name="ImageType">N/A</Setting> <Setting
<Setting name="ImportImages">1</Setting> name="CompositeTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM,_C</Setting>
<Setting name="IsHDR">0</Setting> <Setting
<Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC,_M</Setting> name="Compressed">1</Setting>
<Setting name="NormalTypeSuffixes">_NORMAL,_NORM,_N</Setting> <Setting
<Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS,_R</Setting> name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
<Setting name="Scaling">1.0</Setting> <Setting
<Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS,_S</Setting> name="GenerateMaterialOnImport">0</Setting>
<Setting name="TextureFilteringMode">Bilinear</Setting> <Setting
<Setting name="UseMips">1</Setting> name="ImageType">N/A</Setting>
<Setting
name="ImportImages">1</Setting>
<Setting
name="IsHDR">0</Setting>
<Setting
name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC,_M</Setting>
<Setting
name="NormalTypeSuffixes">_NORMAL,_NORM,_N</Setting>
<Setting
name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS,_R</Setting>
<Setting
name="Scaling">1.0</Setting>
<Setting
name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS,_S</Setting>
<Setting
name="TextureFilteringMode">Bilinear</Setting>
<Setting
name="UseMips">1</Setting>
</Group> </Group>
<Group name="Materials"> <Group
<Setting name="AddedMaterialSuffix">_mat</Setting> name="Materials">
<Setting name="AlwaysAddMaterialSuffix">0</Setting> <Setting
<Setting name="CreateComposites">1</Setting> name="AddedMaterialSuffix">_mat</Setting>
<Setting name="CreateORMConfig">1</Setting> <Setting
<Setting name="IgnoreMaterials">DefaultMaterial,ColorEffect*</Setting> name="AlwaysAddMaterialSuffix">1</Setting>
<Setting name="ImportMaterials">1</Setting> <Setting
<Setting name="PopulateMaterialMaps">1</Setting> name="CreateComposites">1</Setting>
<Setting name="UseDiffuseSuffixOnOriginImage">1</Setting> <Setting
<Setting name="UseExistingMaterials">1</Setting> name="CreateORMConfig">1</Setting>
<Setting
name="IgnoreMaterials">DefaultMaterial,ColorEffect*</Setting>
<Setting
name="ImportMaterials">1</Setting>
<Setting
name="PopulateMaterialMaps">1</Setting>
<Setting
name="UseDiffuseSuffixOnOriginImage">1</Setting>
<Setting
name="UseExistingMaterials">1</Setting>
</Group> </Group>
<Group name="Meshes"> <Group
<Setting name="AddedShapeSuffix">_shape</Setting> name="Meshes">
<Setting name="AdjustCenter">0</Setting> <Setting
<Setting name="AdjustFloor">0</Setting> name="AddedShapeSuffix">_shape</Setting>
<Setting name="AlwaysAddShapeSuffix">0</Setting> <Setting
<Setting name="calcTangentSpace">0</Setting> name="AdjustCenter">0</Setting>
<Setting name="CollapseSubmeshes">0</Setting> <Setting
<Setting name="convertLeftHanded">0</Setting> name="AdjustFloor">0</Setting>
<Setting name="DoScaleOverride">0</Setting> <Setting
<Setting name="DoUpAxisOverride">0</Setting> name="AlwaysAddShapeSuffix">0</Setting>
<Setting name="findInstances">0</Setting> <Setting
<Setting name="flipUVCoords">0</Setting> name="calcTangentSpace">0</Setting>
<Setting name="genUVCoords">0</Setting> <Setting
<Setting name="IgnoreNodeScale">0</Setting> name="CollapseSubmeshes">0</Setting>
<Setting name="ImportMesh">1</Setting> <Setting
<Setting name="invertNormals">0</Setting> name="convertLeftHanded">0</Setting>
<Setting name="JoinIdenticalVerts">0</Setting> <Setting
<Setting name="limitBoneWeights">0</Setting> name="DoScaleOverride">0</Setting>
<Setting name="LODType">TrailingNumber</Setting> <Setting
<Setting name="removeRedundantMats">0</Setting> name="DoUpAxisOverride">0</Setting>
<Setting name="reverseWindingOrder">0</Setting> <Setting
<Setting name="ScaleOverride">1</Setting> name="findInstances">0</Setting>
<Setting name="TransformUVs">0</Setting> <Setting
<Setting name="UpAxisOverride">Z_AXIS</Setting> name="flipUVCoords">0</Setting>
<Setting
name="genUVCoords">0</Setting>
<Setting
name="IgnoreNodeScale">0</Setting>
<Setting
name="ImportMesh">1</Setting>
<Setting
name="invertNormals">0</Setting>
<Setting
name="JoinIdenticalVerts">0</Setting>
<Setting
name="limitBoneWeights">0</Setting>
<Setting
name="LODType">TrailingNumber</Setting>
<Setting
name="removeRedundantMats">0</Setting>
<Setting
name="reverseWindingOrder">0</Setting>
<Setting
name="ScaleOverride">1</Setting>
<Setting
name="TransformUVs">0</Setting>
<Setting
name="UpAxisOverride">Z_AXIS</Setting>
</Group> </Group>
<Group name="Sounds"> <Group
<Setting name="Compressed">0</Setting> name="Sounds">
<Setting name="PitchAdjust">1.0</Setting> <Setting
<Setting name="VolumeAdjust">1.0</Setting> name="Compressed">0</Setting>
<Setting
name="PitchAdjust">1.0</Setting>
<Setting
name="VolumeAdjust">1.0</Setting>
</Group> </Group>
</Group> </Group>
<Group name="LegacyProjectImport"> <Group
<Group name="Animations"> name="LegacyProjectImport">
<Setting name="animFPS">2</Setting> <Group
<Setting name="animTiming">Seconds</Setting> name="Animations">
<Setting name="ImportAnimations">1</Setting> <Setting
<Setting name="SeparateAnimations">1</Setting> name="animFPS">2</Setting>
<Setting
name="animTiming">Seconds</Setting>
<Setting
name="ImportAnimations">1</Setting>
<Setting
name="SeparateAnimations">1</Setting>
</Group> </Group>
<Group name="Collision"> <Group
<Setting name="CollisionMeshPrefix">Col</Setting> name="Collision">
<Setting name="GenCollisionType">CollisionMesh</Setting> <Setting
<Setting name="GenerateCollisions">1</Setting> name="CollisionMeshPrefix">Col</Setting>
<Setting name="GenerateLOSCollisions">1</Setting> <Setting
<Setting name="GenLOSCollisionType">CollisionMesh</Setting> name="GenCollisionType">CollisionMesh</Setting>
<Setting name="LOSCollisionMeshPrefix">LOS</Setting> <Setting
name="GenerateCollisions">1</Setting>
<Setting
name="GenerateLOSCollisions">1</Setting>
<Setting
name="GenLOSCollisionType">CollisionMesh</Setting>
<Setting
name="LOSCollisionMeshPrefix">LOS</Setting>
</Group> </Group>
<Group name="General"> <Group
<Setting name="AddDirectoryPrefixToAssetName">0</Setting> name="General">
<Setting name="AutomaticallyPromptMissingFiles">0</Setting> <Setting
<Setting name="DuplicateAutoResolution">FolderPrefix</Setting> name="AddDirectoryPrefixToAssetName">0</Setting>
<Setting name="PreventImportWithErrors">1</Setting> <Setting
<Setting name="WarningsAsErrors">0</Setting> name="AutomaticallyPromptMissingFiles">0</Setting>
<Setting
name="DuplicateAutoResolution">FolderPrefix</Setting>
<Setting
name="PreventImportWithErrors">1</Setting>
<Setting
name="WarningsAsErrors">0</Setting>
</Group> </Group>
<Group name="Images"> <Group
<Setting name="AddedImageSuffix">_image</Setting> name="Images">
<Setting name="AlwaysAddImageSuffix">1</Setting> <Setting
<Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting> name="AddedImageSuffix">_image</Setting>
<Setting name="CompositeTypeSuffixes">_COMP,_COMPOSITE</Setting> <Setting
<Setting name="Compressed">1</Setting> name="AlwaysAddImageSuffix">1</Setting>
<Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting> <Setting
<Setting name="GenerateMaterialOnImport">0</Setting> name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
<Setting name="ImageType">N/A</Setting> <Setting
<Setting name="ImportImages">1</Setting> name="CompositeTypeSuffixes">_COMP,_COMPOSITE</Setting>
<Setting name="IsHDR">0</Setting> <Setting
<Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting> name="Compressed">1</Setting>
<Setting name="NormalTypeSuffixes">_NORMAL,_NORM</Setting> <Setting
<Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting> name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
<Setting name="Scaling">1.0</Setting> <Setting
<Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting> name="GenerateMaterialOnImport">0</Setting>
<Setting name="TextureFilteringMode">Bilinear</Setting> <Setting
<Setting name="UseMips">1</Setting> name="ImageType">N/A</Setting>
<Setting
name="ImportImages">1</Setting>
<Setting
name="IsHDR">0</Setting>
<Setting
name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
<Setting
name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
<Setting
name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
<Setting
name="Scaling">1.0</Setting>
<Setting
name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
<Setting
name="TextureFilteringMode">Bilinear</Setting>
<Setting
name="UseMips">1</Setting>
</Group> </Group>
<Group name="Materials"> <Group
<Setting name="AddedMaterialSuffix">_mat</Setting> name="Materials">
<Setting name="AlwaysAddMaterialSuffix">1</Setting> <Setting
<Setting name="CreateComposites">1</Setting> name="AddedMaterialSuffix">_mat</Setting>
<Setting name="ImportMaterials">1</Setting> <Setting
<Setting name="IgnoreMaterials">DefaultMaterial,ColorEffect*</Setting> name="AlwaysAddMaterialSuffix">1</Setting>
<Setting name="PopulateMaterialMaps">1</Setting> <Setting
<Setting name="UseDiffuseSuffixOnOriginImage">1</Setting> name="CreateComposites">1</Setting>
<Setting name="UseExistingMaterials">1</Setting> <Setting
name="IgnoreMaterials">DefaultMaterial,ColorEffect*</Setting>
<Setting
name="ImportMaterials">1</Setting>
<Setting
name="PopulateMaterialMaps">1</Setting>
<Setting
name="UseDiffuseSuffixOnOriginImage">1</Setting>
<Setting
name="UseExistingMaterials">1</Setting>
</Group> </Group>
<Group name="Meshes"> <Group
<Setting name="AddedShapeSuffix">_shape</Setting> name="Meshes">
<Setting name="AdjustCenter">0</Setting> <Setting
<Setting name="AdjustFloor">0</Setting> name="AddedShapeSuffix">_shape</Setting>
<Setting name="AlwaysAddShapeSuffix">0</Setting> <Setting
<Setting name="calcTangentSpace">0</Setting> name="AdjustCenter">0</Setting>
<Setting name="CollapseSubmeshes">0</Setting> <Setting
<Setting name="convertLeftHanded">0</Setting> name="AdjustFloor">0</Setting>
<Setting name="DoScaleOverride">0</Setting> <Setting
<Setting name="DoUpAxisOverride">0</Setting> name="AlwaysAddShapeSuffix">0</Setting>
<Setting name="findInstances">0</Setting> <Setting
<Setting name="flipUVCoords">0</Setting> name="calcTangentSpace">0</Setting>
<Setting name="genUVCoords">0</Setting> <Setting
<Setting name="IgnoreNodeScale">0</Setting> name="CollapseSubmeshes">0</Setting>
<Setting name="ImportMesh">1</Setting> <Setting
<Setting name="invertNormals">0</Setting> name="convertLeftHanded">0</Setting>
<Setting name="JoinIdenticalVerts">0</Setting> <Setting
<Setting name="limitBoneWeights">0</Setting> name="DoScaleOverride">0</Setting>
<Setting name="LODType">TrailingNumber</Setting> <Setting
<Setting name="removeRedundantMats">0</Setting> name="DoUpAxisOverride">0</Setting>
<Setting name="reverseWindingOrder">0</Setting> <Setting
<Setting name="ScaleOverride">1</Setting> name="findInstances">0</Setting>
<Setting name="TransformUVs">0</Setting> <Setting
<Setting name="UpAxisOverride">Z_AXIS</Setting> name="flipUVCoords">0</Setting>
<Setting
name="genUVCoords">0</Setting>
<Setting
name="IgnoreNodeScale">0</Setting>
<Setting
name="ImportMesh">1</Setting>
<Setting
name="invertNormals">0</Setting>
<Setting
name="JoinIdenticalVerts">0</Setting>
<Setting
name="limitBoneWeights">0</Setting>
<Setting
name="LODType">TrailingNumber</Setting>
<Setting
name="removeRedundantMats">0</Setting>
<Setting
name="reverseWindingOrder">0</Setting>
<Setting
name="ScaleOverride">1</Setting>
<Setting
name="TransformUVs">0</Setting>
<Setting
name="UpAxisOverride">Z_AXIS</Setting>
</Group> </Group>
<Group name="Sounds"> <Group
<Setting name="Compressed">0</Setting> name="Sounds">
<Setting name="PitchAdjust">1.0</Setting> <Setting
<Setting name="VolumeAdjust">1.0</Setting> name="Compressed">0</Setting>
<Setting
name="PitchAdjust">1.0</Setting>
<Setting
name="VolumeAdjust">1.0</Setting>
</Group> </Group>
</Group> </Group>
<Group name="NewTest"> <Group
<Group name="Animations"> name="NewTest">
<Setting name="animFPS">2</Setting> <Group
<Setting name="animTiming">Seconds</Setting> name="Animations">
<Setting name="ImportAnimations">1</Setting> <Setting
<Setting name="SeparateAnimations">1</Setting> name="animFPS">2</Setting>
<Setting
name="animTiming">Seconds</Setting>
<Setting
name="ImportAnimations">1</Setting>
<Setting
name="SeparateAnimations">1</Setting>
</Group> </Group>
<Group name="Collision"> <Group
<Setting name="CollisionMeshPrefix">Col</Setting> name="Collision">
<Setting name="GenCollisionType">CollisionMesh</Setting> <Setting
<Setting name="GenerateCollisions">1</Setting> name="CollisionMeshPrefix">Col</Setting>
<Setting name="GenerateLOSCollisions">1</Setting> <Setting
<Setting name="GenLOSCollisionType">CollisionMesh</Setting> name="GenCollisionType">CollisionMesh</Setting>
<Setting name="LOSCollisionMeshPrefix">LOS</Setting> <Setting
name="GenerateCollisions">1</Setting>
<Setting
name="GenerateLOSCollisions">1</Setting>
<Setting
name="GenLOSCollisionType">CollisionMesh</Setting>
<Setting
name="LOSCollisionMeshPrefix">LOS</Setting>
</Group> </Group>
<Group name="General"> <Group
<Setting name="AddDirectoryPrefixToAssetName">0</Setting> name="General">
<Setting name="AutomaticallyPromptMissingFiles">0</Setting> <Setting
<Setting name="DuplicatAutoResolution">AutoPrune</Setting> name="AddDirectoryPrefixToAssetName">0</Setting>
<Setting name="PreventImportWithErrors">1</Setting> <Setting
<Setting name="WarningsAsErrors">0</Setting> name="AutomaticallyPromptMissingFiles">0</Setting>
<Setting
name="DuplicatAutoResolution">AutoPrune</Setting>
<Setting
name="PreventImportWithErrors">1</Setting>
<Setting
name="WarningsAsErrors">0</Setting>
</Group> </Group>
<Group name="Images"> <Group
<Setting name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting> name="Images">
<Setting name="Compressed">1</Setting> <Setting
<Setting name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting> name="AOTypeSuffixes">_AO,_AMBIENT,_AMBIENTOCCLUSION</Setting>
<Setting name="GenerateMaterialOnImport">1</Setting> <Setting
<Setting name="ImageType">N/A</Setting> name="Compressed">1</Setting>
<Setting name="IsHDR">0</Setting> <Setting
<Setting name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting> name="DiffuseTypeSuffixes">_ALBEDO,_DIFFUSE,_ALB,_DIF,_COLOR,_COL</Setting>
<Setting name="NormalTypeSuffixes">_NORMAL,_NORM</Setting> <Setting
<Setting name="PBRTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM</Setting> name="GenerateMaterialOnImport">1</Setting>
<Setting name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting> <Setting
<Setting name="Scaling">1.0</Setting> name="ImageType">N/A</Setting>
<Setting name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting> <Setting
<Setting name="TextureFilteringMode">Bilinear</Setting> name="IsHDR">0</Setting>
<Setting name="UseMips">1</Setting> <Setting
name="MetalnessTypeSuffixes">_METAL,_MET,_METALNESS,_METALLIC</Setting>
<Setting
name="NormalTypeSuffixes">_NORMAL,_NORM</Setting>
<Setting
name="PBRTypeSuffixes">_COMP,_COMPOSITE,_PBR,-COMP,-COMPOSITE,-PBR,_ORM,-ORM</Setting>
<Setting
name="RoughnessTypeSuffixes">_ROUGH,_ROUGHNESS</Setting>
<Setting
name="Scaling">1.0</Setting>
<Setting
name="SmoothnessTypeSuffixes">_SMOOTH,_SMOOTHNESS</Setting>
<Setting
name="TextureFilteringMode">Bilinear</Setting>
<Setting
name="UseMips">1</Setting>
</Group> </Group>
<Group name="Materials"> <Group
<Setting name="CreateComposites">1</Setting> name="Materials">
<Setting name="ImportMaterials">1</Setting> <Setting
<Setting name="PopulateMaterialMaps">1</Setting> name="CreateComposites">1</Setting>
<Setting name="UseDiffuseSuffixOnOriginImage">1</Setting> <Setting
<Setting name="UseExistingMaterials">1</Setting> name="ImportMaterials">1</Setting>
<Setting
name="PopulateMaterialMaps">1</Setting>
<Setting
name="UseDiffuseSuffixOnOriginImage">1</Setting>
<Setting
name="UseExistingMaterials">1</Setting>
</Group> </Group>
<Group name="Meshes"> <Group
<Setting name="AdjustCenter">0</Setting> name="Meshes">
<Setting name="AdjustFloor">0</Setting> <Setting
<Setting name="calcTangentSpace">0</Setting> name="AdjustCenter">0</Setting>
<Setting name="CollapseSubmeshes">0</Setting> <Setting
<Setting name="convertLeftHanded">0</Setting> name="AdjustFloor">0</Setting>
<Setting name="DoScaleOverride">0</Setting> <Setting
<Setting name="DoUpAxisOverride">0</Setting> name="calcTangentSpace">0</Setting>
<Setting name="findInstances">0</Setting> <Setting
<Setting name="flipUVCoords">0</Setting> name="CollapseSubmeshes">0</Setting>
<Setting name="genUVCoords">0</Setting> <Setting
<Setting name="IgnoreNodeScale">0</Setting> name="convertLeftHanded">0</Setting>
<Setting name="ImportMesh">1</Setting> <Setting
<Setting name="invertNormals">0</Setting> name="DoScaleOverride">0</Setting>
<Setting name="JoinIdenticalVerts">0</Setting> <Setting
<Setting name="limitBoneWeights">0</Setting> name="DoUpAxisOverride">0</Setting>
<Setting name="LODType">TrailingNumber</Setting> <Setting
<Setting name="removeRedundantMats">0</Setting> name="findInstances">0</Setting>
<Setting name="reverseWindingOrder">0</Setting> <Setting
<Setting name="ScaleOverride">1</Setting> name="flipUVCoords">0</Setting>
<Setting name="TransformUVs">0</Setting> <Setting
<Setting name="UpAxisOverride">Z_AXIS</Setting> name="genUVCoords">0</Setting>
<Setting
name="IgnoreNodeScale">0</Setting>
<Setting
name="ImportMesh">1</Setting>
<Setting
name="invertNormals">0</Setting>
<Setting
name="JoinIdenticalVerts">0</Setting>
<Setting
name="limitBoneWeights">0</Setting>
<Setting
name="LODType">TrailingNumber</Setting>
<Setting
name="removeRedundantMats">0</Setting>
<Setting
name="reverseWindingOrder">0</Setting>
<Setting
name="ScaleOverride">1</Setting>
<Setting
name="TransformUVs">0</Setting>
<Setting
name="UpAxisOverride">Z_AXIS</Setting>
</Group> </Group>
<Group name="Sounds"> <Group
<Setting name="Compressed">0</Setting> name="Sounds">
<Setting name="PitchAdjust">1.0</Setting> <Setting
<Setting name="VolumeAdjust">1.0</Setting> name="Compressed">0</Setting>
<Setting
name="PitchAdjust">1.0</Setting>
<Setting
name="VolumeAdjust">1.0</Setting>
</Group> </Group>
</Group> </Group>
</AssetImportSettings> </AssetImportSettings>

4
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -2491,8 +2491,10 @@ function AssetBrowser::autoImportSimpleLooseFiles(%this)
while( %file !$= "" ) while( %file !$= "" )
{ {
if(!strIsMatchExpr("*.asset.taml", %file) && !strIsMatchExpr("*.taml", %file) && !strIsMatchExpr("*.cached.dts", %file)) if(!strIsMatchExpr("*.asset.taml", %file) && !strIsMatchExpr("*.taml", %file) && !strIsMatchExpr("*.cached.dts", %file)
&& !strIsMatchExpr("*.cs", %file) && !strIsMatchExpr("*.tscript", %file) && !strIsMatchExpr("*.module", %file))
{ {
%aq.clear();
%assetsFound = AssetDatabase.findAssetLooseFile(%aq, %file); %assetsFound = AssetDatabase.findAssetLooseFile(%aq, %file);
if(%assetsFound == 0) if(%assetsFound == 0)

6
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript
View file

@ -33,8 +33,8 @@ function AssetImportConfigEditor::apply(%this)
function AssetImportConfigList::onSelect( %this, %id, %text ) function AssetImportConfigList::onSelect( %this, %id, %text )
{ {
ImportOptionsConfigList.clearFields(); AssetImportConfigEditorInspector.clearFields();
ImportOptionsConfigList.setAutoUpdate(false); //we don't want to be updating every time we add a field in here AssetImportConfigEditorInspector.setAutoUpdate(false); //we don't want to be updating every time we add a field in here
%this.currentConfig = %text; %this.currentConfig = %text;
@ -46,7 +46,7 @@ function AssetImportConfigList::onSelect( %this, %id, %text )
%this.populateConfigListByGroup("Animations"); %this.populateConfigListByGroup("Animations");
//%this.populateConfigListByGroup("Collision"); //%this.populateConfigListByGroup("Collision");
ImportOptionsConfigList.update(); AssetImportConfigEditorInspector.update();
} }
function AssetImportConfigList::populateConfigListByGroup(%this, %groupName) function AssetImportConfigList::populateConfigListByGroup(%this, %groupName)

7
Templates/BaseGame/game/tools/projectImporter/importers/pre40/pre40ImporterGuis.tscript
View file

@ -46,12 +46,7 @@ function Pre40ImporterPage0::openPage(%this)
%targetFolder = filePath(%targetFilePath); %targetFolder = filePath(%targetFilePath);
if(!isDirectory(%targetFolder)) if(!copyFileToDestination(%file, %targetFilePath))
{
DirectoryHandler::createFolder(0, %targetFolder);
}
if(!pathCopy(%file, %targetFilePath, false))
{ {
$ProjectImporter::log.add("Legacy Project Importer, failed to copy file: " @ %file @ " to destination: " @ %targetFilePath); $ProjectImporter::log.add("Legacy Project Importer, failed to copy file: " @ %file @ " to destination: " @ %targetFilePath);
continue; continue;

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

@ -373,6 +373,28 @@ function ProjectImportWindow::addImporterPage(%this, %page)
// functions that'll pretty much be used regardless of version being targeted // functions that'll pretty much be used regardless of version being targeted
//============================================================================== //==============================================================================
//============================================================================== //==============================================================================
// Takes a source file and attempts to copy it to the destination path.
// If the paths are the same, we just exit out with a success indicator
//==============================================================================
function copyFileToDestination(%sourceFile, %destinationFile)
{
%fullSourcePath = makeFullPath(%sourceFile);
%fullDestPath = makeFullPath(%destinationFile);
if(!IsDirectory(filePath(%fullDestPath)))
{
DirectoryHandler::createFolder(0, filePath(%fullDestPath));
}
if(%fullSourcePath $= %fullDestPath)
return true; //no need to copy, we're already here!
if(!pathCopy(%fullSourcePath, %fullDestPath, false))
return false;
return true;
}
//==============================================================================
// Runs through the files in the source directory and preprocessing them. // Runs through the files in the source directory and preprocessing them.
// All valid files are added to a list, and script-based files are pre-parsed // All valid files are added to a list, and script-based files are pre-parsed
// so the importer can easily process their contents later // so the importer can easily process their contents later
@ -1436,12 +1458,7 @@ function beginShapeImport()
%destinationPath = %rootFileSectionObject.fileDestination; %destinationPath = %rootFileSectionObject.fileDestination;
if(isFile(%file) && %rootFileSectionObject.isShapeFile == true && %rootFileSectionObject.imported == false) if(isFile(%file) && %rootFileSectionObject.isShapeFile == true && %rootFileSectionObject.imported == false)
{ {
if(!IsDirectory(filePath(%destinationPath))) if(!copyFileToDestination(%file, %destinationPath))
{
DirectoryHandler::createFolder(0, filePath(%destinationPath));
}
if(!pathCopy(%file, %destinationPath, false))
{ {
projectImporterLog("ProjectImporter::beginShapeImport() - failed to copy shape: " @ %file @ projectImporterLog("ProjectImporter::beginShapeImport() - failed to copy shape: " @ %file @
" to destination: " @ %destinationPath); " to destination: " @ %destinationPath);
@ -1502,12 +1519,7 @@ function beginImageImport()
%destinationPath = %rootFileSectionObject.fileDestination; %destinationPath = %rootFileSectionObject.fileDestination;
if(isFile(%file) && %rootFileSectionObject.isImageFile == true && %rootFileSectionObject.imported == false) if(isFile(%file) && %rootFileSectionObject.isImageFile == true && %rootFileSectionObject.imported == false)
{ {
if(!IsDirectory(filePath(%destinationPath))) if(!copyFileToDestination(%file, %destinationPath))
{
DirectoryHandler::createFolder(0, filePath(%destinationPath));
}
if(!pathCopy(%file, %destinationPath, false))
{ {
projectImporterLog("ProjectImporter::beginImageImport() - failed to copy image: " @ %file @ projectImporterLog("ProjectImporter::beginImageImport() - failed to copy image: " @ %file @
" to destination: " @ %destinationPath); " to destination: " @ %destinationPath);
@ -1577,12 +1589,8 @@ function beginTerrainImport()
%fileName = fileName(%file); %fileName = fileName(%file);
%filePath = filePath(%file); %filePath = filePath(%file);
}*/ }*/
if(!IsDirectory(filePath(%destinationPath)))
{
DirectoryHandler::createFolder(0, filePath(%destinationPath));
}
if(!pathCopy(%file, %destinationPath, false)) if(!copyFileToDestination(%file, %destinationPath))
{ {
projectImporterLog("ProjectImporter::beginTerrainImport() - failed to copy terrain: " @ %file @ projectImporterLog("ProjectImporter::beginTerrainImport() - failed to copy terrain: " @ %file @
" to destination: " @ %destinationPath); " to destination: " @ %destinationPath);
@ -1666,12 +1674,8 @@ function beginSoundImport()
%fileName = fileName(%file); %fileName = fileName(%file);
%filePath = filePath(%file); %filePath = filePath(%file);
}*/ }*/
if(!IsDirectory(filePath(%destinationPath)))
{
DirectoryHandler::createFolder(0, filePath(%destinationPath));
}
if(!pathCopy(%file, %destinationPath, false)) if(!copyFileToDestination(%file, %destinationPath))
{ {
projectImporterLog("ProjectImporter::beginSoundImport() - failed to copy sound: " @ %file @ projectImporterLog("ProjectImporter::beginSoundImport() - failed to copy sound: " @ %file @
" to destination: " @ %destinationPath); " to destination: " @ %destinationPath);
@ -1775,7 +1779,7 @@ function beginGUIImport()
//Check if we need to even copy in the first place. If we do, ensure //Check if we need to even copy in the first place. If we do, ensure
//the copy actually worked //the copy actually worked
if((makeRelativePath(%file) !$= %destinationPath) && !pathCopy(%file, %destinationPath, false)) if(!copyFileToDestination(%file, %destinationPath))
{ {
projectImporterLog("ProjectImporter::beginGUIImport() - failed to copy GUI: " @ %file @ projectImporterLog("ProjectImporter::beginGUIImport() - failed to copy GUI: " @ %file @
" to destination: " @ %destinationPath); " to destination: " @ %destinationPath);
@ -1888,12 +1892,7 @@ function beginLevelImport()
%fileBase = fileBase(%destinationPath); %fileBase = fileBase(%destinationPath);
%filePath = filePath(%destinationPath); %filePath = filePath(%destinationPath);
if(!IsDirectory(filePath(%destinationPath))) if(!copyFileToDestination(%file, %destinationPath))
{
DirectoryHandler::createFolder(0, filePath(%destinationPath));
}
if(!pathCopy(%file, %destinationPath, false))
{ {
projectImporterLog("ProjectImporter::beginLevelImport() - failed to copy level: " @ %file @ projectImporterLog("ProjectImporter::beginLevelImport() - failed to copy level: " @ %file @
" to destination: " @ %destinationPath); " to destination: " @ %destinationPath);