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

Re-added prefix handling for named texture lookups for image asset fields

Browse source 
Changed render-out of shape preview images to use png
Added filter against previewCache folder
This commit is contained in:
JeffR 2025-05-28 17:47:23 -05:00
parent 0fa8b97f91
commit 8ed3bab44c
7 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/ImageAsset.h
View file

@ -264,7 +264,7 @@ public:
{ \ { \
imageAssetId = query.mAssetList[0]; \ imageAssetId = query.mAssetList[0]; \
} \ } \
else if(Torque::FS::IsFile(_in)) \ else if(Torque::FS::IsFile(_in) || (_in[0] == '$' || _in[0] == '#')) \
{ \ { \
imageAssetId = ImageAsset::getAssetIdByFilename(_in); \ imageAssetId = ImageAsset::getAssetIdByFilename(_in); \
if (imageAssetId == ImageAsset::smNoImageAssetFallback) \ if (imageAssetId == ImageAsset::smNoImageAssetFallback) \

19
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -626,28 +626,13 @@ const char* ShapeAsset::generateCachedPreviewImage(S32 resolution, String overri
delete imposterCap; delete imposterCap;
delete shape; delete shape;
String dumpPath = String(mFilePath) + "_Preview.dds"; String dumpPath = String(mFilePath) + ".png";
char* returnBuffer = Con::getReturnBuffer(128); char* returnBuffer = Con::getReturnBuffer(128);
dSprintf(returnBuffer, 128, "%s", dumpPath.c_str()); dSprintf(returnBuffer, 128, "%s", dumpPath.c_str());
/*FileStream stream; imposter->writeBitmap("png", dumpPath);
if (stream.open(dumpPath, Torque::FS::File::Write))
destBmp.writeBitmap("png", stream);
stream.close();*/
DDSFile* ddsDest = DDSFile::createDDSFileFromGBitmap(imposter);
ImageUtil::ddsCompress(ddsDest, GFXFormatBC2);
// Finally save the imposters to disk.
FileStream fs;
if (fs.open(returnBuffer, Torque::FS::File::Write))
{
ddsDest->write(fs);
fs.close();
}
delete ddsDest;
delete imposter; delete imposter;
delete imposterNrml; delete imposterNrml;

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

@ -2778,7 +2778,7 @@ function getAssetPreviewImage(%asset)
if(%previewPath $= "") if(%previewPath $= "")
%previewPath = "ToolsModule:unknownImage_image"; %previewPath = "ToolsModule:unknownImage_image";
return %previewPath; return %previewPath;
} }

1
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.tscript
View file

@ -50,6 +50,7 @@ function ImageAsset::generatePreviewImage(%this, %previewButton, %forceRegenerat
} }
%previewFilePath = %previewPath @ %this.assetName @ ".png"; %previewFilePath = %previewPath @ %this.assetName @ ".png";
if(!isFile(%previewFilePath) || (compareFileTimes(%this.getImagePath(), %previewFilePath) == 1)) if(!isFile(%previewFilePath) || (compareFileTimes(%this.getImagePath(), %previewFilePath) == 1))
{ {
%generatePreview = true; %generatePreview = true;

1
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript
View file

@ -67,6 +67,7 @@ function MaterialAsset::buildBrowserElement(%this, %previewData)
%previewImage = getAssetPreviewImage(%this.getAssetId()); %previewImage = getAssetPreviewImage(%this.getAssetId());
%previewData.previewImage = isFile(%previewImage) ? %previewImage : "ToolsModule:genericAssetIcon_image"; %previewData.previewImage = isFile(%previewImage) ? %previewImage : "ToolsModule:genericAssetIcon_image";
%previewData.previewLoaded = false; //this marks it for loading progressively later %previewData.previewLoaded = false; //this marks it for loading progressively later
%previewData.assetName = %this.assetName; %previewData.assetName = %this.assetName;

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript
View file

@ -28,7 +28,7 @@ function ShapeAsset::onDelete(%this)
{ {
//Special handle the cache preview image //Special handle the cache preview image
%module = $CurrentAssetBrowser.dirHandler.getModuleFromAddress(makeRelativePath(filePath(%this.getShapePath()))); %module = $CurrentAssetBrowser.dirHandler.getModuleFromAddress(makeRelativePath(filePath(%this.getShapePath())));
%previewPath = "tools/resources/previewCache/" @ %module.moduleId @ "/" @ %this.assetName @ ".png"; %previewPath = "tools/resources/previewCache/" @ %module.moduleId @ "/" @ %this.assetName @ ".dds";
if(isFile(%previewPath)) if(isFile(%previewPath))
{ {

3
Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript
View file

@ -40,6 +40,9 @@ function directoryHandler::loadFolders(%this, %path, %parentId)
if(%parentName $= "Data" && (%folderName $= "shaderCache" || %folderName $= "cache")) if(%parentName $= "Data" && (%folderName $= "shaderCache" || %folderName $= "cache"))
continue; continue;
if(%folderName $= "previewCache")
continue;
if(%folderName $= ".git") if(%folderName $= ".git")
continue; continue;