TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into STBImageLoading-PR

Browse source
This commit is contained in:
marauder2k7 2024-01-21 20:14:53 +00:00
parent 8632468a9c f77663e2c9
commit 68a7dadd2b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -1196,6 +1196,7 @@ function MaterialEditorGui::guiSync( %this, %material )
MaterialEditorPropertiesWindow-->glowMulTextEdit.setText((%material).glowMul[%layer]);
MaterialEditorPropertiesWindow-->glowMulSlider.setValue((%material).glowMul[%layer]);
MaterialEditorPropertiesWindow-->glowCheckbox.setValue((%material).glow[%layer]);
MaterialEditorPropertiesWindow-->emissiveCheckbox.setValue((%material).emissive[%layer]);
MaterialEditorPropertiesWindow-->receiveShadowsCheckbox.setValue((%material).receiveShadows[%layer]);
MaterialEditorPropertiesWindow-->ignoreLightingCheckbox.setValue((%material).ignoreLighting[%layer]);
MaterialEditorPropertiesWindow-->parallaxTextEdit.setText((%material).parallaxScale[%layer]);
@ -2691,15 +2692,15 @@ function MaterialEditorGui::saveCompositeMap(%this)
%material = %this.currentMaterial;
%layer = %this.currentLayer;
%roughMap = %material.getRoughMap(%layer);
%aoMap = %material.getAOMap(%layer);
%roughMap = %material.getRoughMap(%layer);
%metalMap = %material.getMetalMap(%layer);
%roughness = %material.RoughnessChan[%layer];
%ao = %material.AOChan[%layer];
%roughness = %material.RoughnessChan[%layer];
%metal = %material.metalChan[%layer];
%channelKey = %roughness SPC %ao SPC %metal SPC 0;
%channelKey = %ao SPC %roughness SPC %metal SPC 3;
error("Storing: \"" @ %aoMap @"\" \""@ %roughMap @"\" \""@ %metalMap @"\" \""@ %channelKey @"\" \""@ %saveAs @"\"");
saveCompositeTexture(%aoMap,%roughMap,%metalMap,"",%channelKey, %saveAs);
%dlg.delete();