zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-22 12:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- more work on reverb menu.

Browse source
This commit is contained in:
Christoph Oelckers 2017-11-26 10:16:21 +01:00
parent 3ae5f8c09f
commit 78184ad6b5
4 changed files with 101 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/win32/eaxedit.cpp
View file

@ -1427,13 +1427,14 @@ DEFINE_ACTION_FUNCTION(DReverbEdit, SetValue)
PARAM_PROLOGUE; PARAM_PROLOGUE;
PARAM_INT(index); PARAM_INT(index);
PARAM_FLOAT(value); PARAM_FLOAT(value);
return 0; ACTION_RETURN_FLOAT(value);
return 1;
} }
DEFINE_ACTION_FUNCTION(DReverbEdit, GrayCheck) DEFINE_ACTION_FUNCTION(DReverbEdit, GrayCheck)
{ {
PARAM_PROLOGUE; PARAM_PROLOGUE;
ACTION_RETURN_BOOL(false); ACTION_RETURN_BOOL(true);
return 1; return 1;
} }
@ -1447,7 +1448,7 @@ DEFINE_ACTION_FUNCTION(DReverbEdit, GetSelectedEnvironment)
} }
if (numret > 0) if (numret > 0)
{ {
ret[0].SetString(CurrentEnv ? CurrentEnv->Name : nullptr); ret[0].SetString(CurrentEnv ? CurrentEnv->Name : "");
} }
return numret; return numret;
} }
@ -1486,6 +1487,7 @@ CCMD(selectenvironment)
if (!strcmp(env->Name, argv[1])) if (!strcmp(env->Name, argv[1]))
{ {
CurrentEnv = env; CurrentEnv = env;
SavedProperties = env->Properties;
if (eaxedit_test) ForcedEnvironment = env; if (eaxedit_test) ForcedEnvironment = env;
return; return;
} }
@ -1493,3 +1495,11 @@ CCMD(selectenvironment)
} }
CurrentEnv = nullptr; CurrentEnv = nullptr;
} }
CCMD(revertenvironment)
{
if (CurrentEnv != nullptr)
{
CurrentEnv->Properties = SavedProperties;
}
}

80
wadsrc/static/menudef.txt
View file

