Browse Source

clamp spot angle to 179,
up custommaterial inputs to 16
add Material::PhotometricMask:handling to processedcustommaterial
and for paranoias sake go ahead and be explicit about _getLightMaterial (those *should* be unneeded as they optionally default to that, but it's how they were in the beatup fork during testing)

AzaezelX 1 year ago
parent
commit
c7cc86b357

+ 1 - 1
Engine/source/T3D/spotLight.cpp

@@ -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 );

+ 2 - 2
Engine/source/lighting/advanced/advancedLightBinManager.cpp

@@ -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.

+ 1 - 1
Engine/source/materials/materialDefinition.h

@@ -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 - 0
Engine/source/materials/processedCustomMaterial.cpp

@@ -361,6 +361,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: