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

Merge branch 'Misc-HDR-And-Levels' of https://github.com/vvv-yeaf/Torque3D into Misc-HDR-And-Levels

Browse source 
# Conflicts:
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
This commit is contained in:
vvv-yeaf 2022-09-11 18:46:51 -03:00
commit f08d2f74f8
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml
View file

@ -9,8 +9,7 @@
originalAssetName="FloorGray"> originalAssetName="FloorGray">
<Material.Stages> <Material.Stages>
<Stages_beginarray <Stages_beginarray
DiffuseMapAsset="Prototyping:FloorGray_ALBEDO" DiffuseMapAsset="Prototyping:FloorGray_ALBEDO"/>
Roughness="0.2"/>
</Material.Stages> </Material.Stages>
</Material> </Material>
</MaterialAsset> </MaterialAsset>

3
Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml
View file

@ -9,8 +9,7 @@
originalAssetName="WallOrange"> originalAssetName="WallOrange">
<Material.Stages> <Material.Stages>
<Stages_beginarray <Stages_beginarray
DiffuseMapAsset="Prototyping:WallOrange_ALBEDO" DiffuseMapAsset="Prototyping:WallOrange_ALBEDO"/>
Roughness="0.2"/>
</Material.Stages> </Material.Stages>
</Material> </Material>
</MaterialAsset> </MaterialAsset>