From cb3f060644993db557494ce33305ffcbfac745f7 Mon Sep 17 00:00:00 2001 From: strongleong Date: Fri, 10 Feb 2023 19:09:41 +1100 Subject: [PATCH] Added menu for background blur --- .vimrc | 2 + Loader/scripts/init.py | 4 + ScorerPlayground/lang/English.txt | 10 ++ ScorerPlayground/lang/French.txt | 10 ++ ScorerPlayground/lang/German.txt | 10 ++ ScorerPlayground/lang/Italian.txt | 10 ++ ScorerPlayground/lang/Russian.txt | 6 + ScorerPlayground/lang/Spanish.txt | 10 ++ .../packed/scripts/scorer/blurmenu.py | 149 ++++++++++++++++++ .../packed/scripts/scorer/mymenu.py | 22 ++- .../packed/scripts/scorer/pcmenu.py | 2 +- 11 files changed, 228 insertions(+), 7 deletions(-) create mode 100644 ScorerPlayground/lang/English.txt create mode 100644 ScorerPlayground/lang/French.txt create mode 100644 ScorerPlayground/lang/German.txt create mode 100644 ScorerPlayground/lang/Italian.txt create mode 100644 ScorerPlayground/lang/Spanish.txt create mode 100644 ScorerPlayground/packed/scripts/scorer/blurmenu.py diff --git a/.vimrc b/.vimrc index 37fa565..5f47153 100644 --- a/.vimrc +++ b/.vimrc @@ -1,3 +1,5 @@ +" https://btw.i-use-ar.ch/s/ug6jd +" " %E%.%# %f:%l " %CLine | " %C %#%*[0123456789] %#| %.%# diff --git a/Loader/scripts/init.py b/Loader/scripts/init.py index 59567e5..8dc83c5 100644 --- a/Loader/scripts/init.py +++ b/Loader/scripts/init.py @@ -113,6 +113,10 @@ logger = Logger.Logger('Loader') logger.info('Logger initialized') logger.debug(logger) +logger.info('Preloading Blur Menu...') +Scrap.PreloadLibrary('BlurMenu','Scorer/BlurMenu.pyc') +logger.info('Blur Menu preloaded') + logger.info('Preloading MyMenu...') Scrap.PreloadLibrary('MyMenu','Scorer/MyMenu.pyc') logger.info('MyMenu preloaded') diff --git a/ScorerPlayground/lang/English.txt b/ScorerPlayground/lang/English.txt new file mode 100644 index 0000000..79dfc7b --- /dev/null +++ b/ScorerPlayground/lang/English.txt @@ -0,0 +1,10 @@ +Menu_Options_MyMenu My custom options menu +My_Menu_Test_Bool Test Boolean +My_Menu_Test_Counter Test Counter +My_Menu_Test_Slider Test Slider +BlurMenu_Menu Blur Menu +BlurMenu_OffVar Off Var +BlurMenu_Time Time +BlurMenu_EndTime End Time +BlurMenu_FactorBegin Factor Begin +BlurMenu_FactorEnd Factor End diff --git a/ScorerPlayground/lang/French.txt b/ScorerPlayground/lang/French.txt new file mode 100644 index 0000000..79dfc7b --- /dev/null +++ b/ScorerPlayground/lang/French.txt @@ -0,0 +1,10 @@ +Menu_Options_MyMenu My custom options menu +My_Menu_Test_Bool Test Boolean +My_Menu_Test_Counter Test Counter +My_Menu_Test_Slider Test Slider +BlurMenu_Menu Blur Menu +BlurMenu_OffVar Off Var +BlurMenu_Time Time +BlurMenu_EndTime End Time +BlurMenu_FactorBegin Factor Begin +BlurMenu_FactorEnd Factor End diff --git a/ScorerPlayground/lang/German.txt b/ScorerPlayground/lang/German.txt new file mode 100644 index 0000000..79dfc7b --- /dev/null +++ b/ScorerPlayground/lang/German.txt @@ -0,0 +1,10 @@ +Menu_Options_MyMenu My custom options menu +My_Menu_Test_Bool Test Boolean +My_Menu_Test_Counter Test Counter +My_Menu_Test_Slider Test Slider +BlurMenu_Menu Blur Menu +BlurMenu_OffVar Off Var +BlurMenu_Time Time +BlurMenu_EndTime End Time +BlurMenu_FactorBegin Factor Begin +BlurMenu_FactorEnd Factor End diff --git a/ScorerPlayground/lang/Italian.txt b/ScorerPlayground/lang/Italian.txt new file mode 100644 index 0000000..79dfc7b --- /dev/null +++ b/ScorerPlayground/lang/Italian.txt @@ -0,0 +1,10 @@ +Menu_Options_MyMenu My custom options menu +My_Menu_Test_Bool Test Boolean +My_Menu_Test_Counter Test Counter +My_Menu_Test_Slider Test Slider +BlurMenu_Menu Blur Menu +BlurMenu_OffVar Off Var +BlurMenu_Time Time +BlurMenu_EndTime End Time +BlurMenu_FactorBegin Factor Begin +BlurMenu_FactorEnd Factor End diff --git a/ScorerPlayground/lang/Russian.txt b/ScorerPlayground/lang/Russian.txt index 45590d3..79dfc7b 100644 --- a/ScorerPlayground/lang/Russian.txt +++ b/ScorerPlayground/lang/Russian.txt @@ -2,3 +2,9 @@ Menu_Options_MyMenu My custom options menu My_Menu_Test_Bool Test Boolean My_Menu_Test_Counter Test Counter My_Menu_Test_Slider Test Slider +BlurMenu_Menu Blur Menu +BlurMenu_OffVar Off Var +BlurMenu_Time Time +BlurMenu_EndTime End Time +BlurMenu_FactorBegin Factor Begin +BlurMenu_FactorEnd Factor End diff --git a/ScorerPlayground/lang/Spanish.txt b/ScorerPlayground/lang/Spanish.txt new file mode 100644 index 0000000..79dfc7b --- /dev/null +++ b/ScorerPlayground/lang/Spanish.txt @@ -0,0 +1,10 @@ +Menu_Options_MyMenu My custom options menu +My_Menu_Test_Bool Test Boolean +My_Menu_Test_Counter Test Counter +My_Menu_Test_Slider Test Slider +BlurMenu_Menu Blur Menu +BlurMenu_OffVar Off Var +BlurMenu_Time Time +BlurMenu_EndTime End Time +BlurMenu_FactorBegin Factor Begin +BlurMenu_FactorEnd Factor End diff --git a/ScorerPlayground/packed/scripts/scorer/blurmenu.py b/ScorerPlayground/packed/scripts/scorer/blurmenu.py new file mode 100644 index 0000000..606f03a --- /dev/null +++ b/ScorerPlayground/packed/scripts/scorer/blurmenu.py @@ -0,0 +1,149 @@ +import Scrap,SInput,SNet,SWeap,SScorer,SVec + +logger = None + +try: + logger = __import__("Logger").Logger("BlurMenu") +except Exception: + pass + +def log(msg): + if logger is not None: + logger.info(msg) + else: + Scrap.Print("[STRNG][BlurMenu] " + str(msg) + "\n") + +log("Starting module") + + +MotionBlurOffVar = 0 +MotionBlurTime = 0 +MotionBlurEndTime = 0 +MotionBlurFactorBegin = 0 +MotionBlurFactorEnd = 0 + + +Menu = None + +class Slider: + def __init__( + self, + id, + name, + x, + y, + min = 0, + max = 1, + value = 0, + step = 0.1, + onChange = None, + onSub = None, + onAdd = None, + itemNum = None, + ): + self.id = id + self.name = name + self.x = x + self.y = y + self.min = min + self.max = max + self.value = value + self.step = step + self.onChange = onChange + self.onSub = onSub + self.onAdd = onAdd + self.itemNum = itemNum + + def Create(self): + import Menu + + Menu.SliderMenu(self.id, self.name, self.x, self.y) + + SScorer.Set(self.id, self.name, "MaxValue", self.max ) + SScorer.Set(self.id, self.name, "MinValue", self.min ) + SScorer.Set(self.id, self.name, "ValueStep", self.step ) + SScorer.Set(self.id, self.name, "Value", self.value) + + if self.onChange: + SScorer.Set(self.id, self.name, "OnChange", self.onChange) + + if self.onSub: + name = self.name + "_Sub" + SScorer.Add(self.id, name, "Text" ) + SScorer.Set(self.id, name, "Text", "" ) + SScorer.Set(self.id, name, "W", 0 ) + SScorer.Set(self.id, name, "H", 0 ) + SScorer.Set(self.id, name, "OnGainFocus", self.onAdd) + + if self.onAdd: + name = self.name + "_Add" + SScorer.Add(self.id, name, "Text" ) + SScorer.Set(self.id, name, "Text", "" ) + SScorer.Set(self.id, name, "W", 0 ) + SScorer.Set(self.id, name, "H", 0 ) + SScorer.Set(self.id, name, "OnGainFocus", self.onAdd) + + if self.itemNum: + itemStr = "Item" + str(self.itemNum) + + Menu.LinkLR(self.id, self.name, itemStr ) + Menu.LinkLR(self.id, itemStr, self.name) + + if self.itemNum and self.onSub: + Menu.LinkLR(self.id, "DummySliderSub", itemStr) + + if self.itemNum and self.onAdd: + Menu.LinkLR(self.id, itemStr, "DummySliderAdd") + + +def BlurMenu(id, control): + import Menu + log("Creating trip menu") + + Menu.StartNewMenu(id) + Menu.VerticalMenu(id, Scrap.GetLangStr("Menu_Options_MyMenu"),( + [Scrap.GetLangStr("BlurMenu_OffVar") + ":", "Menu.DummyFunc"] , + [Scrap.GetLangStr("BlurMenu_Time") + ":", "Menu.DummyFunc"] , + [Scrap.GetLangStr("BlurMenu_EndTime") + ":", "Menu.DummyFunc"] , + [Scrap.GetLangStr("BlurMenu_FactorBegin") + ":", "Menu.DummyFunc"] , + [Scrap.GetLangStr("BlurMenu_FactorEnd") + ":", "Menu.DummyFunc"] , + [Scrap.GetLangStr("Menu_Back"),"Menu.OptionsMenu"]), + "Menu.OptionsMenu", XStart = 310, VerticalStep = 36, YStart = Menu.OptionMenuYStart, Font = "ScrapMedium") + + X = 330 + + sliders = ["OffVar", "Time", "EndTime", "FactorBegin", "FactorEnd"] + for i in range(len(sliders)): + sliderName = sliders[i] + onChange = "BlurMenu.SetBlurVar" + onAdd = "BlurMenu.AddBlurVar" + onSub = "BlurMenu.SubBlurVar" + + Y = SScorer.Get(0, "Item" + str(i + 1), "Y") + 5 + + slider = Slider(id, sliderName, X, Y, 0.1, 1, 0.01, 0, onChange, onSub, onAdd, i) + slider.Create() + + Menu.DrawBackOptionMenu(id) + + +def SetBlurVar(id, control): + Scrap.Set("MotionBlur" + control, SScorer.Get(id, control, 'Value')) + +def AddBlurVar(id, control, prevcontrol): + name = control[:-4] + value = SScorer.Get(id, name, 'Value') + value_step = SScorer.Get(id, name, 'ValueStep') + result = value + value_step + + SScorer.Set(id, name, "Value", result) + SScorer.SetDefault(id, prevcontrol) + +def SubBlurVar(id, control, prevcontrol): + name = control[:-4] + value = SScorer.Get(id, name, 'Value') + value_step = SScorer.Get(id, name, 'ValueStep') + result = value - value_step + + SScorer.Set(id, name, "Value", result) + SScorer.SetDefault(id, prevcontrol) diff --git a/ScorerPlayground/packed/scripts/scorer/mymenu.py b/ScorerPlayground/packed/scripts/scorer/mymenu.py index 289d911..c2507a2 100644 --- a/ScorerPlayground/packed/scripts/scorer/mymenu.py +++ b/ScorerPlayground/packed/scripts/scorer/mymenu.py @@ -3,15 +3,24 @@ import Scrap,SInput,SNet,SWeap,SScorer,SVec logger = None try: - logger = __import__("Logger").Logger("Police") + logger = __import__("Logger").Logger("MyMenu") except Exception: pass -def log(msg): +def log(*args): if logger is not None: - logger.info(msg) + logger.info(args) else: - Scrap.Print("[STRNG][MyMenu] " + str(msg) + "\n") + args = list(args) + + for i in range(len(args)): + args[i] = str(args[i]) + if args[i] == None: + args[i] = "" + + args = ["[MyMenu]"] + args + msg = string.join(args, " ") + Scrap.Print(msg + "\n") log("Starting module") @@ -50,6 +59,7 @@ def MyMenu(id, control): [Scrap.GetLangStr("My_Menu_Test_Bool") + ":", "MyMenu.TestBool" ], [Scrap.GetLangStr("My_Menu_Test_Counter") + ":", "MyMenu.TestCounter" ], [Scrap.GetLangStr("My_Menu_Test_Slider") + ":", "Menu.DummyFunc" ], + [Scrap.GetLangStr("BlurMenu_Menu"),"BlurMenu.BlurMenu"], [Scrap.GetLangStr("Menu_Back"),"Menu.OptionsMenu"]), "Menu.OptionsMenu", XStart = 310, VerticalStep = 36, YStart = Menu.OptionMenuYStart, Font = "ScrapMedium") @@ -152,7 +162,7 @@ def TestSlider_Change(id, control): SetState('test_slider', SScorer.Get(id, 'TestSlider', 'Value')) def TestSlider_Sub(id, control, prevcontrol): - log('TestSlider_Sub') + log(id, control, prevcontrol) value = SScorer.Get(id, 'TestSlider', 'Value') value_step = SScorer.Get(id, 'TestSlider', 'ValueStep') result = value - value_step @@ -162,7 +172,7 @@ def TestSlider_Sub(id, control, prevcontrol): SScorer.SetDefault(id,prevcontrol) def TestSlider_Add(id, control, prevcontrol): - log('TestSlider_Add') + log(id, control, prevcontrol) value = SScorer.Get(id, 'TestSlider', 'Value') value_step = SScorer.Get(id, 'TestSlider', 'ValueStep') result = value + value_step diff --git a/ScorerPlayground/packed/scripts/scorer/pcmenu.py b/ScorerPlayground/packed/scripts/scorer/pcmenu.py index ab0b4a0..5f20636 100644 --- a/ScorerPlayground/packed/scripts/scorer/pcmenu.py +++ b/ScorerPlayground/packed/scripts/scorer/pcmenu.py @@ -3,7 +3,7 @@ import Scrap,SInput,SNet,SWeap,SScorer,SVec logger = None try: - logger = __import__("Logger").Logger("Police") + logger = __import__("Logger").Logger("PCMenu") except Exception: pass