Browse Source

Merge pull request #2203 from Bloodknight/DifferentProfileFixes

Fixes console spamming of material profiles
Areloch 7 năm trước cách đây
mục cha
commit
5d8d14b2f3

+ 1 - 1
Engine/source/materials/processedMaterial.cpp

@@ -456,7 +456,7 @@ void ProcessedMaterial::_setStageData()
       // SpecularMap
       if( mMaterial->mSpecularMapFilename[i].isNotEmpty() )
       {
-         mStages[i].setTex( MFT_SpecularMap, _createTexture( mMaterial->mSpecularMapFilename[i], &GFXStaticTextureProfile) );
+         mStages[i].setTex( MFT_SpecularMap, _createTexture( mMaterial->mSpecularMapFilename[i], &GFXStaticTextureSRGBProfile) );
          if(!mStages[i].getTex( MFT_SpecularMap ))
             mMaterial->logError("Failed to load specular map %s for stage %i", _getTexturePath(mMaterial->mSpecularMapFilename[i]).c_str(), i);
       }

BIN
Templates/Full/game/art/shapes/weapons/Ryder/TP_Ryder_S.dds


+ 1 - 1
Templates/Full/game/art/shapes/weapons/Ryder/materials.cs

@@ -39,7 +39,7 @@ singleton Material(TP_Ryder_Base)
    mapTo = "TP_Ryder_Base";
    diffuseMap[0] = "./TP_Ryder_D.dds";
    normalMap[0] = "./TP_Ryder_N.dds";
-   specularMap[0] = "./TP_Ryder_D.dds";
+   specularMap[0] = "./TP_Ryder_S.dds";
    specular[0] = "1.0 1.0 1.0 1";
    specularPower[0] = "10";
    translucentBlendOp = "None";

+ 1 - 1
Templates/Full/game/art/shapes/weapons/Turret/materials.cs

@@ -29,7 +29,7 @@ singleton Material(Turret_Base)
    translucentBlendOp = "None";
    normalMap[0] = "art/shapes/weapons/Turret/Turret_N.dds";
    pixelSpecular[0] = "1";
-   specularMap[0] = "art/shapes/weapons/Turret/Turret_D.dds";
+   specularMap[0] = "art/shapes/weapons/Turret/Turret_S.dds";
    useAnisotropic[0] = "1";
    castDynamicShadows = true;    
    materialTag0 = "Weapon";