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

Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor

Browse source
This commit is contained in:
marauder2k7 2024-02-24 14:42:53 +00:00
commit d9fd3375da
9 changed files with 61 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/spotLight.cpp
View file

@ -132,7 +132,7 @@ void SpotLight::_conformLights()
mLight->setDynamicRefreshFreq(mDynamicRefreshFreq); mLight->setDynamicRefreshFreq(mDynamicRefreshFreq);
mLight->setPriority( mPriority ); mLight->setPriority( mPriority );
mOuterConeAngle = getMax( 0.01f, mOuterConeAngle ); mOuterConeAngle = getMin(getMax( 0.01f, mOuterConeAngle ),179.0f);
mInnerConeAngle = getMin( mInnerConeAngle, mOuterConeAngle ); mInnerConeAngle = getMin( mInnerConeAngle, mOuterConeAngle );
mLight->setInnerConeAngle( mInnerConeAngle ); mLight->setInnerConeAngle( mInnerConeAngle );

4
Engine/source/lighting/advanced/advancedLightBinManager.cpp
View file

@ -399,9 +399,9 @@ void AdvancedLightBinManager::render( SceneRenderState *state )
sunLight->getCastShadows() && sunLight->getCastShadows() &&
!disableShadows && !disableShadows &&
sunLight->getExtended<ShadowMapParams>() ) sunLight->getExtended<ShadowMapParams>() )
vectorMatInfo = _getLightMaterial( LightInfo::Vector, ShadowType_PSSM ); vectorMatInfo = _getLightMaterial( LightInfo::Vector, ShadowType_PSSM,false,false );
else else
vectorMatInfo = _getLightMaterial( LightInfo::Vector, ShadowType_None ); vectorMatInfo = _getLightMaterial( LightInfo::Vector, ShadowType_None, false, false);
// Initialize and set the per-frame parameters after getting // Initialize and set the per-frame parameters after getting
// the vector light material as we use lazy creation. // the vector light material as we use lazy creation.

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

@ -71,7 +71,7 @@ public:
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
enum Constants enum Constants
{ {
MAX_TEX_PER_PASS = 8, ///< Number of textures per pass MAX_TEX_PER_PASS = 16, ///< Number of textures per pass
MAX_STAGES = 4, MAX_STAGES = 4,
NUM_EFFECT_COLOR_STAGES = 2, ///< Number of effect color definitions for transitioning effects. NUM_EFFECT_COLOR_STAGES = 2, ///< Number of effect color definitions for transitioning effects.
}; };

1
Engine/source/materials/processedCustomMaterial.cpp
View file

