Use Waifu2X to enlarge background image #412

shatyuka · 2024-03-01T18:42:16Z

More testing is still needed, especially for old PCs.

Comparison:

cubic	waifu2x

native source code here

github-actions · 2024-03-01T18:46:14Z

Qodana for .NET

It seems all right 👌

No new problems were found according to the checks applied

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at qodana-support@jetbrains.com

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

Cryotechnic · 2024-03-01T19:26:10Z

Just chiming in to give my own 2 cents, but Waifu2X can be resource intensive depending on the image resolution, so I would not recommend using machines that do not have the following specifications:

Supported OS (Win10+)
Supported GPU, this one is hard to quantify but looking at the page, an AMD R7-1700 and a GTX 1070 worked, so I believe anything that gives around the same level of performance would be acceptable. We would probably need to have some form of exception handling to handle cases where resource usage is too high, in which case, we would terminate the task and simply load the default image.
A somewhat recent version of any drivers

I think that covers it?

bagusnl · 2024-03-01T20:49:20Z

Just chiming in to give my own 2 cents, but Waifu2X can be resource intensive depending on the image resolution, so I would not recommend using machines that do not have the following specifications:

As long as its toggleable between the current implementation (MagicScaler) and w2x I'm fine with it. Especially due to the nature of w2x

As for minimum specs, since the binary used is ncnn it just need Vulkan support, and if you can run hpyo games without any intervention it should be all ok. Tho a proper check if vulkan is available when toggling it on (like invoking vulkaninfo and just looking for the ERRORLEVEL shall do IMO).

Also do note that some AMD iGPU users like me suffers a driver degradation where any ncnn scaler will give a blank 0b output without the ncnn giving out error itself, so you might want to check if the output is a valid image and do a proper fallback when it doesn't

shatyuka · 2024-03-02T09:51:34Z

Just chiming in to give my own 2 cents, but Waifu2X can be resource intensive depending on the image resolution, so I would not recommend using machines that do not have the following specifications:

In fact, Collapse can only run on systems above Windows 10, so in most cases there is no need to consider system version compatibility issues.

For supported GPUs, I think this is already checked in native. For example, the Vulkan Loader (vulkan-1.dll) fails to load, or the Vulkan api returns an error code. This toggle is disabled when native library fails to load.

Also I will add some extra checks for black or corrupted image.

We will not get pixelated image using MagicScaler

bagusnl

Tested done internally and works great for both CPU only (might be REALLY slow) and GPU mode :fuhuayatta:
Some inputs ahead~

CollapseLauncher/Assets/Models/scale2.0x_model.bin

CollapseLauncher/Classes/Helper/Image/ImageLoaderHelper.cs

bagusnl · 2024-03-03T15:39:13Z

CollapseLauncher/Classes/Helper/Image/Waifu2X.cs

