Skip to content

Add $refracttintrespectamount to SDK_Refract #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blixibon wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add $refracttintrespectamount to SDK_Refract #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sp/src/materialsystem/stdshaders/SDK_refract_ps2x.fxc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// STATIC: "NORMAL_DECODE_MODE" "0..0" [XBOX]
// STATIC: "NORMAL_DECODE_MODE" "0..0" [PC]
// STATIC: "SHADER_SRGB_READ" "0..1" [ps20b]
// STATIC: "REFRACTTINTRESPECTAMOUNT" "0..1" [ps20b]

// DYNAMIC: "PIXELFOGTYPE" "0..1"
// DYNAMIC: "WRITE_DEPTH_TO_DESTALPHA" "0..1" [ps20b] [PC]
Expand Down Expand Up @@ -108,6 +109,10 @@ float4 main( PS_INPUT i ) : COLOR
float3 refractTintColor = g_RefractTint;
#endif

#if REFRACTTINTRESPECTAMOUNT
refractTintColor = lerp( float3(1,1,1), refractTintColor, g_RefractScale );
#endif

#if COLORMODULATE
refractTintColor *= i.ColorModulate.rgb;
#endif
Expand Down
31 changes: 28 additions & 3 deletions sp/src/materialsystem/stdshaders/fxctmp9/SDK_refract_ps20b.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,27 @@ public:
m_bSHADER_SRGB_READ = true;
#endif
}
private:
int m_nREFRACTTINTRESPECTAMOUNT;
#ifdef _DEBUG
bool m_bREFRACTTINTRESPECTAMOUNT;
#endif
public:
void SetREFRACTTINTRESPECTAMOUNT( int i )
{
Assert( i >= 0 && i <= 1 );
m_nREFRACTTINTRESPECTAMOUNT = i;
#ifdef _DEBUG
m_bREFRACTTINTRESPECTAMOUNT = true;
#endif
}
void SetREFRACTTINTRESPECTAMOUNT( bool i )
{
m_nREFRACTTINTRESPECTAMOUNT = i ? 1 : 0;
#ifdef _DEBUG
m_bREFRACTTINTRESPECTAMOUNT = true;
#endif
}
public:
sdk_refract_ps20b_Static_Index( )
{
Expand Down Expand Up @@ -254,19 +275,23 @@ public:
m_bSHADER_SRGB_READ = false;
#endif // _DEBUG
m_nSHADER_SRGB_READ = 0;
#ifdef _DEBUG
m_bREFRACTTINTRESPECTAMOUNT = false;
#endif // _DEBUG
m_nREFRACTTINTRESPECTAMOUNT = 0;
}
int GetIndex()
{
// Asserts to make sure that we aren't using any skipped combinations.
// Asserts to make sure that we are setting all of the combination vars.
#ifdef _DEBUG
bool bAllStaticVarsDefined = m_bCONVERT_TO_SRGB && m_bBLUR && m_bFADEOUTONSILHOUETTE && m_bCUBEMAP && m_bREFRACTTINTTEXTURE && m_bMASKED && m_bCOLORMODULATE && m_bSECONDARY_NORMAL && m_bNORMAL_DECODE_MODE && m_bSHADER_SRGB_READ;
bool bAllStaticVarsDefined = m_bCONVERT_TO_SRGB && m_bBLUR && m_bFADEOUTONSILHOUETTE && m_bCUBEMAP && m_bREFRACTTINTTEXTURE && m_bMASKED && m_bCOLORMODULATE && m_bSECONDARY_NORMAL && m_bNORMAL_DECODE_MODE && m_bSHADER_SRGB_READ && m_bREFRACTTINTRESPECTAMOUNT;
Assert( bAllStaticVarsDefined );
#endif // _DEBUG
return ( 4 * m_nCONVERT_TO_SRGB ) + ( 8 * m_nBLUR ) + ( 16 * m_nFADEOUTONSILHOUETTE ) + ( 32 * m_nCUBEMAP ) + ( 64 * m_nREFRACTTINTTEXTURE ) + ( 128 * m_nMASKED ) + ( 256 * m_nCOLORMODULATE ) + ( 512 * m_nSECONDARY_NORMAL ) + ( 1024 * m_nNORMAL_DECODE_MODE ) + ( 1024 * m_nSHADER_SRGB_READ ) + 0;
return ( 4 * m_nCONVERT_TO_SRGB ) + ( 8 * m_nBLUR ) + ( 16 * m_nFADEOUTONSILHOUETTE ) + ( 32 * m_nCUBEMAP ) + ( 64 * m_nREFRACTTINTTEXTURE ) + ( 128 * m_nMASKED ) + ( 256 * m_nCOLORMODULATE ) + ( 512 * m_nSECONDARY_NORMAL ) + ( 1024 * m_nNORMAL_DECODE_MODE ) + ( 1024 * m_nSHADER_SRGB_READ ) + ( 2048 * m_nREFRACTTINTRESPECTAMOUNT ) + 0;
}
};
#define shaderStaticTest_sdk_refract_ps20b psh_forgot_to_set_static_BLUR + psh_forgot_to_set_static_FADEOUTONSILHOUETTE + psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_REFRACTTINTTEXTURE + psh_forgot_to_set_static_MASKED + psh_forgot_to_set_static_COLORMODULATE + psh_forgot_to_set_static_SECONDARY_NORMAL + psh_forgot_to_set_static_NORMAL_DECODE_MODE + psh_forgot_to_set_static_SHADER_SRGB_READ + 0
#define shaderStaticTest_sdk_refract_ps20b psh_forgot_to_set_static_BLUR + psh_forgot_to_set_static_FADEOUTONSILHOUETTE + psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_REFRACTTINTTEXTURE + psh_forgot_to_set_static_MASKED + psh_forgot_to_set_static_COLORMODULATE + psh_forgot_to_set_static_SECONDARY_NORMAL + psh_forgot_to_set_static_NORMAL_DECODE_MODE + psh_forgot_to_set_static_SHADER_SRGB_READ + psh_forgot_to_set_static_REFRACTTINTRESPECTAMOUNT + 0
class sdk_refract_ps20b_Dynamic_Index
{
private:
Expand Down
31 changes: 28 additions & 3 deletions sp/src/materialsystem/stdshaders/fxctmp9_tmp/SDK_refract_ps20b.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,27 @@ public:
m_bSHADER_SRGB_READ = true;
#endif
}
private:
int m_nREFRACTTINTRESPECTAMOUNT;
#ifdef _DEBUG
bool m_bREFRACTTINTRESPECTAMOUNT;
#endif
public:
void SetREFRACTTINTRESPECTAMOUNT( int i )
{
Assert( i >= 0 && i <= 1 );
m_nREFRACTTINTRESPECTAMOUNT = i;
#ifdef _DEBUG
m_bREFRACTTINTRESPECTAMOUNT = true;
#endif
}
void SetREFRACTTINTRESPECTAMOUNT( bool i )
{
m_nREFRACTTINTRESPECTAMOUNT = i ? 1 : 0;
#ifdef _DEBUG
m_bREFRACTTINTRESPECTAMOUNT = true;
#endif
}
public:
sdk_refract_ps20b_Static_Index( )
{
Expand Down Expand Up @@ -254,19 +275,23 @@ public:
m_bSHADER_SRGB_READ = false;
#endif // _DEBUG
m_nSHADER_SRGB_READ = 0;
#ifdef _DEBUG
m_bREFRACTTINTRESPECTAMOUNT = false;
#endif // _DEBUG
m_nREFRACTTINTRESPECTAMOUNT = 0;
}
int GetIndex()
{
// Asserts to make sure that we aren't using any skipped combinations.
// Asserts to make sure that we are setting all of the combination vars.
#ifdef _DEBUG
bool bAllStaticVarsDefined = m_bCONVERT_TO_SRGB && m_bBLUR && m_bFADEOUTONSILHOUETTE && m_bCUBEMAP && m_bREFRACTTINTTEXTURE && m_bMASKED && m_bCOLORMODULATE && m_bSECONDARY_NORMAL && m_bNORMAL_DECODE_MODE && m_bSHADER_SRGB_READ;
bool bAllStaticVarsDefined = m_bCONVERT_TO_SRGB && m_bBLUR && m_bFADEOUTONSILHOUETTE && m_bCUBEMAP && m_bREFRACTTINTTEXTURE && m_bMASKED && m_bCOLORMODULATE && m_bSECONDARY_NORMAL && m_bNORMAL_DECODE_MODE && m_bSHADER_SRGB_READ && m_bREFRACTTINTRESPECTAMOUNT;
Assert( bAllStaticVarsDefined );
#endif // _DEBUG
return ( 4 * m_nCONVERT_TO_SRGB ) + ( 8 * m_nBLUR ) + ( 16 * m_nFADEOUTONSILHOUETTE ) + ( 32 * m_nCUBEMAP ) + ( 64 * m_nREFRACTTINTTEXTURE ) + ( 128 * m_nMASKED ) + ( 256 * m_nCOLORMODULATE ) + ( 512 * m_nSECONDARY_NORMAL ) + ( 1024 * m_nNORMAL_DECODE_MODE ) + ( 1024 * m_nSHADER_SRGB_READ ) + 0;
return ( 4 * m_nCONVERT_TO_SRGB ) + ( 8 * m_nBLUR ) + ( 16 * m_nFADEOUTONSILHOUETTE ) + ( 32 * m_nCUBEMAP ) + ( 64 * m_nREFRACTTINTTEXTURE ) + ( 128 * m_nMASKED ) + ( 256 * m_nCOLORMODULATE ) + ( 512 * m_nSECONDARY_NORMAL ) + ( 1024 * m_nNORMAL_DECODE_MODE ) + ( 1024 * m_nSHADER_SRGB_READ ) + ( 2048 * m_nREFRACTTINTRESPECTAMOUNT ) + 0;
}
};
#define shaderStaticTest_sdk_refract_ps20b psh_forgot_to_set_static_BLUR + psh_forgot_to_set_static_FADEOUTONSILHOUETTE + psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_REFRACTTINTTEXTURE + psh_forgot_to_set_static_MASKED + psh_forgot_to_set_static_COLORMODULATE + psh_forgot_to_set_static_SECONDARY_NORMAL + psh_forgot_to_set_static_NORMAL_DECODE_MODE + psh_forgot_to_set_static_SHADER_SRGB_READ + 0
#define shaderStaticTest_sdk_refract_ps20b psh_forgot_to_set_static_BLUR + psh_forgot_to_set_static_FADEOUTONSILHOUETTE + psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_REFRACTTINTTEXTURE + psh_forgot_to_set_static_MASKED + psh_forgot_to_set_static_COLORMODULATE + psh_forgot_to_set_static_SECONDARY_NORMAL + psh_forgot_to_set_static_NORMAL_DECODE_MODE + psh_forgot_to_set_static_SHADER_SRGB_READ + psh_forgot_to_set_static_REFRACTTINTRESPECTAMOUNT + 0
class sdk_refract_ps20b_Dynamic_Index
{
private:
Expand Down
6 changes: 6 additions & 0 deletions sp/src/materialsystem/stdshaders/refract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ BEGIN_VS_SHADER( SDK_Refract_DX90, "Help for SDK_Refract" )
SHADER_PARAM_OVERRIDE( ALPHA, SHADER_PARAM_TYPE_FLOAT, "1.0", "unused", SHADER_PARAM_NOT_EDITABLE )
SHADER_PARAM( REFRACTAMOUNT, SHADER_PARAM_TYPE_FLOAT, "2", "" )
SHADER_PARAM( REFRACTTINT, SHADER_PARAM_TYPE_COLOR, "[1 1 1]", "refraction tint" )
#ifdef MAPBASE
SHADER_PARAM( REFRACTTINTRESPECTAMOUNT, SHADER_PARAM_TYPE_BOOL, "0", "" )
#endif
SHADER_PARAM( NORMALMAP, SHADER_PARAM_TYPE_TEXTURE, "models/shadertest/shader1_normal", "normal map" )
SHADER_PARAM( NORMALMAP2, SHADER_PARAM_TYPE_TEXTURE, "models/shadertest/shader1_normal", "normal map" )
SHADER_PARAM( BUMPFRAME, SHADER_PARAM_TYPE_INTEGER, "0", "frame number for $normalmap" )
Expand Down Expand Up @@ -48,6 +51,9 @@ BEGIN_VS_SHADER( SDK_Refract_DX90, "Help for SDK_Refract" )
info.m_nFrame = FRAME;
info.m_nRefractAmount = REFRACTAMOUNT;
info.m_nRefractTint = REFRACTTINT;
#ifdef MAPBASE
info.m_nRefractTintRespectAmount = REFRACTTINTRESPECTAMOUNT;
#endif
info.m_nNormalMap = NORMALMAP;
info.m_nNormalMap2 = NORMALMAP2;
info.m_nBumpFrame = BUMPFRAME;
Expand Down
9 changes: 9 additions & 0 deletions sp/src/materialsystem/stdshaders/refract_dx9_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@ void DrawRefract_DX9( CBaseVSShader *pShader, IMaterialVar** params, IShaderDyna
bool bShaderSRGBConvert = IsOSX() && ( g_pHardwareConfig->FakeSRGBWrite() || !g_pHardwareConfig->CanDoSRGBReadFromRTs() );
if ( g_pHardwareConfig->SupportsPixelShaders_2_b() || g_pHardwareConfig->ShouldAlwaysUseShaderModel2bShaders() ) // always send OpenGL down the ps2b path
{
#ifdef MAPBASE
bool bRefractTintRespectAmount = false;
if ( params[info.m_nRefractTintRespectAmount]->GetIntValue() != 0 )
bRefractTintRespectAmount = true;
#endif

DECLARE_STATIC_PIXEL_SHADER( sdk_refract_ps20b );
SET_STATIC_PIXEL_SHADER_COMBO( BLUR, blurAmount );
SET_STATIC_PIXEL_SHADER_COMBO( FADEOUTONSILHOUETTE, bFadeOutOnSilhouette );
Expand All @@ -238,6 +244,9 @@ void DrawRefract_DX9( CBaseVSShader *pShader, IMaterialVar** params, IShaderDyna
SET_STATIC_PIXEL_SHADER_COMBO( SECONDARY_NORMAL, bSecondaryNormal );
SET_STATIC_PIXEL_SHADER_COMBO( NORMAL_DECODE_MODE, (int) nNormalDecodeMode );
SET_STATIC_PIXEL_SHADER_COMBO( SHADER_SRGB_READ, bShaderSRGBConvert );
#ifdef MAPBASE
SET_STATIC_PIXEL_SHADER_COMBO( REFRACTTINTRESPECTAMOUNT, bRefractTintRespectAmount );
#endif
SET_STATIC_PIXEL_SHADER( sdk_refract_ps20b );
}
else
Expand Down
3 changes: 3 additions & 0 deletions sp/src/materialsystem/stdshaders/refract_dx9_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ struct Refract_DX9_Vars_t
int m_nFrame;
int m_nRefractAmount;
int m_nRefractTint;
#ifdef MAPBASE
int m_nRefractTintRespectAmount;
#endif
int m_nNormalMap;
int m_nNormalMap2;
int m_nBumpFrame;
Expand Down
Loading