@ -2216,7 +2216,7 @@ OptionMenu "ReverbEdit" protected
StaticText " " StaticText " "
Submenu "New Environment", "ReverbNew" Submenu "New Environment", "ReverbNew"
Submenu "Save Environments", "ReverbSave" Submenu "Save Environments", "ReverbSave"
Submenu "Edit Environment", "ReverbEdit" Submenu "Edit Environment", "ReverbSettings"
} }
OptionMenu "ReverbSelect" protected OptionMenu "ReverbSelect" protected
@ -2226,40 +2226,44 @@ OptionMenu "ReverbSelect" protected
// filled in by code // filled in by code
} }
/* OptionMenu "ReverbSettings" protected
CONTROL "Reflections Scale",IDC_REFLECTIONSSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,353,70,10 {
CONTROL "Reflections Delay Scale",IDC_REFLECTIONSDELAYSCALE, Title "Edit Reverb Environment"
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,366,90,10 SafeCommand "Revert settings", "revertenvironment"
CONTROL "Decay Time Scale",IDC_DECAYTIMESCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,377,71,10 StaticText " "
CONTROL "Decay HF Limit",IDC_DECAYHFLIMIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,390,63,10 SliderReverbEditOption "Environment Size", 1, 100, 0.01, 3, 0
CONTROL "Reverb Scale",IDC_REVERBSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,353,58,10 SliderReverbEditOption "Environment Diffusion", 0, 10, 0.01, 3, 1
CONTROL "Reverb Delay Scale",IDC_REVERBDELAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,366,78,10 SliderReverbEditOption "Room", -10000, 0, 1, 0, 2
CONTROL "Echo Time Scale",IDC_ECHOTIMESCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,377,67,10 SliderReverbEditOption "Room HF", -10000, 0, 1, 0, 3
CONTROL "Modulation Time Scale",IDC_MODULATIONTIMESCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,390,86,10 SliderReverbEditOption "Room LF", -10000, 0, 1, 0, 4
LTEXT "Environment Size",IDC_STATIC,17,9,56,8,0,WS_EX_RIGHT SliderReverbEditOption "Decay Time", 1, 200, 0.01, 3, 5
LTEXT "Environment Diffusion",IDC_STATIC,2,22,71,8,0,WS_EX_RIGHT SliderReverbEditOption "Decay HF Ratio", 1, 20, 0.01, 3, 6
LTEXT "Room",IDC_STATIC,53,35,19,8,0,WS_EX_RIGHT SliderReverbEditOption "Decay LF Ratio", 1, 20, 0.01, 3, 7
LTEXT "Room HF",IDC_STATIC,43,48,30,8,0,WS_EX_RIGHT SliderReverbEditOption "Reflections", -10000, 1000, 1, 0, 8
LTEXT "Room LF",IDC_STATIC,45,60,28,8,0,WS_EX_RIGHT SliderReverbEditOption "Reflections Delay", 0, 0.3, 1, 3, 9
LTEXT "Decay Time",IDC_STATIC,35,74,38,8,0,WS_EX_RIGHT SliderReverbEditOption "Reflections Pan X", -2000, 2000, 1, 3, 10
LTEXT "Decay HF Ratio",IDC_STATIC,23,87,50,8,0,WS_EX_RIGHT SliderReverbEditOption "Reflections Pan Y", -2000, 2000, 1, 3, 11
LTEXT "Decay LF Ratio",IDC_STATIC,24,100,49,8,0,WS_EX_RIGHT SliderReverbEditOption "Reflections Pan Z", -2000, 2000, 1, 3, 12
LTEXT "Reflections",IDC_STATIC,37,113,36,8,0,WS_EX_RIGHT SliderReverbEditOption "Reverb", -10000, 2000, 1, 0, 13
LTEXT "Reflections Delay",IDC_STATIC,17,126,56,8,0,WS_EX_RIGHT SliderReverbEditOption "Reverb Delay", 0, 0.1, 0.01, 3, 14
LTEXT "Reflections Pan X",IDC_STATIC,17,267,56,8,0,WS_EX_RIGHT SliderReverbEditOption "Reverb Pan X", -2000, 2000, 1, 3, 15
LTEXT "Reflections Pan Y",IDC_STATIC,17,280,56,8,0,WS_EX_RIGHT SliderReverbEditOption "Reverb Pan Y", -2000, 2000, 1, 3, 16
LTEXT "Reflections Pan Z",IDC_STATIC,17,293,56,8,0,WS_EX_RIGHT SliderReverbEditOption "Reverb Pan Z", -2000, 2000, 1, 3, 17
LTEXT "Reverb",IDC_STATIC,49,137,24,8,0,WS_EX_RIGHT SliderReverbEditOption "Echo Time", 0.075, 0.25, 0.005, 3, 18
LTEXT "Reverb Delay",IDC_STATIC,29,150,44,8,0,WS_EX_RIGHT SliderReverbEditOption "Echo Depth", 0, 1, 0.01, 3, 19
LTEXT "Reverb Pan X",IDC_STATIC,29,306,44,8,0,WS_EX_RIGHT SliderReverbEditOption "Modulation Time", 0.04, 4, 0.01, 3, 20
LTEXT "Reverb Pan Y",IDC_STATIC,29,319,44,8,0,WS_EX_RIGHT SliderReverbEditOption "Modulation Depth",0, 1, 0.01, 3, 21
LTEXT "Reverb Pan Z",IDC_STATIC,29,332,44,8,0,WS_EX_RIGHT SliderReverbEditOption "Air Absorption HF", -100, 0, 0.01, 3, 22
LTEXT "Echo Time",IDC_STATIC,40,163,33,8,0,WS_EX_RIGHT SliderReverbEditOption "HF Reference", 10000, 200000, 1, 3, 23
LTEXT "Echo Depth",IDC_STATIC,35,176,38,8,0,WS_EX_RIGHT SliderReverbEditOption "LF Reference",20, 10000, 0.1, 3, 24
LTEXT "Modulation Time",IDC_STATIC,21,189,52,8,0,WS_EX_RIGHT SliderReverbEditOption "Room Rolloff Factor",0, 10, 0.01, 3, 25
LTEXT "Modulation Depth",IDC_STATIC,16,202,57,8,0,WS_EX_RIGHT StaticText " "
LTEXT "Air Absorption HF",IDC_STATIC,16,215,57,8,0,WS_EX_RIGHT ReverbOption "Reflections Scale", 26, OnOff
LTEXT "HF Reference",IDC_STATIC,28,228,45,8,0,WS_EX_RIGHT ReverbOption "Reflections Delay Scale", 27, OnOff
LTEXT "LF Reference",IDC_STATIC,29,241,44,8,0,WS_EX_RIGHT ReverbOption "Decay Time Scale", 28, OnOff
LTEXT "Room Rolloff Factor",IDC_STATIC,9,254,64,8,0,WS_EX_RIGHT ReverbOption "Decay HF Limit", 29, OnOff
*/ ReverbOption "Reverb Scale", 30, OnOff
ReverbOption "Reverb Delay Scale", 31, OnOff
ReverbOption "Echo Time Scale", 32, OnOff
ReverbOption "Modulation Time Scale", 33, OnOff
}

