TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Activates assignment for material light maps.

Browse source
This commit is contained in:
OTHGMars 2019-05-26 03:21:42 -04:00
parent 0887683925
commit 2320b59bed
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/ts/assimp/assimpAppMaterial.cpp
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//#define TORQUE_PBR_MATERIALS #define TORQUE_PBR_MATERIALS
#include "platform/platform.h" #include "platform/platform.h"
#include "ts/loader/appSequence.h" #include "ts/loader/appSequence.h"
@ -190,14 +190,13 @@ void AssimpAppMaterial::initMaterial(const Torque::Path& path, Material* mat) co
if (AI_SUCCESS == mAIMat->Get(AI_MATKEY_TEXTURE(aiTextureType_UNKNOWN, 0), texName)) if (AI_SUCCESS == mAIMat->Get(AI_MATKEY_TEXTURE(aiTextureType_UNKNOWN, 0), texName))
rmName = texName.C_Str(); rmName = texName.C_Str();
mat->mIsSRGb[0] = true;
if (aoName.isNotEmpty() || rmName.isNotEmpty()) if (aoName.isNotEmpty() || rmName.isNotEmpty())
{ // If we have either map, fill all three slots { // If we have either map, fill all three slots
if (rmName.isNotEmpty()) if (rmName.isNotEmpty())
{ {
mat->mRoughMapFilename[0] = cleanTextureName(rmName, cleanFile, path, false); // Roughness mat->mRoughMapFilename[0] = cleanTextureName(rmName, cleanFile, path, false); // Roughness
mat->mSmoothnessChan[0] = 1.0f; mat->mSmoothnessChan[0] = 1.0f;
mat->mInvertSmoothness = (floatVal == 1.0f); mat->mInvertSmoothness[0] = (floatVal == 1.0f);
mat->mMetalMapFilename[0] = cleanTextureName(rmName, cleanFile, path, false); // Metallic mat->mMetalMapFilename[0] = cleanTextureName(rmName, cleanFile, path, false); // Metallic
mat->mMetalChan[0] = 2.0f; mat->mMetalChan[0] = 2.0f;
} }