Skip to content

Commit

Permalink
Merge pull request #374 from HyperspaceMadness/master
Browse files Browse the repository at this point in the history
Mega Bezel V1.12.0_2023-03-11
  • Loading branch information
hizzlekizzle authored Mar 14, 2023
2 parents 8b35477 + 6fdb079 commit 7d4ce16
Show file tree
Hide file tree
Showing 50 changed files with 411 additions and 121 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ filter_linear33 = true
float_framebuffer33 = "true"
alias33 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader34 = ../../../shaders/base/post-crt-prep-glass.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ filter_linear29 = true
float_framebuffer29 = "true"
alias29 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader30 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ filter_linear27 = true
float_framebuffer27 = "true"
alias27 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader28 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ filter_linear29 = true
float_framebuffer29 = "true"
alias29 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader30 = ../../../shaders/base/post-crt-prep-glass.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ filter_linear27 = true
float_framebuffer27 = "true"
alias27 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader28 = ../../../shaders/base/post-crt-prep-glass.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ filter_linear29 = true
float_framebuffer29 = "true"
alias29 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader30 = ../../../shaders/base/post-crt-prep-no-reflect.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ filter_linear27 = true
float_framebuffer27 = "true"
alias27 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader28 = ../../../shaders/base/post-crt-prep-no-reflect.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-glass.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-glass.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-no-reflect.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-no-reflect.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ alias14 = "LinearizePass"
shader15 = ../../../shaders/base/delinearize.slang
float_framebuffer15 = "true"

shader16 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
shader16 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2-no-reflect.slang
filter_linear16 = "false"
scale_type16 = "viewport"
scale16 = "1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-no-reflect.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-no-reflect.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-potato.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ filter_linear12 = true
float_framebuffer12 = "true"
alias12 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader13 = ../../../shaders/base/post-crt-prep-potato.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ alias13 = "LinearizePass"
shader14 = ../../../shaders/base/delinearize.slang
float_framebuffer14 = "true"

shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang
shader15 = ../../../shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang
filter_linear15 = "false"
scale_type15 = "viewport"
scale15 = "1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ filter_linear20 = true
float_framebuffer20 = "true"
alias20 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader21 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-image-layers.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-potato.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ filter_linear16 = true
float_framebuffer16 = "true"
alias16 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader17 = ../../../shaders/base/post-crt-prep-potato.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ filter_linear11 = true
float_framebuffer11 = "true"
alias11 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader12 = ../../../shaders/base/post-crt-prep-potato.slang
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ filter_linear11 = true
float_framebuffer11 = "true"
alias11 = "CRTPass"

g_sat = 0.15
g_sat = 0.25
g_lum = 0.15
g_gamma_out = 2.45

shader12 = ../../../shaders/base/post-crt-prep-potato.slang
Expand Down
2 changes: 1 addition & 1 deletion bezel/Mega_Bezel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Mega Bezel Shader Readme
------------------------------------------------------------------------------------------------------------
![Mega Bezel Logo](MegaBezelLogo.png)

**Version V1.11.0_2023-02-25**
**Version V1.12.0_2023-03-11**
----------------------------------------
----------------------------------------

Expand Down
23 changes: 9 additions & 14 deletions bezel/Mega_Bezel/shaders/ShaderTodo.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
![Mega_Bezel_Logo|512x256, 75%](upload://6PNkvcMF9Go9Wnk6OJXfYR1opXI.png)

Mega Bezel is updated to V1.11.0_2023-02-25
Mega Bezel is updated to V1.12.0_2023-03-11

Changes:
* Guest Advanced updated to crt-guest-advanced-2023-02-25-release1
* Improvements to the new Magic Glow feature
* Turn Magic Glow on and Increase the Glow amount to see the effect
* New Slot Mask Mitigation option to reduce moire
* Added/Restored Guest's Raster Bloom as well as Overscan control
* Updated Comments in presets to use # instead of // as per @hunterk's request
* Added rotation option for Rotate CRT Tube:
* -1 = 90 Degrees Clockwise (or 270 Counter Clockwise)
* 0 = No Rotation
* 1 = 90 Degrees Counter Clockwise
* Added groundwork for the wildcard replacement feature so presets will auto rotate and not flip in the future
* Fixed a performance issue where we were rendering more than we needed to
* This should increase performance across most presets
* Fixed color rainbowing in reflection for Guest-Advanced and LCD-GRID
* Updated to crt-guest-advanced-2023-03-11-release1
* Updated GDV-MINI from @ROBMARK85's request


----------------------------------------------------
--- TODO ---------------------------------------
----------------------------------------------------

* Update Guest to latest
* Check on Afterglow for BiRaitBec
* Add Curvature to EasyMode for lasly
* Rotate Texture Parameters
* Rotate Image Layers with Parameters
* Update Megatron
* Add Passthrough Preset, no crt shader
* Add AbsoluteMax as a scaling type
Expand Down
2 changes: 1 addition & 1 deletion bezel/Mega_Bezel/shaders/base/common/helper-functions.inc
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ vec4 HHLP_GetBilinearTextureSample(sampler2D in_sampler, vec2 in_coord, vec4 in_

bool HHLP_IsOutsideCoordSpace(vec2 in_coord)
{
return (abs(in_coord.x - 0.5) > 0.51 && abs(in_coord.y - 0.5) > 0.51);
return (abs(in_coord.x - 0.5) > 0.501 || abs(in_coord.y - 0.5) > 0.501);
}

float rand(vec2 co, float size){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

// Screen Scale Required Parameters
#pragma parameter HSM_MEGA_BEZEL_TITLE "[ --- HSM MEGA BEZEL V1.11.0_2023-02-25 --- ]" 0 0 0.001 0.001
#pragma parameter HSM_MEGA_BEZEL_TITLE "[ --- HSM MEGA BEZEL V1.12.0_2023-03-11 --- ]" 0 0 0.001 0.001

#pragma parameter HSM_RESOLUTION_DEBUG_ON " Show Resolution Info" 0 0 1 1
float HSM_RESOLUTION_DEBUG_ON = global.HSM_RESOLUTION_DEBUG_ON;
Expand Down
Loading

0 comments on commit 7d4ce16

Please sign in to comment.