birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4232 from aws-lumberyard-dev/Atom/amzn-tommy/ATOM-16504_StandardMultilayerPBR_Displacement_nil

Browse Source 
Modify CalcOverallHeightRange to not return nil
This commit is contained in:
Guthrie Adams
2021-09-21 13:46:57 -05:00
committed by GitHub
parent ec4e6a6c35 c6ad920a46
commit 037d2f8cad
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli
+1
View File
@@ -104,6 +104,7 @@ option bool o_layer3_enabled;
enum class DebugDrawMode { None, BlendMask, Displacement, FinalBlendWeights };
option DebugDrawMode o_debugDrawMode;
// If you modify this enum, you must update the BlendSourceUsesDisplacement function in StandardMultilayerPBR_Displacement.lua
enum class LayerBlendSource { BlendMaskTexture, BlendMaskVertexColors, Displacement, Displacement_With_BlendMaskTexture, Displacement_With_BlendMaskVertexColors, Fallback };
option LayerBlendSource o_layerBlendSource;
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua
+3 -2
View File
@@ -88,7 +88,7 @@ end
-- @return a table with two values {min,max}. Negative values are below the surface and positive values are above the surface.
function CalcOverallHeightRange(context)
local heightMinMax = {nil, nil}
local heightMinMax = {}
local function GetMergedHeightRange(heightMinMax, offset, factor)
top = offset
@@ -138,7 +138,8 @@ function CalcOverallHeightRange(context)
if(enableLayer3) then GetMergedHeightRange(heightMinMax, offsetLayer3, factorLayer3) end
else
heightMinMax = {0,0}
heightMinMax[0] = 0
heightMinMax[1] = 0
end
return heightMinMax