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

Merge pull request #280 from Areloch/YetMoreMiscAssetFixes

Browse source 
Even more misc asset fixes
This commit is contained in:
Brian Roberts 2020-08-09 14:09:29 -05:00 • committed by GitHub
commit d1a79ae5eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 241 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs
View file

@ -63,7 +63,7 @@ function AssetBrowser::onWake(%this)
AssetBrowser-->previewSlider.setValue(EditorSettings.value("Assets/Browser/previewTileSize", "1.0"));
AssetBrowser.toggleAssetTypeFilter(0);
AssetBrowser-->filterAssetsButton.setEnabled(true);
}
function contentTreeTabBook::onTabSelected(%this, %tabText, %tabIndex)
@ -279,7 +279,11 @@ function AssetBrowser::showDialog( %this, %AssetTypeFilter, %selectCallback, %ta
//visibility filter
if(%AssetTypeFilter !$= "")
{
AssetBrowser.toggleAssetTypeFilter(0);
AssetBrowser-->filterAssetsButton.setEnabled(false);
}
else
{
AssetBrowser-->filterAssetsButton.setEnabled(true);
}
if(%selectCallback $= "")
@ -503,7 +507,7 @@ function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName )
//%previewButton-->AssetPreviewButton.internalName = %this.previewData.assetName@"Border";
//%previewButton-->Button.extent = %previewSize.x + %previewBounds SPC %previewSize.y + 24;
%previewButton.tooltip = %this.previewData.tooltip;
%previewButton.Command = "AssetBrowser.updateSelection( $ThisControl.getParent().assetName, $ThisControl.getParent().moduleName );";
%previewButton.Command = "AssetBrowser.updateSelection( $ThisControl.assetName, $ThisControl.moduleName );";
%previewButton.altCommand = %doubleClickCommand;
//%previewButton-->AssetPreviewButton.icon = %this.previewData.previewImage;
@ -1463,11 +1467,24 @@ function AssetBrowser::doRebuildAssetArray(%this)
}
else
{
//got it.
%assetArray.add( %moduleName, %assetId );
if(%assetType !$= "Folder")
%finalAssetCount++;
if(AssetBrowser.assetTypeFilter !$= "")
{
if(AssetBrowser.assetTypeFilter $= %assetType)
{
%assetArray.add( %moduleName, %assetId );
if(%assetType !$= "Folder")
%finalAssetCount++;
}
}
else
{
//got it.
%assetArray.add( %moduleName, %assetId );
if(%assetType !$= "Folder")
%finalAssetCount++;
}
}
}
}

14
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.cs
View file

@ -11,7 +11,7 @@ function AssetBrowser::prepareImportImageAsset(%this, %assetItem)
}
else
{
%suffixPos = strpos(strlwr(%assetItem.AssetName), strlwr(%assetItem.imageSuffixType), 0);
%suffixPos = strpos(strlwr(%assetItem.AssetName), strlwr(%assetItem.ImageType), 0);
%noSuffixName = getSubStr(%assetItem.AssetName, 0, %suffixPos);
}
@ -280,7 +280,7 @@ function parseImageSuffixes(%assetItem)
%suffixToken = getToken(getAssetImportConfigValue("Images/DiffuseTypeSuffixes", ""), ",;", %sfx);
if(strIsMatchExpr("*"@%suffixToken, %assetItem.AssetName))
{
%assetItem.imageSuffixType = %suffixToken;
%assetItem.ImageType = %suffixToken;
return "diffuse";
}
}
@ -292,7 +292,7 @@ function parseImageSuffixes(%assetItem)
%suffixToken = getToken(getAssetImportConfigValue("Images/NormalTypeSuffixes", ""), ",;", %sfx);
if(strIsMatchExpr("*"@%suffixToken, %assetItem.AssetName))
{
%assetItem.imageSuffixType = %suffixToken;
%assetItem.ImageType = %suffixToken;
return "normal";
}
}
@ -304,7 +304,7 @@ function parseImageSuffixes(%assetItem)
%suffixToken = getToken(getAssetImportConfigValue("Images/RoughnessTypeSuffixes", ""), ",;", %sfx);
if(strIsMatchExpr("*"@%suffixToken, %assetItem.AssetName))
{
%assetItem.imageSuffixType = %suffixToken;
%assetItem.ImageType = %suffixToken;
return "roughness";
}
}
@ -316,7 +316,7 @@ function parseImageSuffixes(%assetItem)
%suffixToken = getToken(getAssetImportConfigValue("Images/AOTypeSuffixes", ""), ",;", %sfx);
if(strIsMatchExpr("*"@%suffixToken, %assetItem.AssetName))
{
%assetItem.imageSuffixType = %suffixToken;
%assetItem.ImageType = %suffixToken;
return "AO";
}
}
@ -328,7 +328,7 @@ function parseImageSuffixes(%assetItem)
%suffixToken = getToken(getAssetImportConfigValue("Images/MetalnessTypeSuffixes", ""), ",;", %sfx);
if(strIsMatchExpr("*"@%suffixToken, %assetItem.AssetName))
{
%assetItem.imageSuffixType = %suffixToken;
%assetItem.ImageType = %suffixToken;
return "metalness";
}
}
@ -340,7 +340,7 @@ function parseImageSuffixes(%assetItem)
%suffixToken = getToken(getAssetImportConfigValue("Images/CompositeTypeSuffixes", ""), ",;", %sfx);
if(strIsMatchExpr("*"@%suffixToken, %assetItem.AssetName))
{
%assetItem.imageSuffixType = %suffixToken;
%assetItem.ImageType = %suffixToken;
return "composite";
}
}

7
Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs
View file

@ -555,6 +555,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
}
%mat.diffuseMap = %newDiffuse;
%mat.diffuseMapAsset = "";
%mat.normalMap = %newNormal;
%mat.pbrConfigMap = %newPBRConfig;
%mat.detailMap = %newDetail;
@ -575,7 +576,11 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
%fileName = %mat.getFileName();
if( %fileName $= "" )
%fileName = "data/terrains/materials.cs";
{
error("TerrainMaterialDlg::saveDirtyMaterial() - terrain material doesn't have a fileName set to save to.");
return;
//%fileName = "data/terrains/materials.cs";
}
ETerrainMaterialPersistMan.setDirty( %mat, %fileName );
}