Merge pull request #1442 from Azaezel/shadow_caching

This all seems to work pretty well.
This commit is contained in:
Areloch 2015-11-12 12:49:58 -06:00
commit 92aa785bb2
61 changed files with 1490 additions and 466 deletions

View file

@ -3309,7 +3309,7 @@
HorizSizing = "width";
VertSizing = "bottom";
Position = "0 0";
Extent = "210 71";
Extent = "210 89";
new GuiPopUpMenuCtrl() {
internalName = "blendingTypePopUp";
@ -3480,7 +3480,7 @@
Visible = "1";
Command = "MaterialEditorGui.updateActiveMaterial(\"castShadows\", $ThisControl.getValue());";
tooltipprofile = "ToolsGuiDefaultProfile";
ToolTip = "Alows object to cast shadows.";
ToolTip = "Object casts shadows.";
hovertime = "1000";
text = "Cast Shadows";
groupNum = "-1";
@ -3488,6 +3488,29 @@
useMouseEvents = "0";
useInactiveState = "0";
};
new GuiCheckBoxCtrl() {
canSaveDynamicFields = "0";
internalName = "castDynamicShadows";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "3 70";
Extent = "112 16";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "MaterialEditorGui.updateActiveMaterial(\"castDynamicShadows\", $ThisControl.getValue());";
tooltipprofile = "ToolsGuiDefaultProfile";
ToolTip = "Object casts dynamic shadows.";
hovertime = "1000";
text = "Dynamic Shadows";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
useInactiveState = "0";
};
new GuiCheckBoxCtrl() {
canSaveDynamicFields = "0";
internalName = "doubleSidedCheckBox";

View file

@ -754,6 +754,7 @@ function MaterialEditorGui::guiSync( %this, %material )
MaterialEditorPropertiesWindow-->transZWriteCheckBox.setValue((%material).translucentZWrite);
MaterialEditorPropertiesWindow-->alphaTestCheckBox.setValue((%material).alphaTest);
MaterialEditorPropertiesWindow-->castShadows.setValue((%material).castShadows);
MaterialEditorPropertiesWindow-->castDynamicShadows.setValue((%material).castDynamicShadows);
MaterialEditorPropertiesWindow-->translucentCheckbox.setValue((%material).translucent);
switch$((%material).translucentBlendOp)