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

requirements for postfx

Browse source 
update to handle posteffects with image_asset_refactor
This commit is contained in:
marauder2k7 2025-03-26 14:31:11 +00:00
parent e1a2a6d9f9
commit d86962d1fd
5 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -387,7 +387,7 @@ void ImageAsset::setImageFile(StringTableEntry pImageFile)
if (mLoadedState == Ok) if (mLoadedState == Ok)
Torque::FS::RemoveChangeNotification(mImageFile, this, &ImageAsset::_onFileChanged); Torque::FS::RemoveChangeNotification(mImageFile, this, &ImageAsset::_onFileChanged);
if (String(pImageFile).startsWith("#")) if (String(pImageFile).startsWith("#") || String(pImageFile).startsWith("$"))
{ {
mImageFile = StringTable->insert(pImageFile); mImageFile = StringTable->insert(pImageFile);
mIsNamedTarget = true; mIsNamedTarget = true;

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

@ -677,7 +677,6 @@ public:
void _set##name(StringTableEntry _in, const U32& index){ \ void _set##name(StringTableEntry _in, const U32& index){ \
if(m##name##Asset[index].getAssetId() == _in) \ if(m##name##Asset[index].getAssetId() == _in) \
return; \ return; \
\
if(!AssetDatabase.isDeclaredAsset(_in)) \ if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \ { \
StringTableEntry imageAssetId = StringTable->EmptyString(); \ StringTableEntry imageAssetId = StringTable->EmptyString(); \
@ -687,7 +686,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] == '#')) \
{ \ { \
ImageAsset* privateImage = new ImageAsset(); \ ImageAsset* privateImage = new ImageAsset(); \
privateImage->setImageFile(_in); \ privateImage->setImageFile(_in); \

62
Engine/source/postFx/postEffect.cpp
View file

@ -508,10 +508,6 @@ PostEffect::PostEffect()
dMemset( mTexSizeSC, 0, sizeof( GFXShaderConstHandle* ) * NumTextures ); dMemset( mTexSizeSC, 0, sizeof( GFXShaderConstHandle* ) * NumTextures );
dMemset( mRenderTargetParamsSC, 0, sizeof( GFXShaderConstHandle* ) * NumTextures ); dMemset( mRenderTargetParamsSC, 0, sizeof( GFXShaderConstHandle* ) * NumTextures );
for (U32 i = 0; i < NumTextures; i++)
{
INIT_IMAGEASSET_ARRAY(Texture, PostFxTextureProfile, i);
}
} }
PostEffect::~PostEffect() PostEffect::~PostEffect()
@ -556,7 +552,8 @@ void PostEffect::initPersistFields()
addField( "targetViewport", TYPEID< PFXTargetViewport >(), Offset( mTargetViewport, PostEffect ), addField( "targetViewport", TYPEID< PFXTargetViewport >(), Offset( mTargetViewport, PostEffect ),
"Specifies how the viewport should be set up for a target texture." ); "Specifies how the viewport should be set up for a target texture." );
INITPERSISTFIELD_IMAGEASSET_ARRAY(Texture, NumTextures, PostEffect, "Input textures to this effect ( samplers ).\n" addProtectedField("Texture", TypeImageFilename, Offset(mTextureAsset, PostEffect), _setTextureData, &defaultProtectedGetFn, NumTextures, "Input textures to this effect(samplers).\n", AbstractClassRep::FIELD_HideInInspectors);
INITPERSISTFIELD_IMAGEASSET_ARRAY_REFACTOR(Texture, NumTextures, PostEffect, "Input textures to this effect ( samplers ).\n"
"@see PFXTextureIdentifiers"); "@see PFXTextureIdentifiers");
addField("textureSRGB", TypeBool, Offset(mTexSRGB, PostEffect), NumTextures, addField("textureSRGB", TypeBool, Offset(mTexSRGB, PostEffect), NumTextures,
@ -608,22 +605,24 @@ bool PostEffect::onAdd()
for (S32 i = 0; i < NumTextures; i++) for (S32 i = 0; i < NumTextures; i++)
{ {
mTextureType[i] = NormalTextureType; mTextureType[i] = NormalTextureType;
String texFilename = getTexture(i); if (mTextureAsset[i].notNull()) {
String texFilename = mTextureAsset[i]->getImageFile();
// Skip empty stages or ones with variable or target names. // Skip empty stages or ones with variable or target names.
if (texFilename.isEmpty() || if (texFilename.isEmpty() ||
texFilename[0] == '$' || texFilename[0] == '$' ||
texFilename[0] == '#') texFilename[0] == '#')
continue; continue;
mTextureProfile[i] = (mTexSRGB[i]) ? &PostFxTextureSRGBProfile : &PostFxTextureProfile; mTextureProfile[i] = (mTexSRGB[i]) ? &PostFxTextureSRGBProfile : &PostFxTextureProfile;
_setTexture(texFilename, i); _setTexture(texFilename, i);
}
} }
// Is the target a named target? // Is the target a named target?
if ( mTargetName.isNotEmpty() && mTargetName[0] == '#' ) if ( mTargetName.isNotEmpty() && mTargetName[0] == '#' )
{ {
mNamedTarget.registerWithName( mTargetName.substr( 1 ) ); mNamedTarget.registerWithName(mTargetName.substr(1));
mNamedTarget.getTextureDelegate().bind( this, &PostEffect::_getTargetTexture ); mNamedTarget.getTextureDelegate().bind( this, &PostEffect::_getTargetTexture );
} }
if ( mTargetDepthStencilName.isNotEmpty() && mTargetDepthStencilName[0] == '#' ) if ( mTargetDepthStencilName.isNotEmpty() && mTargetDepthStencilName[0] == '#' )
@ -1136,7 +1135,7 @@ void PostEffect::_setupConstants( const SceneRenderState *state )
void PostEffect::_setupTexture( U32 stage, GFXTexHandle &inputTex, const RectI *inTexViewport ) void PostEffect::_setupTexture( U32 stage, GFXTexHandle &inputTex, const RectI *inTexViewport )
{ {
const String &texFilename = getTexture( stage ); const String &texFilename = mTextureAsset[stage].notNull() ? mTextureAsset[stage]->getImageFile() : "";
GFXTexHandle theTex; GFXTexHandle theTex;
NamedTexTarget *namedTarget = NULL; NamedTexTarget *namedTarget = NULL;
@ -1173,7 +1172,11 @@ void PostEffect::_setupTexture( U32 stage, GFXTexHandle &inputTex, const RectI *
} }
else else
{ {
theTex = mTexture[ stage ]; theTex = mTexture[stage];
if (!theTex && mTextureAsset[stage].notNull())
theTex = mTextureAsset[stage]->getTexture(mTextureProfile[stage]);
if ( theTex ) if ( theTex )
viewport.set( 0, 0, theTex->getWidth(), theTex->getHeight() ); viewport.set( 0, 0, theTex->getWidth(), theTex->getHeight() );
} }
@ -1640,7 +1643,6 @@ void PostEffect::reload()
void PostEffect::setTexture( U32 index, const String &texFilePath ) void PostEffect::setTexture( U32 index, const String &texFilePath )
{ {
// Set the new texture name. // Set the new texture name.
mTextureName[index] = texFilePath;
mTexture[index].free(); mTexture[index].free();
// Skip empty stages or ones with variable or target names. // Skip empty stages or ones with variable or target names.
@ -1651,14 +1653,13 @@ void PostEffect::setTexture( U32 index, const String &texFilePath )
mTextureProfile[index] = (mTexSRGB[index])? &PostFxTextureSRGBProfile : &PostFxTextureProfile; mTextureProfile[index] = (mTexSRGB[index])? &PostFxTextureSRGBProfile : &PostFxTextureProfile;
_setTexture(texFilePath, index); _setTexture(texFilePath, index);
mTexture[index] = mTextureAsset[index]->getTexture(mTextureProfile[index]);
mTextureType[index] = NormalTextureType; mTextureType[index] = NormalTextureType;
} }
void PostEffect::setTexture(U32 index, const GFXTexHandle& texHandle) void PostEffect::setTexture(U32 index, const GFXTexHandle& texHandle)
{ {
// Set the new texture name. // Set the new texture name.
mTextureName[index] = StringTable->EmptyString();
mTexture[index].free(); mTexture[index].free();
// Skip empty stages or ones with variable or target names. // Skip empty stages or ones with variable or target names.
@ -1847,18 +1848,21 @@ void PostEffect::_checkRequirements()
{ {
if (mTextureType[i] == NormalTextureType) if (mTextureType[i] == NormalTextureType)
{ {
const String &texFilename = mTextureName[i]; if (mTextureAsset[i].notNull())
if (texFilename.isNotEmpty() && texFilename[0] == '#')
{ {
NamedTexTarget *namedTarget = NamedTexTarget::find(texFilename.c_str() + 1); const String& texFilename = mTextureAsset[i]->getImageFile();
if (!namedTarget)
{
return;
}
// Grab the macros for shader initialization. if (texFilename.isNotEmpty() && texFilename[0] == '#')
namedTarget->getShaderMacros(&macros); {
NamedTexTarget* namedTarget = NamedTexTarget::find(texFilename.c_str() + 1);
if (!namedTarget)
{
return;
}
// Grab the macros for shader initialization.
namedTarget->getShaderMacros(&macros);
}
} }
} }
} }

6
Engine/source/postFx/postEffect.h
View file

@ -90,9 +90,9 @@ public:
protected: protected:
DECLARE_IMAGEASSET_ARRAY(PostEffect, Texture, NumTextures, onTextureChanged); DECLARE_IMAGEASSET_ARRAY_REFACTOR(PostEffect, Texture, GFXStaticTextureSRGBProfile, NumTextures);
DECLARE_IMAGEASSET_ARRAY_SETGET(PostEffect, Texture); GFXTextureProfile* mTextureProfile[NumTextures];
void onTextureChanged() {} GFXTexHandle mTexture[NumTextures];
bool mTexSRGB[NumTextures]; bool mTexSRGB[NumTextures];

8
Engine/source/postFx/postEffectVis.cpp
View file

@ -103,7 +103,7 @@ void PostEffectVis::open( PostEffect *pfx )
// Only allocate window/bitmaps for input textures that are actually used. // Only allocate window/bitmaps for input textures that are actually used.
if ( i > Target ) if ( i > Target )
{ {
if ( pfx->mTextureName[i-1] == StringTable->EmptyString()) if ( pfx->mTextureAsset[i-1].notNull() && pfx->mTextureAsset[i - 1]->getImageFile() == StringTable->EmptyString())
{ {
window.window[i] = NULL; window.window[i] = NULL;
window.bmp[i] = NULL; window.bmp[i] = NULL;
@ -275,9 +275,9 @@ void PostEffectVis::onPFXProcessed( PostEffect *pfx )
if ( tex ) if ( tex )
dSprintf( caption, 256, "%s[%i] input%i - %s [ %ix%i ]", name, pfx->getId(), i-1, pfx->mTextureName[i-1], tex->getWidth(), tex->getHeight() ); dSprintf( caption, 256, "%s[%i] input%i - %s [ %ix%i ]", name, pfx->getId(), i-1, pfx->mTextureAsset[i - 1].notNull() ? pfx->mTextureAsset[i - 1]->getImageFile() : "", tex->getWidth(), tex->getHeight());
else else
dSprintf( caption, 256, "%s[%i] input%i - %s", name, pfx->getId(), i-1, pfx->mTextureName[i-1] ); dSprintf( caption, 256, "%s[%i] input%i - %s", name, pfx->getId(), i-1, pfx->mTextureAsset[i - 1].notNull() ? pfx->mTextureAsset[i - 1]->getImageFile() : "");
pWinCtrl->setDataField( StringTable->insert("text"), NULL, caption ); pWinCtrl->setDataField( StringTable->insert("text"), NULL, caption );
} }
@ -364,7 +364,7 @@ void PostEffectVis::_setDefaultCaption( VisWindow &vis, U32 texIndex )
else else
dSprintf( name, 256, "%s", pfx->getName() ); dSprintf( name, 256, "%s", pfx->getName() );
dSprintf( caption, 256, "%s[%i] input%i - %s [NOT ENABLED]", name, pfx->getId(), texIndex-1, pfx->mTextureName[texIndex-1] ); dSprintf( caption, 256, "%s[%i] input%i - %s [NOT ENABLED]", name, pfx->getId(), texIndex-1, pfx->mTextureAsset[texIndex - 1].notNull() ? pfx->mTextureAsset[texIndex - 1]->getImageFile() : "");
winCtrl->setDataField( StringTable->insert("text"), NULL, caption ); winCtrl->setDataField( StringTable->insert("text"), NULL, caption );
} }