From ed264e4e12909c417f450014ac699b4813fcfaec Mon Sep 17 00:00:00 2001 From: Azaezel Date: Wed, 16 Mar 2016 18:10:07 -0500 Subject: [PATCH] from @rextimmy automatically adds a sky feature to skies. (render sorting and orientation. previously required setting in script.) --- Engine/source/environment/skyBox.cpp | 1 + Engine/source/materials/materialFeatureTypes.cpp | 2 +- Engine/source/materials/processedShaderMaterial.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Engine/source/environment/skyBox.cpp b/Engine/source/environment/skyBox.cpp index 83c9bb6e7..00d0a6b4d 100644 --- a/Engine/source/environment/skyBox.cpp +++ b/Engine/source/environment/skyBox.cpp @@ -608,6 +608,7 @@ void SkyBox::_initMaterial() FeatureSet features = MATMGR->getDefaultFeatures(); features.removeFeature( MFT_RTLighting ); features.removeFeature( MFT_Visibility ); + features.addFeature(MFT_SkyBox); // Now initialize the material. mMatInstance->init(features, getGFXVertexFormat()); diff --git a/Engine/source/materials/materialFeatureTypes.cpp b/Engine/source/materials/materialFeatureTypes.cpp index 8ea7fbe8c..85fbd2895 100644 --- a/Engine/source/materials/materialFeatureTypes.cpp +++ b/Engine/source/materials/materialFeatureTypes.cpp @@ -97,7 +97,7 @@ ImplementFeatureType( MFT_ImposterVert, MFG_PreTransform, 1.0, false ); // Deferred Shading ImplementFeatureType( MFT_isDeferred, U32(-1), -1, true ); -ImplementFeatureType( MFT_SkyBox, MFG_Transform, 1.0f, true ); +ImplementFeatureType( MFT_SkyBox, MFG_Transform, 1.0f, false ); ImplementFeatureType( MFT_DeferredEmptySpec, MFG_Texture, 8.01f, false ); ImplementFeatureType( MFT_DeferredSpecMap, MFG_Texture, 8.2f, false ); diff --git a/Engine/source/materials/processedShaderMaterial.cpp b/Engine/source/materials/processedShaderMaterial.cpp index 37f745253..7d0e965fa 100644 --- a/Engine/source/materials/processedShaderMaterial.cpp +++ b/Engine/source/materials/processedShaderMaterial.cpp @@ -341,7 +341,7 @@ void ProcessedShaderMaterial::_determineFeatures( U32 stageNum, fd.features.addFeature( MFT_CubeMap ); } - if (mMaterial->mIsSky) + if (features.hasFeature(MFT_SkyBox)) { fd.features.addFeature(MFT_CubeMap); fd.features.addFeature(MFT_SkyBox);