Merge branch 'MatInstanceViewer' of https://github.com/Areloch/Torque3D into Preview4_0

Fixed up forward IBL
Reimplemented old forward light shader code as a baseline so it can be updated to new PBR math
This commit is contained in:
Areloch 2019-06-27 00:36:56 -05:00
commit e5bbd12d4b
19 changed files with 696 additions and 127 deletions

View file

@ -14,11 +14,8 @@ singleton Material(Grid_512_Orange)
specularStrength0 = "25";
specular0 = "0.8 0.8 0.8 1";
specularPower0 = "0.25";
emissive[0] = "1";
emissive[0] = "0";
translucent = "1";
normalMap[0] = "data/pbr/images/FloorEbony_normal.png";
invertSmoothness[0] = "1";
roughMap[0] = "data/pbr/images/FloorEbony_rough.png";
aoMap[0] = "data/pbr/images/FloorEbony_ao.png";
metalMap[0] = "data/pbr/images/FloorEbony_metal.png";
};

View file

@ -269,5 +269,51 @@ new Scene(PbrMatTestLevel) {
canSave = "1";
canSaveDynamicFields = "1";
};
new ConvexShape() {
Material = "Grid_512_Orange";
position = "-0.957664 -2.14584 1.3379";
rotation = "1 0 0 0";
scale = "1 1 1";
canSave = "1";
canSaveDynamicFields = "1";
surface = "0 0 0 1 0 0 0.837898 0 0 0 1 1 0 1 1";
surface = "0 1 0 0 0 0 -0.837898 0 0 0 1 1 0 1 1";
surface = "0.707107 0 0 0.707106 0 0.847632 0 0 0 0 1 1 0 1 1";
surface = "0 0.707107 -0.707107 0 0 -0.847632 0 0 0 0 1 1 0 1 1";
surface = "0.5 0.5 -0.5 0.5 -0.412576 0 -1.53859e-07 0 0 0 1 1 0 1 1";
surface = "0.5 -0.5 0.5 0.5 0.412576 0 -1.53859e-07 0 0 0 1 1 0 1 1";
};
new PointLight() {
radius = "5";
isEnabled = "1";
color = "1 1 1 1";
brightness = "1";
castShadows = "0";
staticRefreshFreq = "250";
dynamicRefreshFreq = "8";
priority = "1";
animate = "1";
animationPeriod = "1";
animationPhase = "1";
flareScale = "1";
attenuationRatio = "0 1 1";
shadowType = "DualParaboloidSinglePass";
texSize = "512";
overDarkFactor = "2000 1000 500 100";
shadowDistance = "400";
shadowSoftness = "0.15";
numSplits = "1";
logWeight = "0.91";
fadeStartDistance = "0";
lastSplitTerrainOnly = "0";
representedInLightmap = "0";
shadowDarkenColor = "0 0 0 -1";
includeLightmappedGeometryInShadow = "0";
position = "-0.0881653 -2.35794 1.41582";
rotation = "1 0 0 0";
canSave = "1";
canSaveDynamicFields = "1";
};
};
//--- OBJECT WRITE END ---