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

GFX card profile config file logging moved to debug only

Browse source 
WIP mode of guiSliderCtrl to be a filled rectangle instead of a textured UI
Fixed bug with guiTextEditCtrl losing focus updating history passing malformed strings
Updated WIP options menu
Editor/Project settings WIP
Updated editor theme to be consistent, and feed off the editor settings
Updated popup menus to reference renamed profiles
Added more in-progress modules for examples/stress testing
This commit is contained in:
Areloch 2019-06-17 02:30:45 -05:00
parent 226529fd1b
commit f1777016b8
179 changed files with 10144 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Templates/BaseGame/game/data/pbr/levels/PbrMatTest.postfxpreset.cs Normal file
View file

@ -0,0 +1,53 @@
$PostFXManager::Settings::ColorCorrectionRamp = "core/postFX/images/null_color_ramp.png";
$PostFXManager::Settings::DOF::BlurCurveFar = "35.2804";
$PostFXManager::Settings::DOF::BlurCurveNear = "15.3488";
$PostFXManager::Settings::DOF::BlurMax = "0.897196";
$PostFXManager::Settings::DOF::BlurMin = "0.261682";
$PostFXManager::Settings::DOF::EnableAutoFocus = "1";
$PostFXManager::Settings::DOF::EnableDOF = "";
$PostFXManager::Settings::DOF::FocusRangeMax = "200.943";
$PostFXManager::Settings::DOF::FocusRangeMin = "60.7571";
$PostFXManager::Settings::EnableDOF = "1";
$PostFXManager::Settings::EnabledSSAO = "1";
$PostFXManager::Settings::EnableHDR = "1";
$PostFXManager::Settings::EnableLightRays = "0";
$PostFXManager::Settings::EnablePostFX = "1";
$PostFXManager::Settings::EnableSSAO = "1";
$PostFXManager::Settings::EnableVignette = "1";
$PostFXManager::Settings::HDR::adaptRate = "2.08";
$PostFXManager::Settings::HDR::blueShiftColor = "1.05 0.97 1.27";
$PostFXManager::Settings::HDR::brightPassThreshold = "0.842105";
$PostFXManager::Settings::HDR::enableBloom = 1;
$PostFXManager::Settings::HDR::enableBlueShift = 0;
$PostFXManager::Settings::HDR::enableToneMapping = "0";
$PostFXManager::Settings::HDR::gaussMean = "0.378947";
$PostFXManager::Settings::HDR::gaussMultiplier = "0.0529101";
$PostFXManager::Settings::HDR::gaussStdDev = "0.380952";
$PostFXManager::Settings::HDR::keyValue = "0.423469";
$PostFXManager::Settings::HDR::minLuminace = "0.0204082";
$PostFXManager::Settings::HDR::whiteCutoff = "0.30102";
$PostFXManager::Settings::LightRays::brightScalar = 0.75;
$PostFXManager::Settings::LightRays::decay = 1;
$PostFXManager::Settings::LightRays::density = 0.94;
$PostFXManager::Settings::LightRays::numSamples = 40;
$PostFXManager::Settings::LightRays::weight = 5.65;
$PostFXManager::Settings::SSAO::blurDepthTol = 0.001;
$PostFXManager::Settings::SSAO::blurNormalTol = 0.95;
$PostFXManager::Settings::SSAO::lDepthMax = 2;
$PostFXManager::Settings::SSAO::lDepthMin = 0.2;
$PostFXManager::Settings::SSAO::lDepthPow = 0.2;
$PostFXManager::Settings::SSAO::lNormalPow = 2;
$PostFXManager::Settings::SSAO::lNormalTol = -0.5;
$PostFXManager::Settings::SSAO::lRadius = 1;
$PostFXManager::Settings::SSAO::lStrength = 10;
$PostFXManager::Settings::SSAO::overallStrength = 2;
$PostFXManager::Settings::SSAO::quality = "2";
$PostFXManager::Settings::SSAO::sDepthMax = 1;
$PostFXManager::Settings::SSAO::sDepthMin = 0.1;
$PostFXManager::Settings::SSAO::sDepthPow = 1;
$PostFXManager::Settings::SSAO::sNormalPow = 1;
$PostFXManager::Settings::SSAO::sNormalTol = 0;
$PostFXManager::Settings::SSAO::sRadius = 0.1;
$PostFXManager::Settings::SSAO::sStrength = 6;
$PostFXManager::Settings::Vignette::VMax = 0.85391;
$PostFXManager::Settings::Vignette::VMin = 0.2;

BIN
Templates/BaseGame/game/data/ui/art/optionsMenuSliderBitmapArray.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Templates/BaseGame/game/data/ui/art/slider - Copy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 908 B

4
Templates/BaseGame/game/data/ui/scripts/guis/graphicsMenuSettingsSlider.taml
View file

@ -89,7 +89,9 @@
isContainer="false"
internalName="slider"
canSave="true"
canSaveDynamicFields="false" />
canSaveDynamicFields="false"
renderTicks="false"
useFillBar="true" />
<GuiTextCtrl
text="5"
maxLength="1024"