@ -360,6 +360,7 @@ void ProcessedCustomMaterial::setTextureStages( SceneRenderState *state, const S
break; break;
case Material::Mask: case Material::Mask:
case Material::PhotometricMask:
case Material::Standard: case Material::Standard:
case Material::Bump: case Material::Bump:
case Material::Detail: case Material::Detail:

7
Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.tscript
View file

@ -118,6 +118,7 @@ singleton GFXStateBlockData( AL_ConvexLightState )
samplerStates[3] = SamplerClampPoint; // colorBuffer samplerStates[3] = SamplerClampPoint; // colorBuffer
samplerStates[4] = SamplerClampPoint; // matInfoBuffer samplerStates[4] = SamplerClampPoint; // matInfoBuffer
samplerStates[5] = SamplerClampLinear; // Cookie Map samplerStates[5] = SamplerClampLinear; // Cookie Map
samplerStates[6] = SamplerClampLinear; // iesProfile
cullDefined = true; cullDefined = true;
cullMode = GFXCullCW; cullMode = GFXCullCW;
@ -142,6 +143,7 @@ singleton shaderData( AL_PointLightShader )
samplerNames[3] = "$colorBuffer"; samplerNames[3] = "$colorBuffer";
samplerNames[4] = "$matInfoBuffer"; samplerNames[4] = "$matInfoBuffer";
samplerNames[5] = "$cookieMap"; samplerNames[5] = "$cookieMap";
samplerNames[6] = "$iesProfile";
pixVersion = 3.0; pixVersion = 3.0;
}; };
@ -156,7 +158,7 @@ singleton CustomMaterial( AL_PointLightMaterial )
sampler["cookieMap"] = "$dynamiclightmask"; sampler["cookieMap"] = "$dynamiclightmask";
sampler["colorBuffer"] = "#color"; sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo"; sampler["matInfoBuffer"] = "#matinfo";
sampler["iesProfile"] = "$photometricmask";
target = "AL_FormatToken"; target = "AL_FormatToken";
pixVersion = 3.0; pixVersion = 3.0;
@ -177,6 +179,7 @@ singleton shaderData( AL_SpotLightShader )
samplerNames[3] = "$colorBuffer"; samplerNames[3] = "$colorBuffer";
samplerNames[4] = "$matInfoBuffer"; samplerNames[4] = "$matInfoBuffer";
samplerNames[5] = "$cookieMap"; samplerNames[5] = "$cookieMap";
samplerNames[6] = "$iesProfile";
pixVersion = 3.0; pixVersion = 3.0;
}; };
@ -188,10 +191,10 @@ singleton CustomMaterial( AL_SpotLightMaterial )
sampler["deferredBuffer"] = "#deferred"; sampler["deferredBuffer"] = "#deferred";
sampler["shadowMap"] = "$dynamiclight"; sampler["shadowMap"] = "$dynamiclight";
sampler["iesProfile"] = "$photometricmask";
sampler["cookieMap"] = "$dynamiclightmask"; sampler["cookieMap"] = "$dynamiclightmask";
sampler["colorBuffer"] = "#color"; sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo"; sampler["matInfoBuffer"] = "#matinfo";
target = "AL_FormatToken"; target = "AL_FormatToken";
pixVersion = 3.0; pixVersion = 3.0;

17
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/pointLightP.glsl
View file

@ -108,6 +108,7 @@ uniform sampler2D deferredBuffer;
#include "softShadow.glsl" #include "softShadow.glsl"
uniform sampler2D colorBuffer; uniform sampler2D colorBuffer;
uniform sampler2D matInfoBuffer; uniform sampler2D matInfoBuffer;
#ifdef SHADOW_CUBE #ifdef SHADOW_CUBE
/// The texture for cookie rendering. /// The texture for cookie rendering.
uniform samplerCube cookieMap; uniform samplerCube cookieMap;
@ -115,11 +116,14 @@ uniform samplerCube cookieMap;
uniform sampler2D cookieMap; uniform sampler2D cookieMap;
#endif #endif
uniform sampler2D iesProfile; #ifdef UES_PHOTOMETRIC_MASK
uniform sampler1D iesProfile;
#endif
uniform vec4 rtParams0; uniform vec4 rtParams0;
uniform vec3 lightPosition; uniform vec3 lightPosition;
uniform vec3 lightDirection;
uniform vec4 lightColor; uniform vec4 lightColor;
uniform float lightBrightness; uniform float lightBrightness;
uniform float lightRange; uniform float lightRange;
@ -230,17 +234,18 @@ void main()
OUT_col = vec4(final, 0); OUT_col = vec4(final, 0);
return return
#endif #endif
//get punctual light contribution
lighting = getPunctualLight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, shadow);
#ifdef UES_PHOTOMETRIC_MASK #ifdef UES_PHOTOMETRIC_MASK
// Lookup the cookie sample.d // Lookup the cookie sample.d
float cosTheta = dot(-surfaceToLight.L, lightDirection); float cosTheta = dot(-surfaceToLight.L, lightDirection);
float angle = acos(cosTheta) * ( M_1OVER_PI_F); float angle = acos(cosTheta) * ( M_1OVER_PI_F);
float iesMask = texture(iesProfile, vec2(angle, 0.0)).r; float iesMask = texture(iesProfile,angle).r;
// Multiply the light with the iesMask tex. // Multiply the light with the iesMask tex.
lighting *= iesMask; shadow *= iesMask;
#endif #endif
//get punctual light contribution
lighting = getPunctualLight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, shadow);
} }

