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

Include materialball shape asset info

Browse source 
Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
This commit is contained in:
Areloch 2019-05-25 03:37:18 -05:00
parent 729391eeeb
commit d1308c3aba
105 changed files with 3192 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs
View file

@ -90,17 +90,15 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
%diffuseImageSuffix = ImportAssetWindow.parseImagePathSuffixes(%diffuseImagePath);
if(ImportAssetWindow.activeImportConfig.UseDiffuseSuffixOnOriginImg == 1 && %diffuseImageSuffix $= "")
{
%diffuseToken = getToken(ImportAssetWindow.activeImportConfig.DiffuseTypeSuffixes, ",;", 0);
%diffuseAsset = AssetBrowser.addImportingAsset("Image", %diffuseImagePath, %materialItemId, %filename @ %diffuseToken);
%diffuseAsset = AssetBrowser.addImportingAsset("Image", %diffuseImagePath, %assetItem, %filename @ %diffuseToken);
}
else
{
%diffuseAsset = AssetBrowser.addImportingAsset("Image", %diffuseImagePath, %materialItemId);
%diffuseAsset = AssetBrowser.addImportingAsset("Image", %diffuseImagePath, %assetItem);
}
%assetItem.diffuseImageAsset = %diffuseAsset;
@ -141,7 +139,7 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
if(%targetFilePath !$= "")
{
%normalAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %materialItemId);
%normalAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %assetItem);
%assetItem.normalImageAsset = %normalAsset;
}
}
@ -160,7 +158,7 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
if(%foundFile)
{
%specularAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %materialItemId);
%specularAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %assetItem);
%assetItem.specularImageAsset = %specularAsset;
break;
}
@ -182,7 +180,7 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
if(%foundFile)
{
%metalAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %materialItemId);
%metalAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %assetItem);
%assetItem.metalImageAsset = %metalAsset;
break;
}
@ -204,7 +202,7 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
if(%foundFile)
{
%roughnessAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %materialItemId);
%roughnessAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %assetItem);
%assetItem.roughnessImageAsset = %roughnessAsset;
break;
}
@ -226,7 +224,7 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
if(%foundFile)
{
%smoothnessAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %materialItemId);
%smoothnessAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %assetItem);
%assetItem.SmoothnessImageAsset = %smoothnessAsset;
break;
}
@ -248,7 +246,7 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
if(%foundFile)
{
%AOAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %materialItemId);
%AOAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %assetItem);
%assetItem.AOImageAsset = %AOAsset;
break;
}
@ -270,7 +268,7 @@ function AssetBrowser::prepareImportMaterialAsset(%this, %assetItem)
if(%foundFile)
{
%compositeAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %materialItemId);
%compositeAsset = AssetBrowser.addImportingAsset("Image", %targetFilePath, %assetItem);
%assetItem.compositeImageAsset = %compositeAsset;
break;
}