72
Templates/BaseGame/game/data/ui/scripts/optionsMenu.cs
View file

@ -66,34 +66,38 @@ function OptionsMenu::onWake(%this)
%array = OptionsSettingStack;
%array.clear();
%controllerMenuBtn = new GuiButtonCtrl(){
%keyboardMenuBtn = new GuiButtonCtrl(){
text = "Keyboard and Mouse";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
};
%displayMenuBtn = new GuiButtonCtrl(){
%controllerMenuBtn = new GuiButtonCtrl(){
text = "Controller";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="DisplayMenu::loadSettings();";
};
%keyboardMenuBtn = new GuiButtonCtrl(){
%displayMenuBtn = new GuiButtonCtrl(){
text = "Display";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="DisplayMenu::loadSettings();";
};
%graphicsMenuBtn = new GuiButtonCtrl(){
text = "Graphics";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="GraphicsMenu::loadSettings();";
};
%audioMenuBtn = new GuiButtonCtrl(){
text = "Audio";
profile = GuiMenuButtonProfile;
extent = %array.extent.x SPC "35";
command="AudioMenu::loadSettings();";
};
%gameplayMenuBtn = new GuiButtonCtrl(){
@ -236,7 +240,7 @@ function OptionsMenu::addSettingOption(%this, %arrayTarget, %optionName, %defaul
return %option;
}
function OptionsMenu::addSliderOption(%this, %arrayTarget, %optionName, %variable, %range, %ticks, %value, %class)
function OptionsMenu::addSliderOption(%this, %arrayTarget, %optionName, %variable, %range, %ticks, %value, %class)
{
%option = TAMLRead("data/ui/scripts/guis/graphicsMenuSettingsSlider.taml");
@ -620,3 +624,63 @@ function AudioMenuSoundDevice::onSelect( %this, %id, %text )
SPC $pref::SFX::device
SPC $pref::SFX::useHardware );
}
//==============================================================================
// DISPLAY MENU
//==============================================================================
function DisplayMenu::loadSettings()
{
OptionsSettingStack.clear();
OptionsMenu.addSettingOption(OptionsSettingStack, "Resolution", "1024 x 768", "", $pref::Video::Resolution);
OptionsMenu.addSettingOption(OptionsSettingStack, "Full Screen", "Off", "", $pref::Video::FullScreen);
OptionsMenu.addSettingOption(OptionsSettingStack, "Refresh Rate", "60", "", $pref::Video::RefreshRate);
OptionsMenu.addSettingOption(OptionsSettingStack, "VSync", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSliderOption(OptionsSettingStack, "Field of View", $pref::Video::FOV, "65 120", 55, 75);
OptionsMenu.addSliderOption(OptionsSettingStack, "Brightness", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Contrast", $pref::Video::Contrast, "0 1", 10, 5);
}
//==============================================================================
// GRAPHICS MENU
//==============================================================================
function GraphicsMenu::loadSettings()
{
OptionsSettingStack.clear();
OptionsMenu.addSettingOption(OptionsSettingStack, "Shadow Quality", "High", "", $pref::Video::Resolution);
OptionsMenu.addSettingOption(OptionsSettingStack, "Shadow Caching", "Off", "", $pref::Video::FullScreen);
OptionsMenu.addSettingOption(OptionsSettingStack, "Soft Shadows", "60", "", $pref::Video::RefreshRate);
OptionsMenu.addSettingOption(OptionsSettingStack, "Model Detail", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSliderOption(OptionsSettingStack, "Texture Detail", $pref::Video::FOV, "65 120", 55, 75);
OptionsMenu.addSettingOption(OptionsSettingStack, "Terrain Detail", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Decal Lifetime", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Ground Clutter Density", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Material Quality", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "HDR", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Parallax", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Ambient Occlusion", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Light Rays", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Depth of Field", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Vignetting", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Water Reflections", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Anti Aliasing", "Off", "", $pref::Video::Vsync);
OptionsMenu.addSettingOption(OptionsSettingStack, "Anisotropic Filtering", "Off", "", $pref::Video::Vsync);
}
//==============================================================================
// AUDIO MENU
//==============================================================================
function AudioMenu::loadSettings()
{
OptionsSettingStack.clear();
OptionsMenu.addSliderOption(OptionsSettingStack, "Master Volume", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Menu Volume", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Effects Volume", $pref::Video::Brightness, "0 1", 10, 5);
OptionsMenu.addSliderOption(OptionsSettingStack, "Music Volume", $pref::Video::Brightness, "0 1", 10, 5);
}

7
Templates/BaseGame/game/data/ui/scripts/profiles.cs
View file

@ -426,4 +426,11 @@ new GuiControlProfile(GuiMenuScrollProfile)
bitmap = "./images/scrollBar";
hasBitmapArray = true;
category = "Core";
};
singleton GuiControlProfile(SliderBitmapGUIProfile)
{
bitmap = "data/ui/art/optionsMenuSliderBitmapArray.png";
hasBitmapArray = true;
opaque = false;
};