24
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/spotLightP.glsl
View file

@ -19,7 +19,6 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "../../../gl/hlslCompat.glsl" #include "../../../gl/hlslCompat.glsl"
#include "farFrustumQuad.glsl" #include "farFrustumQuad.glsl"
#include "../../shadowMap/shadowMapIO_GLSL.h" #include "../../shadowMap/shadowMapIO_GLSL.h"
@ -38,8 +37,15 @@ uniform sampler2D shadowMap;
#include "softShadow.glsl" #include "softShadow.glsl"
uniform sampler2D colorBuffer; uniform sampler2D colorBuffer;
uniform sampler2D matInfoBuffer; uniform sampler2D matInfoBuffer;
#ifdef USE_COOKIE_TEX
uniform sampler2D cookieMap; uniform sampler2D cookieMap;
uniform sampler2D iesProfile; #endif
#ifdef UES_PHOTOMETRIC_MASK
uniform sampler1D iesProfile;
#endif
uniform vec4 rtParams0; uniform vec4 rtParams0;
uniform float lightBrightness; uniform float lightBrightness;
@ -109,7 +115,10 @@ void main()
vec3 lightCol = lightColor.rgb; vec3 lightCol = lightColor.rgb;
#ifdef USE_COOKIE_TEX #ifdef USE_COOKIE_TEX
// Lookup the cookie sample. // Lookup the cookie sample.
vec4 cookie = texture(cookieMap, shadowCoord); vec4 pxlPosLightProj = tMul( worldToLightProj, vec4( surface.P, 1 ) );
vec2 cookieCoord = ( ( pxlPosLightProj.xy / pxlPosLightProj.w ) * 0.5 ) + vec2( 0.5, 0.5 );
cookieCoord.y = 1.0f - cookieCoord.y;
vec4 cookie = texture(cookieMap, cookieCoord);
// Multiply the light with the cookie tex. // Multiply the light with the cookie tex.
lightCol *= cookie.rgb; lightCol *= cookie.rgb;
// Use a maximum channel luminance to attenuate // Use a maximum channel luminance to attenuate
@ -154,16 +163,17 @@ void main()
return; return;
#endif #endif
//get spot light contribution
lighting = getSpotlight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, lightDirection, lightSpotParams, shadow);
#ifdef UES_PHOTOMETRIC_MASK #ifdef UES_PHOTOMETRIC_MASK
// Lookup the cookie sample.d // Lookup the cookie sample.d
float cosTheta = dot(-surfaceToLight.L, lightDirection); float cosTheta = dot(-surfaceToLight.L, lightDirection);
float angle = acos(cosTheta) * ( M_1OVER_PI_F); float angle = acos(cosTheta) * ( M_1OVER_PI_F);
float iesMask = texture(iesProfile, vec2(angle, 0.0)).r; float iesMask = texture(iesProfile, angle/(lightSpotParams.x-lightSpotParams.y)).r;
// Multiply the light with the iesMask tex. // Multiply the light with the iesMask tex.
lighting *= iesMask; shadow *= iesMask;
#endif #endif
//get spot light contribution
lighting = getSpotlight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, lightDirection, lightSpotParams, shadow);
} }
OUT_col = vec4(lighting, 0); OUT_col = vec4(lighting, 0);

17
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/pointLightP.hlsl
View file

