TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy

Browse source
This commit is contained in:
Areloch 2017-06-23 11:36:20 -05:00
parent 8780f83262
commit 25686ed4be
294 changed files with 3894 additions and 2813 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/materials/processedShaderMaterial.cpp
View file

@ -76,6 +76,7 @@ void ShaderConstHandles::init( GFXShader *shader, CustomMaterial* mat /*=NULL*/
mWorldToObjSC = shader->getShaderConstHandle(ShaderGenVars::worldToObj);
mViewToObjSC = shader->getShaderConstHandle(ShaderGenVars::viewToObj);
mCubeTransSC = shader->getShaderConstHandle(ShaderGenVars::cubeTrans);
mCubeMipsSC = shader->getShaderConstHandle(ShaderGenVars::cubeMips);
mObjTransSC = shader->getShaderConstHandle(ShaderGenVars::objTrans);
mCubeEyePosSC = shader->getShaderConstHandle(ShaderGenVars::cubeEyePos);
mEyePosSC = shader->getShaderConstHandle(ShaderGenVars::eyePos);
@ -270,7 +271,7 @@ U32 ProcessedShaderMaterial::getNumStages()
// If this stage has diffuse color, it's active
if ( mMaterial->mDiffuse[i].alpha > 0 &&
mMaterial->mDiffuse[i] != ColorF::WHITE )
mMaterial->mDiffuse[i] != LinearColorF::WHITE )
stageActive = true;
// If we have a Material that is vertex lit
@ -394,9 +395,12 @@ void ProcessedShaderMaterial::_determineFeatures( U32 stageNum,
if ( fd.features[ MFT_NormalMap ] )
{
if ( mStages[stageNum].getTex( MFT_NormalMap )->mFormat == GFXFormatDXT5 &&
if ( mStages[stageNum].getTex( MFT_NormalMap )->mFormat == GFXFormatBC3 &&
!mStages[stageNum].getTex( MFT_NormalMap )->mHasTransparency )
fd.features.addFeature( MFT_IsDXTnm );
fd.features.addFeature( MFT_IsBC3nm );
else if ( mStages[stageNum].getTex(MFT_NormalMap)->mFormat == GFXFormatBC5 &&
!mStages[stageNum].getTex(MFT_NormalMap)->mHasTransparency )
fd.features.addFeature( MFT_IsBC5nm );
}
// Now for some more advanced features that we
@ -461,7 +465,7 @@ void ProcessedShaderMaterial::_determineFeatures( U32 stageNum,
// If we have a diffuse map and the alpha on the diffuse isn't
// zero and the color isn't pure white then multiply the color.
else if ( mMaterial->mDiffuse[stageNum].alpha > 0.0f &&
mMaterial->mDiffuse[stageNum] != ColorF::WHITE )
mMaterial->mDiffuse[stageNum] != LinearColorF::WHITE )
fd.features.addFeature( MFT_DiffuseColor );
// If lightmaps or tonemaps are enabled or we
@ -1096,7 +1100,7 @@ void ProcessedShaderMaterial::_setShaderConstants(SceneRenderState * state, cons
if ( handles->mSubSurfaceParamsSC->isValid() )
{
Point4F subSurfParams;
dMemcpy( &subSurfParams, &mMaterial->mSubSurfaceColor[stageNum], sizeof(ColorF) );
dMemcpy( &subSurfParams, &mMaterial->mSubSurfaceColor[stageNum], sizeof(LinearColorF) );
subSurfParams.w = mMaterial->mSubSurfaceRolloff[stageNum];
shaderConsts->set(handles->mSubSurfaceParamsSC, subSurfParams);
}