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

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->setPriority( mPriority );
mOuterConeAngle = getMax( 0.01f, mOuterConeAngle );
mOuterConeAngle = getMin(getMax( 0.01f, mOuterConeAngle ),179.0f);
mInnerConeAngle = getMin( mInnerConeAngle, mOuterConeAngle );
mLight->setInnerConeAngle( mInnerConeAngle );

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

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

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

@ -71,7 +71,7 @@ public:
//-----------------------------------------------------------------------
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,
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;
case Material::Mask:
case Material::PhotometricMask:
case Material::Standard:
case Material::Bump:
case Material::Detail: