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

Merge pull request #2203 from Bloodknight/DifferentProfileFixes

Browse source 
Fixes console spamming of material profiles
This commit is contained in:
Areloch 2018-02-14 00:58:57 -06:00 • committed by GitHub
commit 5d8d14b2f3
4 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/materials/processedMaterial.cpp
View file

@ -456,7 +456,7 @@ void ProcessedMaterial::_setStageData()
// SpecularMap // SpecularMap
if( mMaterial->mSpecularMapFilename[i].isNotEmpty() ) 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 )) if(!mStages[i].getTex( MFT_SpecularMap ))
mMaterial->logError("Failed to load specular map %s for stage %i", _getTexturePath(mMaterial->mSpecularMapFilename[i]).c_str(), i); 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 Normal file
View file

Binary file not shown.

2
Templates/Full/game/art/shapes/weapons/Ryder/materials.cs
View file

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

2
Templates/Full/game/art/shapes/weapons/Turret/materials.cs
View file

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