@ -107,13 +107,17 @@ TORQUE_UNIFORM_SAMPLER2D(shadowMap, 1);
#include "softShadow.hlsl" #include "softShadow.hlsl"
TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 3); TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 3);
TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 4); TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 4);
/// The texture for cookie rendering. /// The texture for cookie rendering.
#ifdef SHADOW_CUBE #ifdef SHADOW_CUBE
TORQUE_UNIFORM_SAMPLERCUBE(cookieMap, 5); TORQUE_UNIFORM_SAMPLERCUBE(cookieMap, 5);
#else #else
TORQUE_UNIFORM_SAMPLER2D(cookieMap, 5); TORQUE_UNIFORM_SAMPLER2D(cookieMap, 5);
#endif #endif
TORQUE_UNIFORM_SAMPLER2D(iesProfile, 6);
#ifdef UES_PHOTOMETRIC_MASK
TORQUE_UNIFORM_SAMPLER1D(iesProfile, 6);
#endif
uniform float4 rtParams0; uniform float4 rtParams0;
uniform float4 lightColor; uniform float4 lightColor;
@ -223,17 +227,18 @@ float4 main( ConvexConnectP IN ) : SV_TARGET
return final; return final;
#endif #endif
//get punctual light contribution
lighting = getPunctualLight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, shadow);
#ifdef UES_PHOTOMETRIC_MASK #ifdef UES_PHOTOMETRIC_MASK
// Lookup the cookie sample.d // Lookup the cookie sample.d
float cosTheta = dot(-surfaceToLight.L, lightDirection); float cosTheta = dot(-surfaceToLight.L, lightDirection);
float angle = acos(cosTheta) * ( M_1OVER_PI_F); float angle = acos(cosTheta) * ( M_1OVER_PI_F);
float iesMask = TORQUE_TEX2D(iesProfile, float2(angle, 0.0)).r; float iesMask = TORQUE_TEX1D(iesProfile, angle).r;
// Multiply the light with the iesMask tex. // Multiply the light with the iesMask tex.
lighting *= iesMask; shadow *= iesMask;
#endif #endif
//get punctual light contribution
lighting = getPunctualLight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, shadow);
} }

17
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/spotLightP.hlsl
View file

@ -43,8 +43,14 @@ TORQUE_UNIFORM_SAMPLER2D(shadowMap, 1);
TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 3); TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 3);
TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 4); TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 4);
/// The texture for cookie rendering. /// The texture for cookie rendering.
#ifdef USE_COOKIE_TEX
TORQUE_UNIFORM_SAMPLER2D(cookieMap, 5); TORQUE_UNIFORM_SAMPLER2D(cookieMap, 5);
TORQUE_UNIFORM_SAMPLER2D(iesProfile, 6); #endif
#ifdef UES_PHOTOMETRIC_MASK
TORQUE_UNIFORM_SAMPLER1D(iesProfile, 6);
#endif
uniform float4 rtParams0; uniform float4 rtParams0;
@ -153,16 +159,17 @@ float4 main( ConvexConnectP IN ) : SV_TARGET
return final; return final;
#endif #endif
//get spot light contribution
lighting = getSpotlight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, lightDirection, lightSpotParams, shadow);
#ifdef UES_PHOTOMETRIC_MASK #ifdef UES_PHOTOMETRIC_MASK
// Lookup the cookie sample.d // Lookup the cookie sample.d
float cosTheta = dot(-surfaceToLight.L, lightDirection); float cosTheta = dot(-surfaceToLight.L, lightDirection);
float angle = acos(cosTheta) * ( M_1OVER_PI_F); float angle = acos(cosTheta) * ( M_1OVER_PI_F);
float iesMask = TORQUE_TEX2D(iesProfile, float2(angle, 0.0)).r; float iesMask = TORQUE_TEX1D(iesProfile, angle/(lightSpotParams.x-lightSpotParams.y)).r;
// Multiply the light with the iesMask tex. // Multiply the light with the iesMask tex.
lighting *= iesMask; shadow *= iesMask;
#endif #endif
//get spot light contribution
lighting = getSpotlight(surface, surfaceToLight, lightCol, lightBrightness, lightInvSqrRange, lightDirection, lightSpotParams, shadow);
} }
return float4(lighting, 0); return float4(lighting, 0);