TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Converts all game, gui editor, and system classes to utilize assets

Browse source 
Processed core, tools and default modules to utilize assets
Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption
Removed unneeded MainEditor mockup module
Removed some unused/duplicate image assets from the tools
This commit is contained in:
Areloch 2021-07-19 01:07:08 -05:00
parent 83b0432283
commit 5525f8ecdd
1708 changed files with 19619 additions and 4596 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -505,6 +505,11 @@ PostEffect::PostEffect()
dMemset( mActiveTextureViewport, 0, sizeof( RectI ) * NumTextures );
dMemset( mTexSizeSC, 0, sizeof( GFXShaderConstHandle* ) * NumTextures );
dMemset( mRenderTargetParamsSC, 0, sizeof( GFXShaderConstHandle* ) * NumTextures );
for (U32 i = 0; i < NumTextures; i++)
{
INIT_IMAGEASSET_ARRAY(Texture, i);
}
}
PostEffect::~PostEffect()
@ -548,9 +553,8 @@ void PostEffect::initPersistFields()
addField( "targetViewport", TYPEID< PFXTargetViewport >(), Offset( mTargetViewport, PostEffect ),
"Specifies how the viewport should be set up for a target texture." );
addField( "texture", TypeImageFilename, Offset( mTexFilename, PostEffect ), NumTextures,
"Input textures to this effect ( samplers ).\n"
"@see PFXTextureIdentifiers" );
INITPERSISTFIELD_IMAGEASSET_ARRAY(Texture, NumTextures, PostEffect, "Input textures to this effect ( samplers ).\n"
"@see PFXTextureIdentifiers");
addField("textureSRGB", TypeBool, Offset(mTexSRGB, PostEffect), NumTextures,
"Set input texture to be sRGB");
@ -601,23 +605,6 @@ bool PostEffect::onAdd()
for( S32 i = 0; i < NumTextures; i++ )
{
mTextureType[i] = NormalTextureType;
String texFilename = mTexFilename[i];
// Skip empty stages or ones with variable or target names.
if ( texFilename.isEmpty() ||
texFilename[0] == '$' ||
texFilename[0] == '#' )
continue;
GFXTextureProfile *profile = &PostFxTextureProfile;
if (mTexSRGB[i])
profile = &PostFxTextureSRGBProfile;
// Try to load the texture.
bool success = mTextures[i].set( texFilename, &PostFxTextureProfile, avar( "%s() - (line %d)", __FUNCTION__, __LINE__ ) );
if (!success)
Con::errorf("Invalid Texture for PostEffect (%s), The Texture '%s' does not exist!", this->getName(), texFilename.c_str());
}
// Is the target a named target?
@ -755,25 +742,11 @@ void PostEffect::_setupConstants( const SceneRenderState *state )
mRTSizeSC = mShader->getShaderConstHandle( "$targetSize" );
mOneOverRTSizeSC = mShader->getShaderConstHandle( "$oneOverTargetSize" );
mTexSizeSC[0] = mShader->getShaderConstHandle( "$texSize0" );
mTexSizeSC[1] = mShader->getShaderConstHandle( "$texSize1" );
mTexSizeSC[2] = mShader->getShaderConstHandle( "$texSize2" );
mTexSizeSC[3] = mShader->getShaderConstHandle( "$texSize3" );
mTexSizeSC[4] = mShader->getShaderConstHandle( "$texSize4" );
mTexSizeSC[5] = mShader->getShaderConstHandle( "$texSize5" );
mTexSizeSC[6] = mShader->getShaderConstHandle( "$texSize6" );
mTexSizeSC[7] = mShader->getShaderConstHandle( "$texSize7" );
mRenderTargetParamsSC[0] = mShader->getShaderConstHandle( "$rtParams0" );
mRenderTargetParamsSC[1] = mShader->getShaderConstHandle( "$rtParams1" );
mRenderTargetParamsSC[2] = mShader->getShaderConstHandle( "$rtParams2" );
mRenderTargetParamsSC[3] = mShader->getShaderConstHandle( "$rtParams3" );
mRenderTargetParamsSC[4] = mShader->getShaderConstHandle( "$rtParams4" );
mRenderTargetParamsSC[5] = mShader->getShaderConstHandle( "$rtParams5" );
mRenderTargetParamsSC[6] = mShader->getShaderConstHandle( "$rtParams6" );
mRenderTargetParamsSC[7] = mShader->getShaderConstHandle( "$rtParams7" );
//mViewportSC = shader->getShaderConstHandle( "$viewport" );
for (U32 i = 0; i < NumTextures; i++)
{
mTexSizeSC[i] = mShader->getShaderConstHandle(String::ToString("$texSize%d", i));
mRenderTargetParamsSC[i] = mShader->getShaderConstHandle(String::ToString("$rtParams%d",i));
}
mTargetViewportSC = mShader->getShaderConstHandle( "$targetViewport" );
@ -1139,7 +1112,7 @@ void PostEffect::_setupConstants( const SceneRenderState *state )
void PostEffect::_setupTexture( U32 stage, GFXTexHandle &inputTex, const RectI *inTexViewport )
{
const String &texFilename = mTexFilename[ stage ];
const String &texFilename = mTextureName[ stage ];
GFXTexHandle theTex;
NamedTexTarget *namedTarget = NULL;
@ -1176,7 +1149,7 @@ void PostEffect::_setupTexture( U32 stage, GFXTexHandle &inputTex, const RectI *
}
else
{
theTex = mTextures[ stage ];
theTex = mTexture[ stage ];
if ( theTex )
viewport.set( 0, 0, theTex->getWidth(), theTex->getHeight() );
}
@ -1643,8 +1616,8 @@ void PostEffect::reload()
void PostEffect::setTexture( U32 index, const String &texFilePath )
{
// Set the new texture name.
mTexFilename[index] = texFilePath;
mTextures[index].free();
mTextureName[index] = texFilePath;
mTexture[index].free();
// Skip empty stages or ones with variable or target names.
if ( texFilePath.isEmpty() ||
@ -1652,8 +1625,12 @@ void PostEffect::setTexture( U32 index, const String &texFilePath )
texFilePath[0] == '#' )
return;
GFXTextureProfile* profile = &PostFxTextureProfile;
if (mTexSRGB[index])
profile = &PostFxTextureSRGBProfile;
// Try to load the texture.
mTextures[index].set( texFilePath, &PostFxTextureProfile, avar( "%s() - (line %d)", __FUNCTION__, __LINE__ ) );
mTexture[index].set( texFilePath, profile, avar( "%s() - (line %d)", __FUNCTION__, __LINE__ ) );
mTextureType[index] = NormalTextureType;
}
@ -1661,15 +1638,15 @@ void PostEffect::setTexture( U32 index, const String &texFilePath )
void PostEffect::setTexture(U32 index, const GFXTexHandle& texHandle)
{
// Set the new texture name.
mTexFilename[index] = "";
mTextures[index].free();
mTextureName[index] = "";
mTexture[index].free();
// Skip empty stages or ones with variable or target names.
if (!texHandle.isValid())
return;
// Try to load the texture.
mTextures[index] = texHandle;
mTexture[index] = texHandle;
mTextureType[index] = NormalTextureType;
}
@ -1850,7 +1827,7 @@ void PostEffect::_checkRequirements()
{
if (mTextureType[i] == NormalTextureType)
{
const String &texFilename = mTexFilename[i];
const String &texFilename = mTextureName[i];
if (texFilename.isNotEmpty() && texFilename[0] == '#')
{