Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add background blur #5720

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8b872d0
Initial addition of blur
dligr Nov 29, 2024
9b31df7
Optimize the Viewport chain
dligr Nov 29, 2024
2072326
Rename some shader variables to camelCase, clean up scene hierarchy
dligr Nov 30, 2024
f8741e8
Add a clarification comment
dligr Nov 30, 2024
aad651b
Apply blur only when distortion is enabled, make viewports stretch to…
dligr Nov 30, 2024
f61f815
Remove a debug print
dligr Nov 30, 2024
aca64b6
Replace tabs with spaces
dligr Nov 30, 2024
4a2e3bc
Get better values for the blur shaders, fix style
dligr Nov 30, 2024
476ab02
Adjust background plane position
dligr Nov 30, 2024
9a7f3f5
Enable background distortion by default
dligr Nov 30, 2024
785b30c
Rename some variables, fix a bug with path disposing
dligr Nov 30, 2024
e087506
Fix the blur formula (backgrounds should be closer to original colors…
dligr Nov 30, 2024
d7bf936
Fix a nullable notation issue
dligr Nov 30, 2024
3364cbb
Merge branch 'master' of https://github.com/Revolutionary-Games/Thriv…
dligr Dec 3, 2024
8d806f0
Split all background logic into its own class
dligr Dec 4, 2024
32a1d9e
Disable the subviewport chain when blur is disabled
dligr Dec 4, 2024
de46cce
Fix null reference exceptions being thrown, fix some logic
dligr Dec 4, 2024
4b0bfbb
Add a blur strength option
dligr Dec 4, 2024
7dbb73d
Fix indentation
dligr Dec 4, 2024
183a356
Change class order, Remove some duplicate function calls and some nul…
dligr Dec 4, 2024
9fb7d8e
Make SubViewports only update when blur is on
dligr Dec 4, 2024
7e4624e
Remove blur toggle, change blur's slider position in the menu for a b…
dligr Dec 5, 2024
ef8633d
Switch from node path exports
dligr Dec 5, 2024
adf3799
Move world position setting to the BackgroundPlane class
dligr Dec 5, 2024
250ae91
Remove dispose from the camera class
dligr Dec 5, 2024
25d81a5
Save blurring state, change some obsolete debug text, change approach…
dligr Dec 5, 2024
81cc1fa
Change blur shader's name to include 'Gaussian'
dligr Dec 5, 2024
da80a2b
Re-add the accidentally deleted blur shaders, change variable orders …
dligr Dec 5, 2024
c42e895
Change variable order
dligr Dec 5, 2024
f8d66c4
Revert changes to blank.png.import
dligr Dec 5, 2024
ebbc183
Remove a null check of a non-nullable variable
dligr Dec 6, 2024
1ee7d7c
Remove an unused function, fix blur strength not changing in some cases
dligr Dec 6, 2024
558bee8
Remove an unused directive
dligr Dec 6, 2024
b6d16b2
Remove an unused {get;set;}, lower a setting's default value to be co…
dligr Dec 6, 2024
08fd6c7
Revert the background plane changing its own world position as it doe…
dligr Dec 6, 2024
4eefd74
Swap some method calls to change blur strength and scene hierarchy se…
dligr Dec 6, 2024
fb1a295
Add UTF-8 BOM
dligr Dec 6, 2024
8f263f3
Remove brackets around a single return
dligr Dec 6, 2024
edd8fad
Revert to BackgroundPlane changing plane's world position
dligr Dec 6, 2024
279b0fb
Simplify a {get;set;}
dligr Dec 6, 2024
d07857c
Make the default scene hierarchy fail-safe
dligr Dec 6, 2024
a921ee9
Not initialize a false variable
dligr Dec 7, 2024
175db9a
Correctly define subviewports' default update mode
dligr Dec 9, 2024
a9812a0
Reuse a function
dligr Dec 9, 2024
1e63466
Fix a typo, make changes to update the distortion json property's def…
dligr Dec 9, 2024
3d22c5e
Rename Subviewports and the BlurPlane on the Godot scene and in code
dligr Dec 9, 2024
05df472
Fill in BackgroundPlane's parameters to work with the new names
dligr Dec 9, 2024
3a04bdc
Remove some unnecessary checks
dligr Dec 10, 2024
d093fc6
Move some functions where they used to be for a cleaner diff
dligr Dec 10, 2024
c54034b
Fix lighting not being updated
dligr Dec 10, 2024
ad8fa84
Make a method private
dligr Dec 12, 2024
5b6c4c9
Update the localizations because of a layout change
dligr Dec 12, 2024
cd4f082
Only enable blur when distortion is on
dligr Dec 13, 2024
7ec3587
Merge 'origin/master' into blur
dligr Dec 13, 2024
95ea4f7
Re-arrange the options menu to place the blur slider under the distor…
dligr Dec 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion locale/af.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/ar.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/be.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/bg.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/bn.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/ca.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/cs.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/da.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/de.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/el.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-11-29 11:19+0200\n"
"POT-Creation-Date: 2024-12-04 21:05+0300\n"
"PO-Revision-Date: 2024-11-26 17:26+0200\n"
"Last-Translator: Henri Hyyryläinen <[email protected]>\n"
"Language-Team: English <https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/en/>\n"
Expand Down Expand Up @@ -366,6 +366,9 @@ msgstr "Aware Stage"
msgid "BACK"
msgstr "Back"

msgid "BACKGROUND_BLUR"
msgstr "Background blur:"

msgid "BACKSLASH"
msgstr "Backslash"

Expand Down
5 changes: 4 additions & 1 deletion locale/eo.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/es.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/es_AR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/et.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/fi.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/fr.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/frm.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/he.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/hr.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion locale/hu.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading