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

Merge pull request #1519 from Azaezel/deferredShading

Browse source 
Deferred shading
This commit is contained in:
Areloch 2016-02-27 15:08:20 -06:00
commit 908be4818f
112 changed files with 2645 additions and 680 deletions
Download patch file Download diff file Expand all files Collapse all files

228
Templates/Full/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -1354,132 +1354,6 @@
bitmap = "tools/gui/images/delete";
};
};
new GuiBitmapCtrl(){
position="6 357";
extent ="175 2";
HorizSizing = "width";
bitmap ="tools/gui/images/separator-v";
};
new GuiContainer(){ // Environment Map
profile="ToolsGuiDefaultProfile";
isContainer = "1";
position = "6 359";
Extent = "185 52";
HorizSizing = "width";
new GuiBitmapCtrl() {
canSaveDynamicFields = "0";
internalName = "envMapDisplayBitmap";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "1 1";
Extent = "48 48";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "0";
Profile = "EditorTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "56 -3";
Extent = "72 18";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "Env Map";
maxLength = "1024";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "1 1";
Extent = "48 48";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "MaterialEditorGui.updateTextureMap(\"env\", 1);";
tooltipprofile = "ToolsGuiDefaultProfile";
ToolTip = "Change the active Environment Map for this layer.";
hovertime = "1000";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/materialEditor/gui/cubemapBtnBorder";
};
new GuiTextCtrl() {
canSaveDynamicFields = "0";
internalName = "envMapNameText";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiTextProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = "56 16";
Extent = "143 17";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "None";
maxLength = "1024";
};
new GuiButtonCtrl(){
profile="ToolsGuiButtonProfile";
text ="Edit";
HorizSizing = "left";
VertSizing = "bottom";
position = "134 34";
Extent = "40 16";
buttonType = "PushButton";
command="MaterialEditorGui.updateTextureMap(\"env\", 1);";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "left";
VertSizing = "bottom";
position = "177 34";
Extent = "16 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "MaterialEditorGui.updateTextureMap(\"env\", 0);";
hovertime = "1000";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
};
};
};
};
new GuiRolloutCtrl() {
@ -1491,6 +1365,7 @@
Position = "0 0";
Extent = "195 0";
Caption = "Accumulation Properties";
Expanded = false;
Margin = "-1 0 0 0";
DragSizable = false;
container = true;
@ -1967,6 +1842,7 @@
Position = "0 0";
Extent = "185 0";
Caption = "Lighting Properties";
Expanded = false;
Margin = "-1 0 0 0";
DragSizable = false;
container = true;
@ -2364,101 +2240,6 @@
useMouseEvents = "0";
useInactiveState = "0";
};
new GuiCheckBoxCtrl() {
canSaveDynamicFields = "0";
internalName = "subSurfaceCheckbox";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "8 46";
Extent = "79 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "MaterialEditorGui.updateActiveMaterial(\"subSurface[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());";
tooltipprofile = "ToolsGuiDefaultProfile";
ToolTip = "Enables the use of subsurface scattering for this layer.";
hovertime = "1000";
text = "Sub Surface";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
useInactiveState = "0";
};
new GuiSwatchButtonCtrl() {
canSaveDynamicFields = "0";
internalName = "subSurfaceColorSwatch";
Enabled = "1";
isContainer = "0";
Profile = "GuiInspectorSwatchButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "90 46";
Extent = "16 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "getColorF(materialEd_PreviewMaterial.subSurfaceColor[MaterialEditorGui.currentLayer], \"MaterialEditorGui.updateSubSurfaceColor\");";
tooltip = "Set the subsurface scattering color";
hovertime = "1000";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
};
new GuiTextEditCtrl() {
canSaveDynamicFields = "0";
internalName = "subSurfaceRolloffTextEdit";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "114 45";
Extent = "29 18";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltip = "Set the subsurface rolloff factor";
Command = "MaterialEditorGui.updateActiveMaterial(\"subSurfaceRolloff[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getText());";
hovertime = "1000";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "32";
maxLength = "5";
};
new GuiTextCtrl() {
HorizSizing = "right";
VertSizing = "bottom";
position = "9 65";
Extent = "89 16";
text = "Minnaert constant";
};
new GuiTextEditCtrl() {
canSaveDynamicFields = "0";
internalName = "minnaertTextEdit";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "114 65";
Extent = "29 18";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "MaterialEditorGui.updateActiveMaterial(\"minnaertConstant[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getText());";
hovertime = "1000";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
text = "32";
maxLength = "3";
};
};
};
};
@ -2471,9 +2252,9 @@
Position = "0 0";
Extent = "185 0";
Caption = "Animation Properties";
Expanded = false;
Margin = "-1 0 0 0";
DragSizable = false;
Expanded = false;
container = true;
parentRollout = %this.rollout;
object = %behavior;
@ -3283,6 +3064,7 @@
Position = "0 0";
Extent = "202 0";
Caption = "Advanced (all layers)";
Expanded = false;
Margin = "4 4 4 0";
DragSizable = false;
container = true;
@ -3519,7 +3301,7 @@
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "100 56";
position = "105 55";
Extent = "85 16";
MinExtent = "8 2";
canSave = "1";

3
Templates/Full/game/tools/worldEditor/main.cs
View file

@ -120,6 +120,9 @@ function initializeWorldEditor()
EVisibility.addOption( "AL: Light Specular Viz", "$AL_LightSpecularVisualizeVar", "toggleLightSpecularViz" );
EVisibility.addOption( "AL: Normals Viz", "$AL_NormalsVisualizeVar", "toggleNormalsViz" );
EVisibility.addOption( "AL: Depth Viz", "$AL_DepthVisualizeVar", "toggleDepthViz" );
EVisibility.addOption( "AL: Color Buffer", "$AL_ColorBufferShaderVar", "toggleColorBufferViz" );
EVisibility.addOption( "AL: Spec Map", "$AL_SpecMapShaderVar", "toggleSpecMapViz");
EVisibility.addOption( "AL: Backbuffer", "$AL_BackbufferVisualizeVar", "toggleBackbufferViz" );
EVisibility.addOption( "AL: Glow Buffer", "$AL_GlowVisualizeVar", "toggleGlowViz" );
EVisibility.addOption( "AL: PSSM Cascade Viz", "$AL::PSSMDebugRender", "" );
EVisibility.addOption( "Frustum Lock", "$Scene::lockCull", "" );