+        {
+            try
+            {
+                _context = waifu2x_create(gpuId, ttaMode, numThreads);


As per discussion internally, please add debug/info log around when w2x is invoked as it can take a bit of time, so the user that seeing the console can understand that its actually doing it instead of the image failed to load.

CollapseLauncher/Classes/Helper/Image/Waifu2X.cs

discrete > integrated > others

bagusnl · 2024-03-05T02:08:58Z

Can I get the source for the OpenMP? I need the license file to be added manually as its not from NuGet

shatyuka · 2024-03-05T02:15:02Z

Can I get the source for the OpenMP? I need the license file to be added manually as its not from NuGet

https://github.com/llvm/llvm-project/blob/main/openmp/LICENSE.TXT

libomp binary file is copied from vcredist

bagusnl · 2024-03-05T16:17:23Z

Tested and works great!

As per internal discussion, we can merge this PR now~
Thank you for your work

@shatyuka

* [skip ci] Update README.md * Clamp column width if there is no space left This to fix the DataTable component causing a crash due to negative value if small window mode is used. * Enable Rich Presence only after the activated region is set might fix #402 * Fix blurry console icon Also, get the icon from exe rather than a separate ico file * (CodeQA) Theme xaml * Move RPC dispose Adjusted to be in the same file where it is initialized (448ff77) * Change default value displayed for ```Download Threads``` to match the real default value * Auto resize DataTable column width using star L.CRC and R.CRC are hidden in small window mode before this commit. * [skip ci] Update LICENSE and its references * [skip ci] Update SECURITY.md - Added @shatyuka and @gablm to the active maintainers list - Update supported version section * [skip ci] Sync translation Translate en_US.json in zh_CN 100% reviewed source file: 'en_US.json' on 'zh_CN'. * HI3 Senadina Game Settings Adjustments (#417) * (GSP) HI3: Adjust to new version * [skip ci] Add more abbreviation list * Use ShouldComputeInputPris on build To try mitigate resource not found error * (GSP) More Hi3 Senadina backend changes * (GSP) Force GraphicsGrade to 6 on Save * (GSP) Docs * (GSP) Senadina frontends and localization * (GSP) Disable preset * CodeQA stuff * Fix crash due to value not exist for ``GraphicsReflectionQuality`` * Move and change Physics toggle to ``ToggleSwitch`` * review adjustments * Review adjustment - Use comparedTo instead of TypeExtensions for Equals() in PhysicsSimulation.cs - Adjustment on comparedTo in GraphicsGrade.cs - Remove unnecessary int declaration in Honkai\RegistryClass\Enums.cs --------- Co-authored-by: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com> Co-authored-by: Ron Friedman <cryogen65@gmail.com> * Add delay for GameBoost Adding 10 seconds before changing the priority to allow for the process to initialize. Also move to its own method to avoid error mixed up with main game launching method error(s). Also also, fix some code QA problems on the changed section because might as well :ahuehue: * Update WindowsAppSDK to 1.5.0 Related #418 * (DiscordRPC) Reset `_firstTimeConnect` for new client * Use Waifu2X to enlarge background image (#412) * Use Waifu2X to enlarge background image * More checks * Resize to window size We will not get pixelated image using MagicScaler * Code cleanup * Rename models folder name * Add some useful logs * Auto detect GPU discrete > integrated > others * Enable OpenMP for speed * [skip ci] Add WAIFU2X.LICENSE and OPENMP.LICENSE * Minor fixes --------- Co-authored-by: Bagus Nur Listiyono <dzakibagus@gmail.com> * [skip ci] Use ex variable on GameBoost_Invoke oops... * (CodeQA) SettingsPage - Change copyright year - Sync maintainers - Suppress null scans (take it ReSharper!) - Suppress unrelated Xaml warnings * Stop "open -p" from starting a game when not updated * (Waifu2X) Fix failed test log * [skip ci] Sync translation Translate en_US.json in es_419 100% reviewed source file: 'en_US.json' on 'es_419'. * [skip ci] Sync translation Translate en_US.json in ja_JP 100% reviewed source file: 'en_US.json' on 'ja_JP'. * (Waifu2X) Fix crash on exit * [skip ci] Sync translation Translate en_US.json in zh_CN 100% reviewed source file: 'en_US.json' on 'zh_CN'. * Fix CustomBG checkbox logic :derp: * Fix Level of Detail setting order for Hi3 * Read the cache reference from stream for Hi3 * Keyboard Shortcut improvements (#416) * Revamp how shortcuts are saved and fix UI margins * Convert old shortcut list * Minor refactor + Fix KbShortcut related flyout crash * Allow localization of VirtualKeyModifiers * Remove invalid shortcuts and save if the dictionary is altered * Qodana * Parse kbshortcuts .ini only when enabling the shortcuts * Turn DefaultShortcutList into a readonly field * (KbShortcuts) Get GameCount and MaxRegions from Metadata * Remove Equals/HashCode and directly compare values * Update KeyboardShortcuts.cs * No possible multiple enumerations while loading shortcuts * Fix validity check for new shortcut combinations * (KeyboardShortcut) CodeQA - Suppress null warnings - Wrap long lines - Remove unnecessary statement * (KeyboardShortcut) CodeQA part 2 Bc no save :( * (Keyboard Shortcut) Fix opacity animation --------- Co-authored-by: Bagus Nur Listiyono <dzakibagus@gmail.com> * [skip ci] Sync translation Translate en_US.json in es_419 100% reviewed source file: 'en_US.json' on 'es_419'. * [skip ci] Sync translation Translate en_US.json in ja_JP 100% reviewed source file: 'en_US.json' on 'ja_JP'. * [skip ci] Sync translation Translate en_US.json in zh_CN 100% reviewed source file: 'en_US.json' on 'zh_CN'. * [skip ci] Bump version * Add function to launch game in alt (legacy Collapse) launch mode * Update NuGet(s) - MagicScaler 0.14.0 -> 0.14.2 https://github.com/saucecontrol/PhotoSauce/releases/tag/v0.14.1 https://github.com/saucecontrol/PhotoSauce/releases/tag/v0.14.2 - BuildSDK * Small refactor on HomePage.StartGame - Avoid multiple call on the same parameter - Avoid unnecessary call on unused parameter - Use async overload when disposing ResizableWindowHookToken - Avoid NRE if WatchOutputLog is unexpectedly cancelled before the time - Suppress some NRE --------- Co-authored-by: Ron Friedman <9833218+Cryotechnic@users.noreply.github.com> Co-authored-by: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com> Co-authored-by: Gabriel Lima <44784408+gablm@users.noreply.github.com> Co-authored-by: Shatyuka <958182453@qq.com> Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> Co-authored-by: Ron Friedman <cryogen65@gmail.com>

@shatyuka

* [skip ci] Update README.md * Clamp column width if there is no space left This to fix the DataTable component causing a crash due to negative value if small window mode is used. * Enable Rich Presence only after the activated region is set might fix #402 * Fix blurry console icon Also, get the icon from exe rather than a separate ico file * (CodeQA) Theme xaml * Move RPC dispose Adjusted to be in the same file where it is initialized (448ff77) * Change default value displayed for ```Download Threads``` to match the real default value * Auto resize DataTable column width using star L.CRC and R.CRC are hidden in small window mode before this commit. * [skip ci] Update LICENSE and its references * [skip ci] Update SECURITY.md - Added @shatyuka and @gablm to the active maintainers list - Update supported version section * [skip ci] Sync translation Translate en_US.json in zh_CN 100% reviewed source file: 'en_US.json' on 'zh_CN'. * HI3 Senadina Game Settings Adjustments (#417) * (GSP) HI3: Adjust to new version * [skip ci] Add more abbreviation list * Use ShouldComputeInputPris on build To try mitigate resource not found error * (GSP) More Hi3 Senadina backend changes * (GSP) Force GraphicsGrade to 6 on Save * (GSP) Docs * (GSP) Senadina frontends and localization * (GSP) Disable preset * CodeQA stuff * Fix crash due to value not exist for ``GraphicsReflectionQuality`` * Move and change Physics toggle to ``ToggleSwitch`` * review adjustments * Review adjustment - Use comparedTo instead of TypeExtensions for Equals() in PhysicsSimulation.cs - Adjustment on comparedTo in GraphicsGrade.cs - Remove unnecessary int declaration in Honkai\RegistryClass\Enums.cs --------- Co-authored-by: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com> Co-authored-by: Ron Friedman <cryogen65@gmail.com> * Add delay for GameBoost Adding 10 seconds before changing the priority to allow for the process to initialize. Also move to its own method to avoid error mixed up with main game launching method error(s). Also also, fix some code QA problems on the changed section because might as well :ahuehue: * Update WindowsAppSDK to 1.5.0 Related #418 * (DiscordRPC) Reset `_firstTimeConnect` for new client * Use Waifu2X to enlarge background image (#412) * Use Waifu2X to enlarge background image * More checks * Resize to window size We will not get pixelated image using MagicScaler * Code cleanup * Rename models folder name * Add some useful logs * Auto detect GPU discrete > integrated > others * Enable OpenMP for speed * [skip ci] Add WAIFU2X.LICENSE and OPENMP.LICENSE * Minor fixes --------- Co-authored-by: Bagus Nur Listiyono <dzakibagus@gmail.com> * [skip ci] Use ex variable on GameBoost_Invoke oops... * (CodeQA) SettingsPage - Change copyright year - Sync maintainers - Suppress null scans (take it ReSharper!) - Suppress unrelated Xaml warnings * Stop "open -p" from starting a game when not updated * (Waifu2X) Fix failed test log * [skip ci] Sync translation Translate en_US.json in es_419 100% reviewed source file: 'en_US.json' on 'es_419'. * [skip ci] Sync translation Translate en_US.json in ja_JP 100% reviewed source file: 'en_US.json' on 'ja_JP'. * (Waifu2X) Fix crash on exit * [skip ci] Sync translation Translate en_US.json in zh_CN 100% reviewed source file: 'en_US.json' on 'zh_CN'. * Fix CustomBG checkbox logic :derp: * Fix Level of Detail setting order for Hi3 * Read the cache reference from stream for Hi3 * Keyboard Shortcut improvements (#416) * Revamp how shortcuts are saved and fix UI margins * Convert old shortcut list * Minor refactor + Fix KbShortcut related flyout crash * Allow localization of VirtualKeyModifiers * Remove invalid shortcuts and save if the dictionary is altered * Qodana * Parse kbshortcuts .ini only when enabling the shortcuts * Turn DefaultShortcutList into a readonly field * (KbShortcuts) Get GameCount and MaxRegions from Metadata * Remove Equals/HashCode and directly compare values * Update KeyboardShortcuts.cs * No possible multiple enumerations while loading shortcuts * Fix validity check for new shortcut combinations * (KeyboardShortcut) CodeQA - Suppress null warnings - Wrap long lines - Remove unnecessary statement * (KeyboardShortcut) CodeQA part 2 Bc no save :( * (Keyboard Shortcut) Fix opacity animation --------- Co-authored-by: Bagus Nur Listiyono <dzakibagus@gmail.com> * [skip ci] Sync translation Translate en_US.json in es_419 100% reviewed source file: 'en_US.json' on 'es_419'. * [skip ci] Sync translation Translate en_US.json in ja_JP 100% reviewed source file: 'en_US.json' on 'ja_JP'. * [skip ci] Sync translation Translate en_US.json in zh_CN 100% reviewed source file: 'en_US.json' on 'zh_CN'. * [skip ci] Bump version * Add function to launch game in alt (legacy Collapse) launch mode * Update NuGet(s) - MagicScaler 0.14.0 -> 0.14.2 https://github.com/saucecontrol/PhotoSauce/releases/tag/v0.14.1 https://github.com/saucecontrol/PhotoSauce/releases/tag/v0.14.2 - BuildSDK * Small refactor on HomePage.StartGame - Avoid multiple call on the same parameter - Avoid unnecessary call on unused parameter - Use async overload when disposing ResizableWindowHookToken - Avoid NRE if WatchOutputLog is unexpectedly cancelled before the time - Suppress some NRE --------- Co-authored-by: Ron Friedman <9833218+Cryotechnic@users.noreply.github.com> Co-authored-by: Kemal Setya Adhi <dev.kemalsetyaa@gmail.com> Co-authored-by: Gabriel Lima <44784408+gablm@users.noreply.github.com> Co-authored-by: Shatyuka <958182453@qq.com> Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> Co-authored-by: Ron Friedman <cryogen65@gmail.com>

Use Waifu2X to enlarge background image

d8eaa2e

bagusnl assigned shatyuka Mar 1, 2024

bagusnl added Enhancement New feature or request Area: Runtime Issue labeled for runtime, Hi3Helper.Core and other libraries used by Collapse Area: UI/UX Issue labeled for User Interface/eXperience related issue labels Mar 1, 2024

shatyuka added 3 commits March 2, 2024 19:24

More checks

9fc586a

Resize to window size

37ac588

We will not get pixelated image using MagicScaler

Code cleanup

339731d

bagusnl requested changes Mar 3, 2024

View reviewed changes

shatyuka added 4 commits March 4, 2024 20:01

Rename models folder name

8c34875

Add some useful logs

0fab3b9

Auto detect GPU

c69fe52

discrete > integrated > others

Enable OpenMP for speed

384a59f

bagusnl and others added 3 commits March 5, 2024 09:35

Update upstream

7aa105a

[skip ci] Add WAIFU2X.LICENSE and OPENMP.LICENSE

d96c664

Minor fixes

e2c7804

bagusnl approved these changes Mar 5, 2024

View reviewed changes

bagusnl merged commit 7b3108b into main Mar 5, 2024
4 checks passed

shatyuka deleted the waifu2x branch March 7, 2024 19:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Waifu2X to enlarge background image #412

Use Waifu2X to enlarge background image #412

shatyuka commented Mar 1, 2024

github-actions bot commented Mar 1, 2024 •

edited

Loading

Cryotechnic commented Mar 1, 2024

bagusnl commented Mar 1, 2024 •

edited

Loading

shatyuka commented Mar 2, 2024

bagusnl left a comment

bagusnl Mar 3, 2024

bagusnl commented Mar 5, 2024

shatyuka commented Mar 5, 2024 •

edited

Loading

bagusnl commented Mar 5, 2024

Use Waifu2X to enlarge background image #412

Use Waifu2X to enlarge background image #412

Conversation

shatyuka commented Mar 1, 2024

github-actions bot commented Mar 1, 2024 • edited Loading

Qodana for .NET

Cryotechnic commented Mar 1, 2024

bagusnl commented Mar 1, 2024 • edited Loading

shatyuka commented Mar 2, 2024

bagusnl left a comment

Choose a reason for hiding this comment

bagusnl Mar 3, 2024

Choose a reason for hiding this comment

bagusnl commented Mar 5, 2024

shatyuka commented Mar 5, 2024 • edited Loading

bagusnl commented Mar 5, 2024

github-actions bot commented Mar 1, 2024 •

edited

Loading

bagusnl commented Mar 1, 2024 •

edited

Loading

shatyuka commented Mar 5, 2024 •

edited

Loading