9
wadsrc/static/zscript/menu/optionmenuitems.txt
View file

@ -254,7 +254,7 @@ class OptionMenuItemOptionBase : OptionMenuItem
//============================================================================= //=============================================================================
override int Draw(OptionMenuDescriptor desc, int y, int indent, bool selected) override int Draw(OptionMenuDescriptor desc, int y, int indent, bool selected)
{ {
bool grayed = mGrayCheck != null && !(mGrayCheck.GetInt()); bool grayed = isGrayed();
if (mCenter) if (mCenter)
{ {
@ -300,9 +300,14 @@ class OptionMenuItemOptionBase : OptionMenuItem
return true; return true;
} }
virtual bool isGrayed()
{
return mGrayCheck != null && !mGrayCheck.GetInt();
}
override bool Selectable() override bool Selectable()
{ {
return mGrayCheck == null || mGrayCheck.GetInt(); return !isGrayed();
} }
} }

41
wadsrc/static/zscript/menu/reverbedit.txt
View file

@ -2,7 +2,7 @@
class ReverbEdit : OptionMenu class ReverbEdit : OptionMenu
{ {
static native double GetValue(int index); static native double GetValue(int index);
static native void SetValue(int index, double value); static native double SetValue(int index, double value);
static native bool GrayCheck(); static native bool GrayCheck();
static native string, int GetSelectedEnvironment(); static native string, int GetSelectedEnvironment();
static native void FillSelectMenu(OptionMenuDescriptor desc); static native void FillSelectMenu(OptionMenuDescriptor desc);
@ -100,13 +100,46 @@ class OptionMenuItemReverbEditSelected : OptionMenuItemSubMenu
// //
//============================================================================= //=============================================================================
class OptionMenuSliderReverbEditOption : OptionMenuSliderBase class OptionMenuItemReverbOption : OptionMenuItemOptionBase
{
int mValIndex;
OptionMenuItemReverbOption Init(String label, int valindex, Name values)
{
Super.Init(label, "", values, null, false);
mValIndex = valindex;
return self;
}
override bool isGrayed()
{
return ReverbEdit.GrayCheck();
}
override int GetSelection()
{
return int(ReverbEdit.GetValue(mValIndex));
}
override void SetSelection(int Selection)
{
ReverbEdit.SetValue(mValIndex, Selection);
}
}
//=============================================================================
//
//
//
//=============================================================================
class OptionMenuItemSliderReverbEditOption : OptionMenuSliderBase
{ {
int mValIndex; int mValIndex;
String mEditValue; String mEditValue;
TextEnterMenu mEnter; TextEnterMenu mEnter;
OptionMenuSliderReverbEditOption Init(String label, double min, double max, double step, int showval, int valindex) OptionMenuItemSliderReverbEditOption Init(String label, double min, double max, double step, int showval, int valindex)
{ {
Super.Init(label, min, max, step, showval); Super.Init(label, min, max, step, showval);
mValIndex = valindex; mValIndex = valindex;
@ -127,7 +160,7 @@ class OptionMenuSliderReverbEditOption : OptionMenuSliderBase
override bool Selectable() override bool Selectable()
{ {
return ReverbEdit.GrayCheck(); return !ReverbEdit.GrayCheck();
} }
virtual String Represent() virtual String Represent()