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

slim ambient down to vec3, default to premul for translucency

Browse source
This commit is contained in:
AzaezelX 2022-06-07 22:05:47 -05:00
parent 0e0088cab9
commit de6ee93159
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/materials/materialDefinition.cpp
View file

@ -536,7 +536,7 @@ bool Material::onAdd()
if (mTranslucentBlendOp >= NumBlendTypes || mTranslucentBlendOp < 0) if (mTranslucentBlendOp >= NumBlendTypes || mTranslucentBlendOp < 0)
{ {
Con::errorf("Invalid blend op in material: %s", getName()); Con::errorf("Invalid blend op in material: %s", getName());
mTranslucentBlendOp = LerpAlpha; mTranslucentBlendOp = PreMul;
} }
SimSet* matSet = MATMGR->getMaterialSet(); SimSet* matSet = MATMGR->getMaterialSet();

2
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
View file

@ -3064,7 +3064,7 @@ void ReflectionProbeFeatGLSL::processPix(Vector<ShaderComponent*>& componentList
Var *ambient = (Var *)LangElement::find("ambient"); Var *ambient = (Var *)LangElement::find("ambient");
if (!ambient) if (!ambient)
{ {
ambient = new Var("ambient", "vec4"); ambient = new Var("ambient", "vec3");
eyePos->uniform = true; eyePos->uniform = true;
eyePos->constSortPos = cspPass; eyePos->constSortPos = cspPass;
} }

2
Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
View file

@ -3153,7 +3153,7 @@ void ReflectionProbeFeatHLSL::processPix(Vector<ShaderComponent*> &componentList
Var *ambient = (Var *)LangElement::find("ambient"); Var *ambient = (Var *)LangElement::find("ambient");
if (!ambient) if (!ambient)
{ {
ambient = new Var("ambient","float4"); ambient = new Var("ambient","float3");
eyePos->uniform = true; eyePos->uniform = true;
eyePos->constSortPos = cspPass; eyePos->constSortPos = cspPass;
} }

4
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeArrayP.glsl
View file

@ -12,7 +12,7 @@ uniform sampler2D colorBuffer;
uniform sampler2D matInfoBuffer; uniform sampler2D matInfoBuffer;
uniform sampler2D BRDFTexture; uniform sampler2D BRDFTexture;
uniform vec4 ambientColor; uniform vec3 ambientColor;
uniform vec4 rtParams0; uniform vec4 rtParams0;
uniform vec4 vsFarPlane; uniform vec4 vsFarPlane;
uniform mat4 cameraToWorld; uniform mat4 cameraToWorld;
@ -203,6 +203,6 @@ void main()
#if CAPTURING == 1 #if CAPTURING == 1
OUT_col = vec4(mix(surface.baseColor.rgb,(irradiance + specular* horizon) ,surface.metalness/2),0); OUT_col = vec4(mix(surface.baseColor.rgb,(irradiance + specular* horizon) ,surface.metalness/2),0);
#else #else
OUT_col = vec4((irradiance + specular* horizon)*ambientColor.rgb , 0);//alpha writes disabled OUT_col = vec4((irradiance + specular* horizon)*ambientColor, 0);//alpha writes disabled
#endif #endif
} }

4
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/reflectionProbeArrayP.hlsl
View file

@ -8,7 +8,7 @@ TORQUE_UNIFORM_SAMPLER2D(deferredBuffer, 0);
TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 1); TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 1);
TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 2); TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 2);
TORQUE_UNIFORM_SAMPLER2D(BRDFTexture, 3); TORQUE_UNIFORM_SAMPLER2D(BRDFTexture, 3);
uniform float4 ambientColor; uniform float3 ambientColor;
uniform float4 rtParams0; uniform float4 rtParams0;
uniform float4 vsFarPlane; uniform float4 vsFarPlane;
uniform float4x4 cameraToWorld; uniform float4x4 cameraToWorld;
@ -190,6 +190,6 @@ float4 main(PFXVertToPix IN) : SV_TARGET
#if CAPTURING == 1 #if CAPTURING == 1
return float4(lerp(surface.baseColor.rgb,(irradiance + specular* horizon) ,surface.metalness/2),0); return float4(lerp(surface.baseColor.rgb,(irradiance + specular* horizon) ,surface.metalness/2),0);
#else #else
return float4((irradiance + specular* horizon)*ambientColor.rgb, 0);//alpha writes disabled return float4((irradiance + specular* horizon)*ambientColor, 0);//alpha writes disabled
#endif #endif
} }