diff --git a/Common/UI/View.h b/Common/UI/View.h index 0d52216771..1ab1ea5f68 100644 --- a/Common/UI/View.h +++ b/Common/UI/View.h @@ -287,6 +287,13 @@ struct Margins { int vert() const { return top + bottom; } + void SetAll(float f) { + int8_t i = (int)f; + top = i; + bottom = i; + left = i; + right = i; + } int8_t top; int8_t bottom; diff --git a/Common/UI/ViewGroup.cpp b/Common/UI/ViewGroup.cpp index f32bd6fd37..50398dac45 100644 --- a/Common/UI/ViewGroup.cpp +++ b/Common/UI/ViewGroup.cpp @@ -539,19 +539,19 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v MeasureSpec v = vert; if (v.type == UNSPECIFIED && measuredHeight_ != 0.0f) v = MeasureSpec(AT_MOST, measuredHeight_); - view->Measure(dc, MeasureSpec(UNSPECIFIED, measuredWidth_), v - (float)margins.vert()); - if (horiz.type == AT_MOST && view->GetMeasuredWidth() + margins.horiz() > horiz.size - weightZeroSum) { + view->Measure(dc, MeasureSpec(UNSPECIFIED, measuredWidth_), v - (float)margins.vert() - (float)padding.vert()); + if (horiz.type == AT_MOST && view->GetMeasuredWidth() + margins.horiz() + padding.horiz() > horiz.size - weightZeroSum) { // Try again, this time with AT_MOST. - view->Measure(dc, horiz, v - (float)margins.vert()); + view->Measure(dc, horiz, v - (float)margins.vert() - (float)padding.vert()); } } else if (orientation_ == ORIENT_VERTICAL) { MeasureSpec h = horiz; if (h.type == UNSPECIFIED && measuredWidth_ != 0.0f) h = MeasureSpec(AT_MOST, measuredWidth_); - view->Measure(dc, h - (float)margins.horiz(), MeasureSpec(UNSPECIFIED, measuredHeight_)); - if (vert.type == AT_MOST && view->GetMeasuredHeight() + margins.vert() > vert.size - weightZeroSum) { + view->Measure(dc, h - (float)margins.horiz() - (float)padding.horiz(), MeasureSpec(UNSPECIFIED, measuredHeight_)); + if (vert.type == AT_MOST && view->GetMeasuredHeight() + margins.vert() + padding.horiz() > vert.size - weightZeroSum) { // Try again, this time with AT_MOST. - view->Measure(dc, h - (float)margins.horiz(), vert); + view->Measure(dc, h - (float)margins.horiz() - (float)padding.horiz(), vert); } } @@ -575,12 +575,12 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v } } - weightZeroSum += spacing_ * (numVisible - 1); + weightZeroSum += spacing_ * (numVisible - 1); // +(orientation_ == ORIENT_HORIZONTAL) ? padding.horiz() : padding.vert(); // Alright, got the sum. Let's take the remaining space after the fixed-size views, // and distribute among the weighted ones. if (orientation_ == ORIENT_HORIZONTAL) { - MeasureBySpec(layoutParams_->width, weightZeroSum, horiz, &measuredWidth_); + MeasureBySpec(layoutParams_->width, weightZeroSum + padding.horiz(), horiz, &measuredWidth_); // If we've got stretch, allow growing to fill the parent. float allowedWidth = measuredWidth_; @@ -588,7 +588,7 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v allowedWidth = horiz.size; } - float usedWidth = 0.0f; + float usedWidth = 0.0f + padding.horiz(); // Redistribute the stretchy ones! and remeasure the children! for (View *view : views_) { @@ -615,7 +615,7 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v if (horiz.type == EXACTLY) { h.type = EXACTLY; } - view->Measure(dc, h, v - (float)margins.vert()); + view->Measure(dc, h, v - (float)margins.vert() - (float)padding.vert()); usedWidth += view->GetMeasuredWidth(); maxOther = std::max(maxOther, view->GetMeasuredHeight() + margins.vert()); } @@ -626,9 +626,9 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v } // Measure here in case maxOther moved (can happen due to word wrap.) - MeasureBySpec(layoutParams_->height, maxOther, vert, &measuredHeight_); + MeasureBySpec(layoutParams_->height, maxOther + padding.vert(), vert, &measuredHeight_); } else { - MeasureBySpec(layoutParams_->height, weightZeroSum, vert, &measuredHeight_); + MeasureBySpec(layoutParams_->height, weightZeroSum + padding.vert(), vert, &measuredHeight_); // If we've got stretch, allow growing to fill the parent. float allowedHeight = measuredHeight_; @@ -636,7 +636,7 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v allowedHeight = vert.size; } - float usedHeight = 0.0f; + float usedHeight = 0.0f + padding.vert(); // Redistribute the stretchy ones! and remeasure the children! for (View *view : views_) { @@ -663,7 +663,7 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v if (vert.type == EXACTLY) { v.type = EXACTLY; } - view->Measure(dc, h - (float)margins.horiz(), v); + view->Measure(dc, h - (float)margins.horiz() - (float)padding.horiz(), v); usedHeight += view->GetMeasuredHeight(); maxOther = std::max(maxOther, view->GetMeasuredWidth() + margins.horiz()); } @@ -674,7 +674,7 @@ void LinearLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec v } // Measure here in case maxOther moved (can happen due to word wrap.) - MeasureBySpec(layoutParams_->width, maxOther, horiz, &measuredWidth_); + MeasureBySpec(layoutParams_->width, maxOther + padding.horiz(), horiz, &measuredWidth_); } } @@ -686,13 +686,13 @@ void LinearLayout::Layout() { float pos; if (orientation_ == ORIENT_HORIZONTAL) { - pos = bounds.x; - itemBounds.y = bounds.y; - itemBounds.h = measuredHeight_; + pos = bounds.x + padding.left; + itemBounds.y = bounds.y + padding.top; + itemBounds.h = measuredHeight_ - padding.vert(); } else { - pos = bounds.y; - itemBounds.x = bounds.x; - itemBounds.w = measuredWidth_; + pos = bounds.y + padding.top; + itemBounds.x = bounds.x + padding.left; + itemBounds.w = measuredWidth_ - padding.horiz(); } for (size_t i = 0; i < views_.size(); i++) { @@ -928,6 +928,8 @@ void ScrollView::Draw(UIContext &dc) { } dc.PushScissor(bounds_); + dc.FillRect(bg_, bounds_); + // For debugging layout issues, this can be useful. // dc.FillRect(Drawable(0x60FF00FF), bounds_); views_[0]->Draw(dc); diff --git a/Common/UI/ViewGroup.h b/Common/UI/ViewGroup.h index 78c42e84b1..d408548b69 100644 --- a/Common/UI/ViewGroup.h +++ b/Common/UI/ViewGroup.h @@ -106,6 +106,7 @@ protected: // It simply centers the child view. class FrameLayout : public ViewGroup { public: + FrameLayout(LayoutParams *layoutParams = nullptr) : ViewGroup(layoutParams) {} void Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec vert) override; void Layout() override; }; @@ -193,6 +194,7 @@ public: spacing_ = spacing; } std::string DescribeLog() const override { return (orientation_ == ORIENT_HORIZONTAL ? "LinearLayoutHoriz: " : "LinearLayoutVert: ") + View::DescribeLog(); } + Margins padding; protected: Orientation orientation_; diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp index 636c1b39e8..0cf1971e53 100644 --- a/GPU/Common/PostShader.cpp +++ b/GPU/Common/PostShader.cpp @@ -250,6 +250,16 @@ void ReloadAllPostShaderInfo(Draw::DrawContext *draw) { LoadPostShaderInfo(draw, directories); } +void RemoveUnknownPostShaders(std::vector *names) { + for (auto iter = names->begin(); iter != names->end(); ) { + if (GetPostShaderInfo(*iter) == nullptr) { + iter = names->erase(iter); + } else { + ++iter; + } + } +} + const ShaderInfo *GetPostShaderInfo(const std::string &name) { for (size_t i = 0; i < shaderInfo.size(); i++) { if (shaderInfo[i].section == name) diff --git a/GPU/Common/PostShader.h b/GPU/Common/PostShader.h index 06fc69a159..4b4061988c 100644 --- a/GPU/Common/PostShader.h +++ b/GPU/Common/PostShader.h @@ -114,3 +114,4 @@ const std::vector &GetAllPostShaderInfo(); const TextureShaderInfo *GetTextureShaderInfo(const std::string &name); const std::vector &GetAllTextureShaderInfo(); +void RemoveUnknownPostShaders(std::vector *names); diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp index e07eec1499..f8837e2808 100644 --- a/GPU/Common/PresentationCommon.cpp +++ b/GPU/Common/PresentationCommon.cpp @@ -879,6 +879,7 @@ void PresentationCommon::CalculateRenderResolution(int *width, int *height, int std::vector shaderInfo; if (!g_Config.vPostShaderNames.empty()) { ReloadAllPostShaderInfo(draw_); + RemoveUnknownPostShaders(&g_Config.vPostShaderNames); shaderInfo = GetFullPostShadersChain(g_Config.vPostShaderNames); } diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 432e3b5eaa..4764b069f0 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -203,14 +203,16 @@ void DisplayLayoutScreen::CreateViews() { // impossible. root_->SetExclusiveTouch(true); - ScrollView *leftScrollView = new ScrollView(ORIENT_VERTICAL, new AnchorLayoutParams(400.0f, FILL_PARENT, 10.f, 10.f, NONE, 10.f, false)); - ViewGroup *leftColumn = new LinearLayout(ORIENT_VERTICAL); + ScrollView *leftScrollView = new ScrollView(ORIENT_VERTICAL, new AnchorLayoutParams(420.0f, FILL_PARENT, 0.f, 0.f, NONE, 0.f, false)); + LinearLayout *leftColumn = new LinearLayout(ORIENT_VERTICAL); + leftColumn->padding.SetAll(8.0f); leftScrollView->Add(leftColumn); leftScrollView->SetClickableBackground(true); root_->Add(leftScrollView); - ScrollView *rightScrollView = new ScrollView(ORIENT_VERTICAL, new AnchorLayoutParams(300.0f, FILL_PARENT, NONE, 10.f, 10.f, 10.f, false)); - ViewGroup *rightColumn = new LinearLayout(ORIENT_VERTICAL); + ScrollView *rightScrollView = new ScrollView(ORIENT_VERTICAL, new AnchorLayoutParams(300.0f, FILL_PARENT, NONE, 0.f, 0.f, 0.f, false)); + LinearLayout *rightColumn = new LinearLayout(ORIENT_VERTICAL); + rightColumn->padding.SetAll(8.0f); rightScrollView->Add(rightColumn); rightScrollView->SetClickableBackground(true); root_->Add(rightScrollView); @@ -218,6 +220,11 @@ void DisplayLayoutScreen::CreateViews() { LinearLayout *bottomControls = new LinearLayout(ORIENT_HORIZONTAL, new AnchorLayoutParams(NONE, NONE, NONE, 10.0f, false)); root_->Add(bottomControls); + // Set backgrounds for readability + Drawable backgroundWithAlpha(GetBackgroundColorWithAlpha(*screenManager()->getUIContext())); + leftColumn->SetBG(backgroundWithAlpha); + rightColumn->SetBG(backgroundWithAlpha); + if (!IsVREnabled()) { auto stretch = new CheckBox(&g_Config.bDisplayStretch, gr->T("Stretch")); rightColumn->Add(stretch); @@ -273,7 +280,13 @@ void DisplayLayoutScreen::CreateViews() { leftColumn->Add(new ItemHeader(gr->T("Postprocessing shaders"))); std::set alreadyAddedShader; - settingsVisible_.resize(g_Config.vPostShaderNames.size()); + // If there's a single post shader and we're just entering the dialog, + // auto-open the settings. + if (settingsVisible_.empty() && g_Config.vPostShaderNames.size() == 1) { + settingsVisible_.push_back(true); + } else if (settingsVisible_.size() < g_Config.vPostShaderNames.size()) { + settingsVisible_.resize(g_Config.vPostShaderNames.size()); + } static ContextMenuItem postShaderContextMenu[] = { { "Move Up", "I_ARROW_UP" }, diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index e00ec856a0..f880935e08 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -356,6 +356,10 @@ void DrawBackground(UIContext &dc, float alpha, float x, float y, float z) { } } +uint32_t GetBackgroundColorWithAlpha(UIContext &dc) { + return colorAlpha(colorBlend(dc.GetTheme().backgroundColor, 0, 0.5f), 0.65f); // 0.65 = 166 = A6 +} + void DrawGameBackground(UIContext &dc, const Path &gamePath, float x, float y, float z, bool darkenBackground) { using namespace Draw; using namespace UI; @@ -379,7 +383,7 @@ void DrawGameBackground(UIContext &dc, const Path &gamePath, float x, float y, f dc.Begin(); if (darkenBackground) { - uint32_t color = colorAlpha(colorBlend(dc.GetTheme().backgroundColor, 0, 0.5f), 0.65f); + uint32_t color = GetBackgroundColorWithAlpha(dc); dc.FillRect(UI::Drawable(color), dc.GetBounds()); dc.Flush(); } diff --git a/UI/MiscScreens.h b/UI/MiscScreens.h index 07f544f855..d218739a78 100644 --- a/UI/MiscScreens.h +++ b/UI/MiscScreens.h @@ -192,3 +192,5 @@ private: float cutOffY_; bool showing_ = false; }; + +uint32_t GetBackgroundColorWithAlpha(UIContext &dc); diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj index 3b7f8013d4..5fcdbecf25 100644 --- a/UWP/UWP.vcxproj +++ b/UWP/UWP.vcxproj @@ -1597,34 +1597,6 @@ true true - - true - true - true - true - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - true - true - true - true - true true @@ -1774,4 +1746,4 @@ - \ No newline at end of file + diff --git a/UWP/UWP.vcxproj.filters b/UWP/UWP.vcxproj.filters index 03611fcc46..15c471b062 100644 --- a/UWP/UWP.vcxproj.filters +++ b/UWP/UWP.vcxproj.filters @@ -273,12 +273,6 @@ Content\shaders - - Content\shaders - - - Content\shaders - Content\flash0\font @@ -377,4 +371,4 @@ Content - \ No newline at end of file + diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 7fca56e265..0d636970f9 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -831,9 +831,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = ‎AA-لون Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -848,10 +848,8 @@ Contrast = Contrast CRT = ‎CRT خطوط الفحص FXAA = ‎FXAA منعم الحواف Gamma = Gamma -Grayscale = ‎التدرج الرمادي -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = ‎عكس الألوان MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = ‎الألوان الحقيقية NaturalA = Natural Colors (no blur) diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index 77b127ddd3..f113e191af 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 8448605e28..45755b3357 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Сива скала -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Противоположни цветове MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 6aaddb4987..4a96b71296 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 6870e757c8..cc316cb2ba 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Barva Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = Skenovací řádky CRT FXAA = Vyhlazování hran FXAA Gamma = Gamma -Grayscale = Stupně šedi -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverzní barvy MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Přirozené barvy NaturalA = Natural Colors (no blur) diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 26516055bc..d7a79a5173 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlinier FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Gråskala -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverterede farver MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Naturlige farver NaturalA = Natural Colors (no blur) diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index 9f351c67d8..4ff46ac564 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -824,8 +824,8 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) 4xHqGLSL = 4×HqGLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AAColor Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT Scanlines FXAA = FXAA Gamma = Gamma -Grayscale = Graustufen -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Farben invertieren MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natürliche Farben NaturalA = Natürliche Farben (kein Blur) diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index be19011bf0..cf02bd536c 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index e7d6e56f25..5d4213d734 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -818,9 +818,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Black border = Black border @@ -833,10 +833,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors Natural = Natural Colors NaturalA = Natural Colors (no blur) Off = Off diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index 0e08165255..2ba2f033d1 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -824,8 +824,8 @@ Undo last save = Deshacer guard. de estado [PostShaders] (duplicated setting, previous slider will be used) = (configuración duplicada, se usará la anterior) 4xHqGLSL = 4xHQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA + color Amount = Cantidad Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contraste CRT = Pantalla de tubo (CRT) FXAA = Antialiasing por FXAA Gamma = Gamma -Grayscale = Escala de grises -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensidad -InverseColors = Invertir colores MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Colores naturales NaturalA = Colores naturales (sin difuminar) diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index 1c60ffd956..cfa059c136 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -823,7 +823,7 @@ Undo last save = Deshacer guard. de estado [PostShaders] (duplicated setting, previous slider will be used) = (configuraciones duplicadas, se usará la anterior) -4xHqGLSL = 4×HQ GLSL +4xHqGLSL = 4xHQ pixel art upscaler 5xBR = 5×BR 5xBR-lv2 = 5×BR-lv2 AAColor = AA + Color @@ -840,10 +840,8 @@ Contrast = Contraste CRT = Pantalla de tubo (CRT) FXAA = Antialiasing por FXAA Gamma = Gamma -Grayscale = Escala de grises -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensidad -InverseColors = Invertir colores MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Colores naturales NaturalA = Colores naturales (sin desenfoques) diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index ce59fe1520..19dd0501ce 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 030b9adfbe..26e994dd7e 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index 20bf66436f..41875c547b 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -840,10 +840,8 @@ Contrast = Contraste CRT = Lignes de balayage CRT FXAA = Anticrénelage FXAA Gamma = Gamma -Grayscale = Niveaux de gris -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensité -InverseColors = Couleurs inversées MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Couleurs naturelles NaturalA = Couleurs naturelles (sans flou) diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index 5384d7b934..d202f17fcb 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA + cor Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = Monitor con «scanlines» (CRT) FXAA = Antialiasing FXAA Gamma = Gamma -Grayscale = Escala de grises -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Invertir cores MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Cores naturais NaturalA = Natural Colors (no blur) diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index 113602a7a2..240c2b50ed 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = Γραμμές σάρωσης CRT FXAA = Εξομάλυνση κορυφών FXAA Gamma = Gamma -Grayscale = Ασπρόμαυρο -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Αντιστροφή Χρωμάτων MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Φυσικά Χρώματα NaturalA = Natural Colors (no blur) diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index 3e1145ab04..9239455c89 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 5087eeb6ac..1d42057032 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index c39645fbd7..066ba47e75 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Izmijeni boje MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Prirodne boje NaturalA = Prirodne boje (bez zamućivanja) diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 71859b15d9..0579abd7c7 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Mennyiség Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Kontraszt CRT = CRT FXAA = FXAA élsimítás Gamma = Gamma -Grayscale = Szürkeárnyalatos -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Erősség -InverseColors = Színek megfordítása MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Természetes színek NaturalA = Természetes színek (elmosódás nélkül) diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index e821086ee2..2355e6feed 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -823,9 +823,9 @@ Undo last save = Urungkan penyimpanan terakhir [PostShaders] (duplicated setting, previous slider will be used) = (pengaturan duplikat, penggeser sebelumnya akan digunakan) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = Warna AA Amount = Nominal Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Kontras CRT = CRT FXAA = Mengurangi Artifak Distorsi (FXAA) Gamma = Gamma -Grayscale = Abu-abu -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensitas -InverseColors = Warna Terbalik MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Warna Natural NaturalA = Warna Natural (tidak kabur) diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 2e88064c95..14cafefb42 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -796,8 +796,8 @@ Undo last save = Annulla ultimo salvataggio [PostShaders] (duplicated setting, previous slider will be used) = (parametri duplicati, verrà usata la precedente regolazione) 4xHqGLSL = 4xHQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = Colore AA Amount = Quantità Animation speed (0 -> disable) = Velocità animazione (0 -> disabilita) @@ -812,10 +812,8 @@ Contrast = Contrasto CRT = Linee di scansione CRT FXAA = Antialiasing FXAA Gamma = Gamma -Grayscale = Scala di grigi -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensità -InverseColors = Colori invertiti MitchellNetravali = Upscaler Bicubico (Mitchell-Netravali) Natural = Colori naturali NaturalA = Colori naturali (nessuna sfocatura) diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index 4bb7bb99f2..f420a0646e 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -794,9 +794,9 @@ Undo last save = セーブ内容を戻す [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -811,10 +811,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index 595b012bcb..320fd6ba87 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Keabu-abuan -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Warna kebalik MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Warna Natural NaturalA = Natural Colors (no blur) diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index c7af635ae7..c99e778885 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -794,9 +794,9 @@ Undo last save = 마지막 저장 실행 취소 [PostShaders] (duplicated setting, previous slider will be used) = (설정이 중복되면 이전 슬라이더가 사용됩니다.) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-색상 Amount = 양 Black border = 검정 테두리 @@ -809,10 +809,8 @@ Contrast = 명암 CRT = CRT 스캔라인 FXAA = FXAA 안티 에일리어싱 Gamma = 감마 -Grayscale = 그레이스케일 -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = 강도 -InverseColors = 색 반전 Natural = 자연스러운 색상 NaturalA = 자연스러운 색상 (흐림 없음) Off = 끔 diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index b1cf4ebcbc..c1458dbc36 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT FXAA = FXAA Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = InverseColors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural NaturalA = Natural Colors (no blur) diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 2a64d882e3..646f2900a5 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Spalva Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT skenavimo linjos FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Perkeisti spalvas MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Naturalios spalvos NaturalA = Natural Colors (no blur) diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 4ecf0105ac..d991357c5c 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = Warna AA Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Anti aliasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Terbalikkan warna MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Warna asli NaturalA = Natural Colors (no blur) diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index cea29bbbc5..249efacdb9 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-kleur Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT-scanlijnen FXAA = FXAA-antialiasing Gamma = Gamma -Grayscale = Grijswaarden -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Omgekeerde kleuren MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natuurlijke kleuren NaturalA = Natural Colors (no blur) diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index d0808c29b7..bc11cc40a7 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Gråtoneskala -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index b01d9e8770..b194aebb45 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -824,8 +824,8 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) 4xHqGLSL = Skalowanie 4×HQ -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = Kolor AA Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = Imitacja monitora CRT FXAA = Wygładzanie FXAA Gamma = Gamma -Grayscale = Skala szarości -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Odwrócenie kolorów MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Naturalne kolory NaturalA = Naturalne kolory (bez rozmycia) diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index c58d1353b7..85916ba0d8 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -818,9 +818,9 @@ Undo last save = Desfazer o último salvamento [PostShaders] (duplicated setting, previous slider will be used) = (Configuração duplicada, o slider anterior será usado) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = Cores-do-AA Amount = Quantidade Black border = Borda preta @@ -833,10 +833,8 @@ Contrast = Contraste CRT = Scanlines do CRT FXAA = Anti-aliasing do FXAA Gamma = Gama -Grayscale = Tons de cinza GreenLevel = Nível verde Intensity = Intensidade -InverseColors = Cores invertidas Natural = Cores naturais NaturalA = Cores naturais (sem borrão) Off = Desligado diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index b5d98f0685..ed04174528 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -818,9 +818,9 @@ Undo last save = Desfazer o último salvamento [PostShaders] (duplicated setting, previous slider will be used) = (Definição duplicada, o slider anterior será usado) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = Cores-do-AA Amount = Quantidade Black border = Borda preta @@ -833,10 +833,8 @@ Contrast = Contraste CRT = Scanlines do CRT FXAA = Anti-aliasing do FXAA Gamma = Gama -Grayscale = Tons de cinza -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensidade -InverseColors = Cores invertidas Natural = Cores naturais NaturalA = Cores naturais (sem borrão) Off = Desligado diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index 135170999a..2ac9cbe570 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Culori Inversate MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Culori Naturale NaturalA = Natural Colors (no blur) diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index 318d699e06..04396dd888 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -794,9 +794,9 @@ Undo last save = Отменить последнее сохранение [PostShaders] (duplicated setting, previous slider will be used) = (дублированная настройка, используется предыдущий ползунок) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-цвета Amount = Размер Animation speed (0 -> disable) = Скорость анимации (0 -> disable) @@ -811,10 +811,8 @@ Contrast = Контрастность CRT = ЭЛТ-развертка FXAA = Сглаживание FXAA Gamma = Gamma -Grayscale = Оттенки серого -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Интенсивность -InverseColors = Инвертированные цвета MitchellNetravali = Бикубический (Mitchell-Netravali) апскейлер Natural = Естественные цвета NaturalA = Естественные цвета (без размытия) diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index a1b55bc588..a5cea55f8e 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -795,8 +795,8 @@ Undo last save = Ångra senaste spar [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) 4xHqGLSL = 4×HqGLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AAColor Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -811,10 +811,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Gamma = Gamma -Grayscale = Gråskala -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = InverseColors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural NaturalA = Natural Colors (no blur) diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index 260c8f3ec6..93272cd417 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -824,8 +824,8 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) 4xHqGLSL = 4ﾃ幽Q GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT scanlines FXAA = FXAA Antialiasing Gamma = Gamma -Grayscale = Grayscale -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Inverse Colors MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Natural Colors NaturalA = Natural Colors (no blur) diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index ace20b3246..179a6e4bdf 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -840,10 +840,8 @@ Contrast = ความคมชัด CRT = ภาพออกโทนเหลืองขึ้นเส้น FXAA = ภาพเน้นลบขอบรอยหยัก Gamma = แกมม่า -Grayscale = ภาพโทนสีเทา GreenLevel = ระดับสีเขียว Intensity = ความเข้มของแสง -InverseColors = ภาพสีกลับ MitchellNetravali = ภาพอัพสเกลแบบไบคิวบิค (มิทเชลล์-เนทราวาลิ) Natural = ภาพเน้นสีธรรมชาติ NaturalA = ภาพเน้นสีธรรมชาติ (ไม่เบลอ) diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index a12dcd7f67..379752394b 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -824,9 +824,9 @@ Undo last load = Son yüklemeyi geri al Undo last save = Son kaydetmeyi geri al [PostShaders] (duplicated setting, previous slider will be used) = (yinelenen ayar, önceki kaydırıcı kullanılacaktır) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = Miktar Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -841,10 +841,8 @@ Contrast = Karşıtlık CRT = CRT tarama çizgileri FXAA = FXAA Kenar Yumuşatma Gamma = Gamma -Grayscale = Gri tonlama -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Yoğunluk -InverseColors = Ters Renkler MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Doğal Renkler NaturalA = Doğal Renkler (bulanıklık yok) diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index bd967631c1..0981be9a88 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Кольори Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Контраст CRT = Кінескоп 1 FXAA = FXAA згладжування Gamma = Гамма -Grayscale = Відтінки сірого -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Інтенсивність -InverseColors = Зворотні кольори MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Натуральні кольори NaturalA = Натуральні кольори (без розмиття) diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index b0788c4456..1e73d69f8a 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -823,9 +823,9 @@ Undo last save = Undo last save [PostShaders] (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-màu Amount = Amount Animation speed (0 -> disable) = Animation speed (0 -> disable) @@ -840,10 +840,8 @@ Contrast = Contrast CRT = CRT đường quét FXAA = Chống răng cưa FXAA Gamma = Gamma -Grayscale = Đen trắng -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = Intensity -InverseColors = Màu âm bản MitchellNetravali = Bicubic (Mitchell-Netravali) Upscaler Natural = Màu tự nhiên (mờ) NaturalA = Màu tự nhiên (không mờ) diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index 0fc0b4cf6a..5e17fd9341 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -824,9 +824,9 @@ Undo last save = 撤销保存 [PostShaders] (duplicated setting, previous slider will be used) = (设置重复, 将使用上面滑块的值) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = 数量 Animation speed (0 -> disable) = 动画速度(0->禁用) @@ -840,10 +840,8 @@ Contrast = 对比度 CRT = CRT 扫描线 FXAA = FXAA (快速近似抗锯齿) Gamma = 伽马值 -Grayscale = 灰度图 -GreenLevel = GreenLevel +GreenLevel = Green level Intensity = 强度 -InverseColors = 反色 Natural = 自然色 NaturalA = 自然色(无模糊) Off = 关闭 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index 1133d8adaa..7458167121 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -794,9 +794,9 @@ Undo last save = 復原上次儲存 [PostShaders] (duplicated setting, previous slider will be used) = (重複的設定，將使用上一個滑桿) -4xHqGLSL = 4×HQ GLSL -5xBR = 5xBR -5xBR-lv2 = 5xBR-lv2 +4xHqGLSL = 4xHQ pixel art upscaler +5xBR = 5xBR pixel art upscaler +5xBR-lv2 = 5xBR-lv2 pixel art upscaler AAColor = AA-Color Amount = 數量 Black border = 黑色框線 @@ -809,10 +809,8 @@ Contrast = 對比度 CRT = CRT 掃描線 FXAA = FXAA 消除鋸齒 Gamma = 色差補正 -Grayscale = 灰階 GreenLevel = 綠色色階 Intensity = 濃度 -InverseColors = 反轉色彩 Natural = 自然色彩 NaturalA = 自然色彩 (無模糊) Off = 關閉 diff --git a/assets/shaders/defaultshaders.ini b/assets/shaders/defaultshaders.ini index 2a33454069..d987574591 100644 --- a/assets/shaders/defaultshaders.ini +++ b/assets/shaders/defaultshaders.ini @@ -28,13 +28,18 @@ Name=Vignette Author=Henrik Fragment=vignette.fsh Vertex=fxaa.vsh -[Grayscale] -Name=Grayscale -Author=Henrik -Fragment=grayscale.fsh -Vertex=fxaa.vsh +SettingName1=Power +SettingDefaultValue1=0.6 +SettingMaxValue1=2.0 +SettingMinValue1=0.1 +SettingStep1=0.1 +SettingName2=Aspect +SettingDefaultValue2=1.0 +SettingMaxValue2=2.0 +SettingMinValue2=0.5 +SettingStep2=0.1 [Bloom] -Name=Bloom +Name=Bloom Shader Fragment=bloom.fsh Vertex=fxaa.vsh SettingName1=Amount @@ -52,13 +57,8 @@ Vertex=fxaa.vsh SettingName1=Amount SettingDefaultValue1=1.5 SettingMaxValue1=3.0 -SettingMinValue1=1.0 +SettingMinValue1=0.1 SettingStep1=0.1 -[InverseColors] -Name=Inverse Colors -Author=Henrik -Fragment=inversecolors.fsh -Vertex=fxaa.vsh [Scanlines] Name=Scanlines (CRT) Fragment=scanlines.fsh diff --git a/assets/shaders/grayscale.fsh b/assets/shaders/grayscale.fsh deleted file mode 100644 index f309204e12..0000000000 --- a/assets/shaders/grayscale.fsh +++ /dev/null @@ -1,16 +0,0 @@ -// Simple grayscale shader - -#ifdef GL_ES -precision mediump float; -precision mediump int; -#endif - -uniform sampler2D sampler0; -varying vec2 v_texcoord0; - -void main() { - vec3 rgb = texture2D(sampler0, v_texcoord0.xy).xyz; - float luma = dot(rgb, vec3(0.299, 0.587, 0.114)); - gl_FragColor.rgb = vec3(luma, luma, luma); - gl_FragColor.a = 1.0; -} diff --git a/assets/shaders/inversecolors.fsh b/assets/shaders/inversecolors.fsh deleted file mode 100644 index c6367ca2fd..0000000000 --- a/assets/shaders/inversecolors.fsh +++ /dev/null @@ -1,19 +0,0 @@ -// Simple false color shader - -#ifdef GL_ES -precision mediump float; -precision mediump int; -#endif - -uniform sampler2D sampler0; -varying vec2 v_texcoord0; - -void main() { - vec3 rgb = texture2D(sampler0, v_texcoord0.xy).xyz; - float luma = dot(rgb, vec3(0.299, 0.587, 0.114)); - vec3 gray = vec3(luma, luma, luma) - 0.5; - rgb -= vec3(0.5, 0.5, 0.5); - - gl_FragColor.rgb = mix(rgb, gray, 2.0) + 0.5; - gl_FragColor.a = 1.0; -} diff --git a/assets/shaders/vignette.fsh b/assets/shaders/vignette.fsh index 7e2c92e69a..b4dc2b41c9 100644 --- a/assets/shaders/vignette.fsh +++ b/assets/shaders/vignette.fsh @@ -8,9 +8,15 @@ precision mediump int; uniform sampler2D sampler0; varying vec2 v_texcoord0; +uniform vec4 u_setting; + void main() { - float vignette = 1.1 - 0.6 * (dot(v_texcoord0 - 0.5, v_texcoord0 - 0.5) * 2.0); + vec2 diff = v_texcoord0 - 0.5; + diff.x *= u_setting.y; + diff.y /= u_setting.y; + float vignette = 1.0 - min(1.0, u_setting.x * (dot(diff, diff) * 2.0)); vec3 rgb = texture2D(sampler0, v_texcoord0.xy).xyz; + rgb *= vignette; gl_FragColor.rgb = vignette * rgb; gl_FragColor.a = 1.0; }