mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 14:44:36 +00:00
Reimplements ability to utilize direct file load alongside ImageAsset fields when utilizing the ImageAsset macros
Updates Asset Browser generated preview images to not utilize full assets, but just the preview image files themselves
This commit is contained in:
parent
a43458677a
commit
0fa8b97f91
7 changed files with 56 additions and 130 deletions
|
|
@ -740,7 +740,7 @@ function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName )
|
|||
%previewButton.assetType = %assetType;
|
||||
%previewButton.assetBrowser = %this;
|
||||
|
||||
%previewButton.bitmapAsset = %this.previewData.previewImage;
|
||||
%previewButton.setBitmap(%this.previewData.previewImage);
|
||||
|
||||
%previewButton.profile = "AssetBrowserPreview" @ %previewButton.assetType;
|
||||
%previewButton.tooltip = %this.previewData.tooltip;
|
||||
|
|
@ -789,21 +789,15 @@ function AssetBrowser::doRefresh(%this)
|
|||
|
||||
function AssetBrowser::populatePreviewImages(%this)
|
||||
{
|
||||
if (AssetPreviewArray.count()>0)
|
||||
echo("AssetBrowser::populatePreviewImages() - Previews to generate: " @ AssetPreviewArray.count());
|
||||
|
||||
for(%i=0; %i < AssetPreviewArray.count(); %i++)
|
||||
{
|
||||
%previewButton = AssetPreviewArray.getKey(%i);
|
||||
%assetType = %previewButton.assetType;
|
||||
|
||||
echo(" - Generating preview for asset: " @ %previewButton.moduleName @ ":" @ %previewButton.assetName);
|
||||
|
||||
%this.callAssetTypeFunc(%assetType, "generatePreviewImage", %previewButton.moduleName, %previewButton.assetName, %previewButton);
|
||||
|
||||
AssetPreviewArray.erase(%i);
|
||||
|
||||
echo(" - done, scheduling another pass");
|
||||
|
||||
%this.schedule(32, "populatePreviewImages");
|
||||
return;
|
||||
}
|
||||
|
|
@ -2764,12 +2758,13 @@ function getAssetPreviewImage(%asset)
|
|||
{
|
||||
%moduleName = AssetDatabase.getAssetModule(%asset).ModuleId;
|
||||
%assetName = AssetDatabase.getAssetName(%asset);
|
||||
%previewAssetName = "ToolsModule:" @ %moduleName @ "_" @ %assetName @ "_PreviewImage";
|
||||
if(AssetDatabase.isDeclaredAsset(%previewAssetName))
|
||||
|
||||
%previewPath = "tools/resources/previewCache/" @ %moduleName @ "/";
|
||||
%previewFilePath = %previewPath @ %assetName @ ".png";
|
||||
|
||||
if(isFile(%previewFilePath))
|
||||
{
|
||||
%previewDef = AssetDatabase.acquireAsset(%previewAssetName);
|
||||
%previewPath = %previewDef.getImagePath();
|
||||
AssetDatabase.releaseAsset(%previewAssetName);
|
||||
%previewPath = %previewFilePath;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue