From 438e6cbb3c59b5e030ec8698886bd20f9194058d Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Sun, 25 Jul 2021 17:18:55 -0500
Subject: [PATCH] fix for diffuse map mangling in several cases, filter
 imposters out of real time lighting (for now?) fix the blankskybox via a
 resave, and filter "badfilereference" and "failed" assets out of variable
 replacement for the project converter

---
 Engine/source/materials/materialList.cpp      |   2 +-
 Engine/source/materials/processedMaterial.cpp |   2 +-
 .../shaderGen/GLSL/shaderFeatureGLSL.cpp      |   1 +
 .../shaderGen/HLSL/shaderFeatureHLSL.cpp      |   9 +++++----
 Engine/source/terrain/terrData.cpp            |   1 -
 Engine/source/terrain/terrMaterial.cpp        |   8 ++++----
 Engine/source/ts/tsLastDetail.cpp             |   4 ++--
 .../materials/Blank_sky/BlankSkybox.png       | Bin 12332 -> 2799 bytes
 .../pre40/T3Dpre4ProjectImporter.tscript      |   4 +++-
 .../scripts/projectImporter.tscript           |   5 +----
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Engine/source/materials/materialList.cpp b/Engine/source/materials/materialList.cpp
index e2352321b..34dd104f3 100644
--- a/Engine/source/materials/materialList.cpp
+++ b/Engine/source/materials/materialList.cpp
@@ -365,7 +365,7 @@ void MaterialList::mapMaterial( U32 i )
             newMat->mAutoGenerated = true;
 
             // Overwrite diffuseMap in new material
-            newMat->mDiffuseMapName[0] = texHandle->mTextureLookupName;
+            newMat->_setDiffuseMap(texHandle->mTextureLookupName,0);
 
             // Set up some defaults for transparent textures
             if (texHandle->mHasTransparency)
diff --git a/Engine/source/materials/processedMaterial.cpp b/Engine/source/materials/processedMaterial.cpp
index 452b95edc..63150fd94 100644
--- a/Engine/source/materials/processedMaterial.cpp
+++ b/Engine/source/materials/processedMaterial.cpp
@@ -421,7 +421,7 @@ void ProcessedMaterial::_setStageData()
             //If we start with a #, we're probably actually attempting to hit a named target and it may not get a hit on the first pass. So we'll
             //pass on the error rather than spamming the console
             if (!String(mMaterial->mDiffuseMapName[i]).startsWith("#"))
-               mMaterial->logError("Failed to load diffuse map %s for stage %i", _getTexturePath(mMaterial->mDiffuseMapName[i]).c_str(), i);
+               mMaterial->logError("Failed to load diffuse map %s for stage %i", mMaterial->mDiffuseMapName[i], i);
 
             // Load a debug texture to make it clear to the user 
             // that the texture for this stage was missing.
diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
index 21755d80c..b6c825864 100644
--- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
+++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
@@ -2067,6 +2067,7 @@ RTLightingFeatGLSL::RTLightingFeatGLSL()
 void RTLightingFeatGLSL::processVert(  Vector<ShaderComponent*> &componentList, 
                                        const MaterialFeatureData &fd )
 {
+   if (fd.features[MFT_ImposterVert]) return;
 	MultiLine *meta = new MultiLine;
 	
 	ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
index 72252177a..bf826fea9 100644
--- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
+++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
@@ -2138,10 +2138,11 @@ RTLightingFeatHLSL::RTLightingFeatHLSL()
 void RTLightingFeatHLSL::processVert(  Vector<ShaderComponent*> &componentList, 
                                        const MaterialFeatureData &fd )
 {
+   if (fd.features[MFT_ImposterVert]) return;
+
    MultiLine *meta = new MultiLine;   
 
    ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
-   getOutWorldToTangent(componentList, meta, fd);
 
    // Special case for lighting imposters. We dont have a vert normal and may not
    // have a normal map. Generate and pass the normal data the pixel shader needs.
@@ -2206,6 +2207,7 @@ void RTLightingFeatHLSL::processVert(  Vector<ShaderComponent*> &componentList,
    }
 
    addOutWsPosition( componentList, fd.features[MFT_UseInstancing], meta );
+   getOutWorldToTangent(componentList, meta, fd);
 
    output = meta;
 }
@@ -3025,14 +3027,13 @@ void ReflectionProbeFeatHLSL::processVert(Vector<ShaderComponent*>& componentLis
    output = meta;
    // Also output the worldToTanget transform which
    // we use to create the world space normal.
-   getOutWorldToTangent(componentList, meta, fd);
+   //getOutWorldToTangent(componentList, meta, fd);
 }
 
 void ReflectionProbeFeatHLSL::processPix(Vector<ShaderComponent*> &componentList,
    const MaterialFeatureData &fd)
 {
-   // Skip out on realtime lighting if we don't have a normal
-   // or we're doing some sort of baked lighting.
+   // Skip out on realtime lighting if we're doing some sort of baked lighting.
    //
    // TODO: We can totally detect for this in the material
    // feature setup... we should move it out of here!
diff --git a/Engine/source/terrain/terrData.cpp b/Engine/source/terrain/terrData.cpp
index bc2121bef..a80e350f0 100644
--- a/Engine/source/terrain/terrData.cpp
+++ b/Engine/source/terrain/terrData.cpp
@@ -1419,7 +1419,6 @@ void TerrainBlock::unpackUpdate(NetConnection* con, BitStream *stream)
       char buffer[256];
       stream->readString(buffer);
       bool validAsset = setTerrainAsset(StringTable->insert(buffer));
-      _updateBaseTexture(NONE);
    }
    if (baseTexSizeChanged && isProperlyAdded())
       _updateBaseTexture(NONE);
diff --git a/Engine/source/terrain/terrMaterial.cpp b/Engine/source/terrain/terrMaterial.cpp
index 84dc0d9de..06b3b27bd 100644
--- a/Engine/source/terrain/terrMaterial.cpp
+++ b/Engine/source/terrain/terrMaterial.cpp
@@ -168,7 +168,7 @@ TerrainMaterial* TerrainMaterial::findOrCreate( const char *nameOrPath )
    {
       mat = new TerrainMaterial();
       mat->setInternalName( nameOrPath );
-      mat->mDiffuseMapName = nameOrPath;
+      mat->_setDiffuseMap(nameOrPath);
       mat->registerObject();
       Sim::getRootGroup()->addObject( mat );
       return mat;
@@ -183,11 +183,11 @@ TerrainMaterial* TerrainMaterial::findOrCreate( const char *nameOrPath )
       // fallback here just in case it gets "lost".
       mat = new TerrainMaterial();
       mat->setInternalName( "warning_material" );
-      mat->mDiffuseMapName = GFXTextureManager::getWarningTexturePath();
+      mat->_setDiffuseMap(GFXTextureManager::getWarningTexturePath());
       mat->mDiffuseSize = 500;
-      mat->mDiffuseMapName = GFXTextureManager::getWarningTexturePath();
+      mat->_setDetailMap(StringTable->EmptyString());
       mat->mDetailSize = 5;
-	   mat->mDiffuseMapName = GFXTextureManager::getWarningTexturePath();
+      mat->_setMacroMap(StringTable->EmptyString());
 	   mat->mMacroSize = 200;
       mat->registerObject();
       
diff --git a/Engine/source/ts/tsLastDetail.cpp b/Engine/source/ts/tsLastDetail.cpp
index 228d506ec..9af2c22fa 100644
--- a/Engine/source/ts/tsLastDetail.cpp
+++ b/Engine/source/ts/tsLastDetail.cpp
@@ -218,8 +218,8 @@ void TSLastDetail::update( bool forceUpdate )
    // Setup the material for this imposter.
    mMaterial = MATMGR->allocateAndRegister( String::EmptyString );
    mMaterial->mAutoGenerated = true;
-   mMaterial->mDiffuseMapName[0] = diffuseMapPath;
-   mMaterial->mNormalMapName[0] = _getNormalMapPath();
+   mMaterial->_setDiffuseMap(diffuseMapPath,0);
+   mMaterial->_setNormalMap(_getNormalMapPath(), 0);
    mMaterial->mImposterLimits.set( (mNumPolarSteps * 2) + 1, mNumEquatorSteps, mPolarAngle, mIncludePoles );
    mMaterial->mTranslucent = true;
    mMaterial->mTranslucentBlendOp = Material::None;
diff --git a/Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png b/Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkybox.png
index 69b986833429fac68bcf62380a11c3ae2872d705..9a60da1a251556534992169ce606cba61541c6d7 100644
GIT binary patch
literal 2799
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
BLmB`8

literal 12332
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
L0n#GDtULR^!Rexl

diff --git a/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript b/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript
index c762d3a11..ad44a398d 100644
--- a/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript
+++ b/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript
@@ -805,7 +805,9 @@ T3Dpre4ProjectImporter::genProcessor("GroundCover", "material materialAsset shap
 T3Dpre4ProjectImporter::genProcessor("GroundPlane", "material materialAsset");
 T3Dpre4ProjectImporter::genProcessor("LevelInfo", "accuTexture accuTextureAsset");
 T3Dpre4ProjectImporter::genProcessor("TSStatic", "shape shapeAsset shapeName shapeAsset");
-T3Dpre4ProjectImporter::genProcessor("TSForestItemData", "shape shapeAsset shapeName shapeAsset");
+T3Dpre4ProjectImporter::genProcessor("ForestItemData", "shape shapeAsset shapeName shapeAsset");
+//T3Dpre4ProjectImporter::genProcessor("TerrainBlock", "terrainFile terrainFileAsset");
+
 //==============================================================================
 // Levels
 //==============================================================================
diff --git a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
index ef465b989..bda65b92e 100644
--- a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
+++ b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
@@ -465,14 +465,11 @@ function processLegacyField(%line, %originalFieldName, %newFieldName)
      
       if(%assetId !$= "" && AssetDatabase.isDeclaredAsset(%assetId))
       {
-         //if (%assetId.getStatusString() $= "Ok")
          %outLine = strReplace(%outLine, %value, %assetId);
-         //else
-         //   error("Asset assignment failure:", %assetId, getStatusString());
       }
    }
    
-   if(%outLine !$= %line)
+   if((%outLine !$= %line)&&(%assetId.getStatusString() !$= "BadFileReference")&&(%assetId.getStatusString() !$= "Failed"))
    {
       echo("Legacy Project Importer - processing of legacy line: " @ %line @ " has been updated to: " @ %outLine);
       return %outLine;