diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp index 89fdedc..8b12895 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp @@ -222,7 +222,7 @@ shader39 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type39 = viewport alias39 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -288,10 +288,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -349,6 +353,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp index 0d0cad5..ba9802a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp @@ -214,7 +214,7 @@ shader37 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type37 = viewport alias37 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -280,10 +280,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -338,6 +342,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp index 6b1cfda..1e1d481 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp @@ -272,7 +272,7 @@ shader44 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type44 = viewport alias44 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -338,10 +338,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -396,9 +400,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // NTSC Parameters GAMMA_INPUT = 2.0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp index 1ad3af2..9927908 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp @@ -251,7 +251,7 @@ shader41 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type41 = viewport alias41 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -317,10 +317,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -375,6 +379,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp index 0531518..6483fac 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp @@ -211,7 +211,7 @@ shader37 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type37 = viewport alias37 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -277,10 +277,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -335,6 +339,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp index 1a22ae9..7ebe286 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp @@ -243,7 +243,7 @@ shader40 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type40 = viewport alias40 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -309,10 +309,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -367,9 +371,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // Sony Megatron Color Monitor hcrt_hdr = "0.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp index 68f361a..2eb1f99 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp @@ -231,7 +231,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type38 = viewport alias38 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -297,10 +297,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -355,9 +359,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // Sony Megatron Color Monitor hcrt_hdr = "0.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp index 9eb9986..42bbe4f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp @@ -238,7 +238,7 @@ shader41 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type41 = viewport alias41 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -308,6 +308,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -325,9 +329,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // NTSC Parameters GAMMA_INPUT = 2.0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp index 6ff238f..df0e246 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp @@ -217,7 +217,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -287,6 +287,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -304,6 +308,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp index 2ba1a45..7e9dc10 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp @@ -209,7 +209,7 @@ shader37 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type37 = viewport alias37 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -279,6 +279,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -296,9 +300,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // Sony Megatron Color Monitor hcrt_hdr = "0.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp index 4604722..5cb41cf 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp @@ -197,7 +197,7 @@ shader35 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type35 = viewport alias35 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -267,6 +267,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -284,9 +288,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // Sony Megatron Color Monitor hcrt_hdr = "0.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp index 7a50ee7..f3122ee 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp @@ -292,7 +292,7 @@ shader47 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type47 = viewport alias47 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -362,6 +362,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -379,9 +383,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // NTSC Parameters GAMMA_INPUT = 2.0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp index 51dd617..eaecacd 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp @@ -271,7 +271,7 @@ shader44 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type44 = viewport alias44 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -341,6 +341,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -358,6 +362,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp index 3fe0432..710fa33 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp @@ -231,7 +231,7 @@ shader40 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type40 = viewport alias40 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -301,6 +301,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -318,6 +322,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp index 1b82707..1dd5d85 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp @@ -263,7 +263,7 @@ shader43 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type43 = viewport alias43 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -333,6 +333,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -350,9 +354,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // Sony Megatron Color Monitor hcrt_hdr = "0.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp index 64546eb..f9913f7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp @@ -251,7 +251,7 @@ shader41 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type41 = viewport alias41 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -321,6 +321,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -338,9 +342,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // Sony Megatron Color Monitor hcrt_hdr = "0.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp index 561d746..87ea041 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp @@ -320,7 +320,7 @@ shader47 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type47 = viewport alias47 = "CombinePass" // Define textures to be used by the different passes -textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" Dirt = ../../../../reshade/shaders/bloom/LensDB.png Dirt_wrap_mode = "clamp_to_border" @@ -398,6 +398,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp index 1c3c5bf..b8d51ce 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp @@ -211,7 +211,7 @@ shader36 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type36 = viewport alias36 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -281,6 +281,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp index 151935a..6ed363e 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp @@ -215,7 +215,7 @@ shader36 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type36 = viewport alias36 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -285,6 +285,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp index 357697d..2e6124b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp @@ -203,7 +203,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -273,6 +273,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp index be96b37..ace594b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp @@ -261,7 +261,7 @@ shader41 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type41 = viewport alias41 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -331,6 +331,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp index f2b3d66..3a07dd3 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp @@ -240,7 +240,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -310,6 +310,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp index 13f9335..40381fa 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp @@ -200,7 +200,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -270,6 +270,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp index 8504b26..55292d1 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp @@ -232,7 +232,7 @@ shader37 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type37 = viewport alias37 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -302,6 +302,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp index e51d989..deb02be 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp @@ -220,7 +220,7 @@ shader35 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type35 = viewport alias35 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -290,6 +290,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp index 6443e2c..6d8d63b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp @@ -300,7 +300,7 @@ shader44 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type44 = viewport alias44 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" Dirt = ../../../../reshade/shaders/bloom/LensDB.png Dirt_wrap_mode = "clamp_to_border" @@ -374,10 +374,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp index 2dd0d69..35d4bd0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp @@ -191,7 +191,7 @@ shader33 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type33 = viewport alias33 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -257,10 +257,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp index 480cdaa..4fe0d01 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp @@ -195,7 +195,7 @@ shader33 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type33 = viewport alias33 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -261,10 +261,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp index f2c1cc5..242e1a4 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp @@ -183,7 +183,7 @@ shader31 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type31 = viewport alias31 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -249,10 +249,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp index 0b1f89a..4605abf 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp @@ -241,7 +241,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type38 = viewport alias38 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -307,10 +307,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp index 2d7aac4..127f0c8 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp @@ -220,7 +220,7 @@ shader35 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type35 = viewport alias35 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -286,10 +286,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp index 7007783..b77b2b4 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp @@ -180,7 +180,7 @@ shader31 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type31 = viewport alias31 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -246,10 +246,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp index 01ce334..7c2cc42 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp @@ -212,7 +212,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type34 = viewport alias34 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -278,10 +278,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp index 91c8866..b35ee1d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp @@ -200,7 +200,7 @@ shader32 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type32 = viewport alias32 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -266,10 +266,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp index 0299594..5da7804 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp @@ -207,7 +207,7 @@ shader35 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type35 = viewport alias35 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -277,6 +277,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp index a0d3a36..c22466b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp @@ -186,7 +186,7 @@ shader32 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type32 = viewport alias32 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -256,6 +256,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp index acccd30..cb8a2a1 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp @@ -178,7 +178,7 @@ shader31 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type31 = viewport alias31 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -248,6 +248,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp index 16a1ec2..44efd34 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp @@ -166,7 +166,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -236,6 +236,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp index 8998c36..e4bf126 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp @@ -183,7 +183,7 @@ shader26 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type26 = viewport alias26 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -249,10 +249,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp index 6b96c5f..a2883b2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp @@ -157,7 +157,7 @@ shader22 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type22 = viewport alias22 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -223,10 +223,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp index 11b3f17..274bb38 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp @@ -229,7 +229,7 @@ shader31 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type31 = viewport alias31 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -295,10 +295,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp index f6c557c..48219fb 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp @@ -194,7 +194,7 @@ shader26 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type26 = viewport alias26 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -260,10 +260,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp index ba930b0..f15d077 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp @@ -154,7 +154,7 @@ shader22 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type22 = viewport alias22 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -220,10 +220,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp index 0ea2661..aed4a63 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp @@ -200,7 +200,7 @@ shader27 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type27 = viewport alias27 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -266,10 +266,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp index c16276e..11397bb 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp @@ -174,7 +174,7 @@ shader23 = ../../shaders/HyperspaceMadness/hsm/hsm-reflection-glass.slang scale_type23 = viewport alias23 = "BR_CRTAndReflectionPass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -240,10 +240,14 @@ DecalImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16 DecalImage_linear = true DecalImage_mipmap = 1 -NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLightingImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp index 7147c75..54445fe 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp @@ -185,7 +185,7 @@ shader27 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type27 = viewport alias27 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -255,6 +255,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp index 89f7071..9cfaba9 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp @@ -203,7 +203,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -273,6 +273,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp index 355578e..27c2934 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp @@ -177,7 +177,7 @@ shader25 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type25 = viewport alias25 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -247,6 +247,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp index 3683695..fff322d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp @@ -249,7 +249,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -319,6 +319,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -331,7 +335,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -401,6 +405,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp index 8b12ec7..320f855 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp @@ -214,7 +214,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -284,6 +284,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp index 7a1f51f..dd27ac2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp @@ -174,7 +174,7 @@ shader25 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type25 = viewport alias25 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -244,6 +244,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp index 9cebd4f..807c117 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp @@ -220,7 +220,7 @@ shader30 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type30 = viewport alias30 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -290,6 +290,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp index de7ff86..f3dc971 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp @@ -194,7 +194,7 @@ shader26 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type26 = viewport alias26 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -264,6 +264,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp index 08bfc3e..f8992c0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp @@ -131,7 +131,7 @@ shader21 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type21 = viewport alias21 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -201,6 +201,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp index f13c881..ad344e8 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp @@ -149,7 +149,7 @@ shader23 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type23 = viewport alias23 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -219,6 +219,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp index 4f6f85d..40f5747 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp @@ -123,7 +123,7 @@ shader19 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type19 = viewport alias19 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -193,6 +193,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp index 6bf05af..576769b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp @@ -195,7 +195,7 @@ shader28 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type28 = viewport alias28 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -265,6 +265,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp index 164da9a..48da236 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp @@ -160,7 +160,7 @@ shader23 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type23 = viewport alias23 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -230,6 +230,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp index ffc0e51..bddc43d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp @@ -120,7 +120,7 @@ shader19 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type19 = viewport alias19 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -190,6 +190,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp index 67daf2d..c8268c8 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp @@ -166,7 +166,7 @@ shader24 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type24 = viewport alias24 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -236,6 +236,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp index 76e6c48..f788783 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp @@ -140,7 +140,7 @@ shader20 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes-no-reflect.sla scale_type20 = viewport alias20 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -210,6 +210,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-240p__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-240p__GDV-NTSC.slangp index 8198fb2..125c9b7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-240p__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-240p__GDV-NTSC.slangp @@ -293,7 +293,7 @@ shader47 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type47 = viewport alias47 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -363,6 +363,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -380,9 +384,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // NTSC Parameters GAMMA_INPUT = 2.0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-3DS-400x480__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-3DS-400x480__GDV.slangp index 6f3417a..0394eb5 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-3DS-400x480__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-3DS-400x480__GDV.slangp @@ -272,7 +272,7 @@ shader44 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type44 = viewport alias44 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -342,6 +342,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -359,9 +363,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // 3DS Parameters HSM_FLIP_VIEWPORT_VERTICAL = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV-NTSC.slangp index 1074c23..4eaacc8 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV-NTSC.slangp @@ -293,7 +293,7 @@ shader47 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type47 = viewport alias47 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -363,6 +363,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -380,9 +384,10 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 // NTSC Parameters GAMMA_INPUT = 2.0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV.slangp index 2b09763..b436531 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__DREZ-480p__GDV.slangp @@ -272,7 +272,7 @@ shader44 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type44 = viewport alias44 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -342,6 +342,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 @@ -359,6 +363,7 @@ MDAPT_MODE = 1 HSM_SCALEFX_ON = 1 -HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 500 -HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 -HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 +HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 +HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 +HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-224p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-224p__GDV.slangp index 55ba86e..f82763c 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-224p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-224p__GDV.slangp @@ -241,7 +241,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -311,6 +311,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV-NTSC.slangp index 88e5e3a..05ccb92 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV-NTSC.slangp @@ -262,7 +262,7 @@ shader41 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type41 = viewport alias41 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -332,6 +332,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV.slangp index 322a62a..c5f3b8e 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-240p__GDV.slangp @@ -241,7 +241,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -311,6 +311,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__GDV.slangp index c7657e3..611c05a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__GDV.slangp @@ -241,7 +241,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -311,6 +311,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__LCD-GRID.slangp index 6114915..10fcd9b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-3DS-400x480__LCD-GRID.slangp @@ -201,7 +201,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -271,6 +271,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV-NTSC.slangp index e69f424..e262b6a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV-NTSC.slangp @@ -262,7 +262,7 @@ shader41 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type41 = viewport alias41 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -332,6 +332,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV.slangp index e991339..e72626a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-480p__GDV.slangp @@ -241,7 +241,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -311,6 +311,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__GDV.slangp index db21255..f8e4ae7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__GDV.slangp @@ -241,7 +241,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -311,6 +311,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__LCD-GRID.slangp index 81d4443..cf97893 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-NDS-256x384__LCD-GRID.slangp @@ -201,7 +201,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -271,6 +271,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__GDV.slangp index d2f5f51..f701ebd 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__GDV.slangp @@ -241,7 +241,7 @@ shader38 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type38 = viewport alias38 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -311,6 +311,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__LCD-GRID.slangp index 706aefa..5024018 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__DREZ-PSP-480x272__LCD-GRID.slangp @@ -201,7 +201,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -271,6 +271,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-1080p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-1080p__GDV.slangp index ecbe3c4..4db4265 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-1080p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-1080p__GDV.slangp @@ -215,7 +215,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -285,6 +285,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-224p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-224p__GDV.slangp index a245f92..97c27f5 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-224p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-224p__GDV.slangp @@ -215,7 +215,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -285,6 +285,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV-NTSC.slangp index 2ba7803..6f22cd4 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV-NTSC.slangp @@ -250,7 +250,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -320,6 +320,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV.slangp index d92369a..18cb60a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-240p__GDV.slangp @@ -215,7 +215,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -285,6 +285,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-3DS-400x480__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-3DS-400x480__GDV.slangp index 2f2a13c..d12746f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-3DS-400x480__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-3DS-400x480__GDV.slangp @@ -215,7 +215,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -285,6 +285,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI-NTSC.slangp index 00cad03..90e569b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI-NTSC.slangp @@ -204,7 +204,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -274,6 +274,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI.slangp index 6bd7d0f..e0c93e4 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-MINI.slangp @@ -178,7 +178,7 @@ shader25 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type25 = viewport alias25 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -248,6 +248,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-NTSC.slangp index babf08b..3d2c563 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV-NTSC.slangp @@ -250,7 +250,7 @@ shader34 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type34 = viewport alias34 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -320,6 +320,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV.slangp index 12e52b2..8a4fbd6 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__DREZ-480p__GDV.slangp @@ -215,7 +215,7 @@ shader29 = ../../shaders/HyperspaceMadness/hsm/hsm-combine-passes.slang scale_type29 = viewport alias29 = "CombinePass" // Define textures to be used by the different passes -textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;LEDImage;TopLayerImage;" +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" SamplerLUT1 = ../../shaders/HyperspaceMadness/hsm-guest/lut/trinitron-lut.png SamplerLUT1_linear = true @@ -285,6 +285,10 @@ NightLightingImage = ../../shaders/HyperspaceMadness/textures/NightLighting_1920 NightLightingImage_linear = true NightLightingImage_mipmap = 1 +NightLighting2Image = ../../shaders/HyperspaceMadness/textures/NightLighting_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + LEDImage = ../../shaders/HyperspaceMadness/textures/Placeholder_Transparent_16x16.png LEDImage_linear = true LEDImage_mipmap = 1 diff --git a/bezel/Mega_Bezel/Presets/Variations/Glass-BigBlur__ADV-GLASS.slangp b/bezel/Mega_Bezel/Presets/Variations/Glass-BigBlur__ADV-GLASS.slangp new file mode 100644 index 0000000..213ab77 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Glass-BigBlur__ADV-GLASS.slangp @@ -0,0 +1,3 @@ +#reference "../../../../shaders_slang/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp" + +HSM_SCREEN_REFLECTION_SCALE = "180.000000" diff --git a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Day__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Day__ADV.slangp index d7cd1fe..36ed5ad 100644 --- a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Day__ADV.slangp +++ b/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Day__ADV.slangp @@ -1,6 +1,7 @@ #reference "../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp" BackgroundImage = ../../shaders/HyperspaceMadness/textures/HSM_Duimon_Super_Famicom_3840x2160.png +BackgroundVertImage = ../../shaders/HyperspaceMadness/textures/HSM_Duimon_Super_Famicom_3840x2160.png HSM_VIEWPORT_VIGNETTE_OPACITY = 0 HSM_BZL_COLOR_VALUE = 30 @@ -10,10 +11,10 @@ HSM_BG_FILL_MODE = 1 HSM_BG_SCALE_KEEP_ASPECT = 0 HSM_TUBE_DIFFUSE_MODE = 1 -HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS = 30 +HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS = 150 -HSM_TUBE_STATIC_REFLECTION_IMAGE_ON = 0 -HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = 2 +HSM_TUBE_STATIC_REFLECTION_IMAGE_ON = 1 +HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = 20 HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE = 120 diff --git a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Night__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Night__ADV.slangp index a5b1501..eb9dbfb 100644 --- a/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Night__ADV.slangp +++ b/bezel/Mega_Bezel/Presets/Variations/Tube-Effects__Night__ADV.slangp @@ -2,5 +2,6 @@ HSM_AMBIENT_LIGHTING_OPACITY = 98 -HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS = 50 +HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS = 150 +HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = 30 diff --git a/bezel/Mega_Bezel/README.md b/bezel/Mega_Bezel/README.md index 1caacf9..716191f 100644 --- a/bezel/Mega_Bezel/README.md +++ b/bezel/Mega_Bezel/README.md @@ -3,7 +3,7 @@ HyperspaceMadness Mega Bezel Shader Readme ------------------------------------------------------------------------------------------------------------ ![Mega Bezel Logo](MegaBezelLogo.png) -Version 1.0.001 2022-06-24 Rev 1 +Version V1.0.003_2022-07-28_Rev-1 ---------------------------------------- ---------------------------------------- @@ -50,30 +50,34 @@ Installation ---------------------------------------- * **You MUST use Retroarch Version 1.9.8 or Later** (It will fail to load on earlier versions) -* If you have previous versions of the Mega Bezel installed: - * Delete the old Mega Bezel stuff from shaders/shaders_slang/bezel -* Inside the .zip is a bezel folder, copy the bezel folder into your Retroarch/shaders/shaders_slang folder - * The final path to the Mega bezel should be `Retroarch/shaders/shaders_slang/bezel/Mega_Bezel` -* If you are using any community packages (including the examples) place them in: - * `Retroarch/shaders/Mega_Bezel_Community_Collections` - * E.G. the examples go here `Retroarch/shaders/Mega_Bezel_Community_Collections/HSM-Mega-Bezel-Examples` -* Set video driver to **Vulcan** - * It will run in **GLCore** but seems faster in **Vulcan** - * Some users have run it with a very long load time in **D3D11** (Not Recommended) - * Restart after changing the video driver -* Open the **Settings** Menu and Set: - * **Video / Scaling / Aspect Ratio** to **Full** - * This will match your monitor aspect aspect ratio - * **Video / Scaling / Integer Scale** to **OFF** - * **Video / Output / Video Rotation** to **Normal** - * **User Interface / Show Advanced Settings** to **ON** - * **Core / Allow Rotation** to **OFF** -- **Important for FB Neo** - * Do this Before loading content -* **Load a preset** in the shaders menu, Mega Bezel shader presets are found in: - * shaders/shaders_slang/bezel/Mega_Bezel/Presets -* When you **save a preset** make sure you have the **Simple Presets** feature set to **ON** - * This will save a preset with a reference to the preset you loaded plus whatever parameter changes you made - * This will keep your presets loading properly when the shader updates in the future + * If you have a previous Mega Bezel install: + * Delete the old Mega Bezel from shaders/shaders_slang/bezel + * Inside the .zip is a bezel folder, copy the bezel folder into your Retroarch/shaders/shaders_slang folder + * The final path to the Mega bezel should be `Retroarch/shaders/shaders_slang/bezel/Mega_Bezel` + * The final path to the examples should be `Retroarch/shaders/Mega_Bezel_Community_Collections/HSM_Mega_Bezel_Examples` +* **Retroarch Setup** + * Set video driver to **Vulcan** + * It will run in **GLCore** but seems faster in **Vulcan** + * **D3D IS NOT RECOMMENDED**. If it loads in D3D it has a VERY slow load time + * Restart Retroarch after changing the video driver + * Open the **Settings** Menu and Set: + * **User Interface > Show Advanced Settings** to **ON** + * **Video > Scaling > Aspect Ratio** to **Full** + * This will match your monitor aspect aspect ratio + * **Video > Scaling > Integer Scale** to **OFF** + * **Video > Output > Video Rotation** to **Normal** + * **Core > Allow Rotation** to **OFF** -- **Important for FB Neo** + * For **FB Neo** + * Turn **vertical mode OFF** in **Quick Menu > Core Options** if it was previously turned on + * **Do all of this before loading content** + * For **FB Neo** + * **If your game is vertical** set the Rotate CRT Tube parameter to 1. If it is now upside down set Flip Core Image Vertical and Horizontal to 1 + + * **Load a preset** in the shaders menu, Mega Bezel shader presets are found in: + * `shaders/shaders_slang/bezel/Mega_Bezel/Presets` + * When you save a preset make sure you have the **Simple Presets** feature set to **ON** + * This will save a preset with a reference to the preset you loaded plus whatever parameter changes you made + * This will keep your presets loading properly when the shader updates in the future ---------------------------------------- @@ -184,16 +188,21 @@ NTSC Processing is only included in NTSC Presets, and GTU Horizontal blurring is * Load the shader * If the shader loads correctly then the shader is working. - * When the shader works in imageviewer, but doesn’t work when using a core, it is probably related to the core, or the graphics card being overwhelmed by resource usage with both the core requirements and the shader requirements - * If it is the core resolution overwhelming the resources, try a STD preset, or a STD-DREZ preset to reduce the resolution used within the shader chain + * If Retroarch crashes this is usually the core resolution overwhelming the graphics card's resources. This more often happens when you are using a SMOOTH-ADV preset. Try a STD, or STD-DREZ preset to reduce the resolution used within the shader chain + * When the shader works in imageviewer, but doesn’t work when using a core, it is probably related to the core * If you still have difficulties loading the shader with a specific core, try updating the core * If you still have difficulties download a new separate version of Retroarch and try it there. Sometimes problems lurk in a random config file which is very hard to track down * **To see errors** coming from Retroarch you need to set up your logging settings: * **Logging - Logging Verbosity - ON** * **Frontend Logging - 0(Debug)** - * **Log to File - Off** + * **Log to File - ON** + * **Restart Retroarch** + * **Load your shader** + * **Close Retroarch** + * These last steps allow you to have a short log for us to look at + * If you want to see the errors as they happen you can set Log to File to OFF and an additional console window will open when retroarch opens and show errors here -* These settings will **cause a log window to come up** when you launch, and you should see any Retroarch errors, and shader loading details + --- **If the Screen is changing size unexpectedly** @@ -209,6 +218,12 @@ NTSC Processing is only included in NTSC Presets, and GTU Horizontal blurring is * Set the Aspect Ratio Type to Explicit (1) This will use the explicit aspect ratio number instead of guessing * If this solves your issue please consider posting on the thread at the top of this document the issue you had so that we can improve the auto aspect ratio in the future + +--- +**If the Screen is shown in a vertical aspect for a horizontal game:** + + * Set The **[ Aspect Ratio ] / Orientation** to **Horizontal** + --- **If you see artifacts on the game image like circles or interference patterns** * These artifacts which look like round swirls or circles like tree trunk rings are called a Moiré patterns which happen when a high frequency pattern is sampled at a lower frequency - https://en.wikipedia.org/wiki/Moiré_pattern @@ -271,23 +286,12 @@ Parameter Descriptions ----------------------------------------------------------------------------------------------- **[ AMBIENT LIGHTING ]:** - Usually used to apply night lighting on all graphics -- **Opacity** - - How much of the ambient lighting darkening effect is applied -- **Hue** - - Shift the hue of the color of the image -- **Value** - - How dark or bright the ambient lighting is -- **Saturation** - - How saturated the night lighting is -- **Scale Mode** - - **VIEW WITH ZOOM** Scale to the full view, but scale with the viewport Zoom - - **FULL** Scale the image to the full window -- **Scale Offset** - - Scale the lighting image -- **Rotate** - - Rotate the lighting image -- **Mirror Horizontal** - - Mirror the ambient lighting image +- **Ambient 1st Image Opacity** + - How much of the ambient lighting darkening effect is applied when using the first image +- **Ambient 2nd Image Opacity** + - How much of the ambient lighting darkening effect is applied when using the second image + - **Swap Ambient Images** - Switch which image appears for number 1 to 2, and switch 2 to 1 + ----------------------------------------------------------------------------------------------- **[ VIEWPORT ZOOM ]:** @@ -328,7 +332,7 @@ Parameter Descriptions **[ CRT SCREEN SCALING GENERAL ]:** - **Integer Scale Mode** - - **0 - Off,** Use Non-Integer Scale + - **0 - OFF** Use Non-Integer Scale - **1 - ShortAxis Integer Scale On** - for the viewport (monitor) in landscape mode this is the vertical axis, If the screen/tube aspect ratio is vertical then integer scale is used for both horizontal and vertical axes - **2 - Integer Scale on both axes** @@ -373,8 +377,8 @@ Parameter Descriptions - **Use Image For Automatic Placement (Scale and Y Pos)** - When on the placement image is inspected to find where to place and scale the screen image - **Auto Place Horizontal (X Pos)** - - **0 - OFF** Screen placed in the center - - **1 - ON** Tries to place the screen in the center of the hole in the placement image + - 0 - OFF Screen placed in the center + - 1 - ON Tries to place the screen in the center of the hole in the placement image - **Placement Image Mode: TRANSPARENCY : WHITE ON BLACK** - What channel of the texture to look at to find the hole in the image, either the transparent part, or a white rectangle on top of a black background @@ -405,8 +409,8 @@ Parameter Descriptions **[ CROPPING CORE IMAGE ]:** --- Cropping removes parts of the game image at the edges of the screen which were never meant to be seen. Negative values can add more black area at the edges of the screen -- **Crop Mode - OFF | CROP BLACK ONLY | CROP ANY** - - **0 - Off,** No Cropping applied +- **Crop Mode** + - **0 - OFF** No Cropping applied - **1 - Crop Black Only** Only apply the cropping amount within the black areas of the core image - **2 - Crop Any** Apply full crop amount - **Crop Zoom %** Add Cropping on all sides at once @@ -429,9 +433,9 @@ Cropping removes parts of the game image at the edges of the screen which were n **[ SCANLINE DIRECTION ]:** - **Scanline Direction** - Direction of the scanlines - - **0 - Auto** --- Chooses horizontal or vertical scanline direction based on aspect ratio - - **1 - Horizontal** - - **2 - Vertical** + - 0 - Auto --- Chooses horizontal or vertical scanline direction based on aspect ratio + - 1 - Horizontal + - 2 - Vertical ----------------------------------------------------------------------------------------------- @@ -531,10 +535,10 @@ Blend parts of the image which flicker on/off repeatedly between frames often us **[ MONOCHROME ]:** --- Have the screen act as if it is a monochrome CRT - **Monochrome Color:** - - **0: OFF** - - **1: BLACK & WHITE** - - **1: AMBER** - - **1: GREEN** + - 0: OFF + - 1: BLACK & WHITE + - 2: AMBER + - 3: GREEN - **Monochrome Gamma** - **Monochrome Hue Offset** @@ -578,14 +582,15 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Scale Y** - Scales shadow from the top of the tube - **Curvature Scale** - How much curvature is applied to the shadow, more curvature has the effect of making it look like the light is higher relative to the tube/bezel - ----------------------------------------------------------------------------------------------- -**[ TUBE STATIC REFLECTION IMAGE ]:** -- **Use Tube Static Reflection Image - OFF | ON** --- Apply the effect or not -- **Opacity** --- This is the shine on the tube which imitates reflection from the environment -- **Ambient Lighting Multiplier** --- How much of the global ambient lighting image to apply, default is 100 -- **Scale** --- Scales the tube reflection image from the center of the tube +**[ CRT ON TUBE DIFFUSE BLENDING ]:** +How to apply the CRT (Game Image) on top of the tube +- **CRT On Tube Diffuse Blend Mode** + - 0: OFF - Don't apply the game image + - 1: ADD - Apply the game image additively this is the normal behavior + - 2: Multiply - Darken the tube diffuse image with the game image +- **CRT On Tube Diffuse Blend Amount** - Opacity or how much of the image to apply to the tube ----------------------------------------------------------------------------------------------- **[ TUBE COLORED GEL IMAGE ]:** @@ -601,21 +606,33 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Additive Blend Amount** - Image applied as a brightening of the tube area - Used to add color to the screen as if it was the gel being diffusely lit from outside the monitor - **Normal Blend Amount** - Used for the more opaque parts of a gel image like for the Vectrex +- **Normal Blend Transparency Threshold** - Adjusts at what transparency of the image the area should be appear fully transparent +- **Normal Multiply by Tube Diffuse Shading** - Darken the gel with the tube diffuse image, allows you to add shading to the gel image - **Normal Blend Brightness** - Brightness for these more opaque parts -- **Normal Blend Transparency Threshold** - Adjusts at what transparency of the image the area should be fully transparent - **Ambient Lighting Multiplier** - How much of the global ambient lighting to apply +- **Ambient 2nd Image Lighting Multiplier** - How much of the global 2nd ambient lighting to apply - **Scale** - Scale the colored gel image - **Flip Horizontal** - Flip the colored gel image Horizontally - **Flip Vertical** - Flip the colored gel image Vertically - **Show CRT on Top of Colored Gel Normal** - Put the CRT image on top of the gel image so it is not color shifted or obscured. +----------------------------------------------------------------------------------------------- +**[ TUBE STATIC REFLECTION IMAGE ]:** +- **Use Tube Static Reflection Image - OFF | ON** --- Apply the effect or not +- **Opacity** --- This is the shine on the tube which imitates reflection from the environment +- **Dual Screen Visibility** --- Which screen the static reflection is shown + - 0: Both Screens** + - 1: Only the First Screen + - 2: Only the Second Screen +- **Ambient Lighting Multiplier** --- How much of the global ambient lighting image to apply, default is 100 +- **Ambient 2nd Image Lighting Multiplier** --- How much of the global 2nd ambient lighting image to apply, default is 0 +- **Scale** --- Scales the tube reflection image from the center of the tube +- **Shadow Opacity** --- How much of the shadow should appear on the static reflection image + ----------------------------------------------------------------------------------------------- **[ SCREEN BLACK EDGE ]:** -- **Show Black Edge** --- Show the black edge at the edge of the tube - - 0: Don't show any black edge - - 1: Show the black edge overtop the tube diffuse and gel - **Global Corner Radius** --- Global radius of all corners before their own multipliers are applied - **Black Edge Corner Radius Scale** --- the roundness of the corner of the screen area - **Black Edge Sharpness** --- Blends the edge of the game screen image to black, lower values will fade the edge @@ -628,14 +645,14 @@ Adds a shadow on top of the tube diffuse image and colored gel **[ DUAL SCREEN ]:** - **Dual Screen Mode** - - **0 - OFF** - Single Screen - - **1 - VERTICAL** - Split into 2 screens one on the top and one on the bottom - - **2 - HORIZONTAL** - Split into 2 screens one on the left and one on the right + - 0 - OFF - Single Screen + - 1 - VERTICAL - Split into 2 screens one on the top and one on the bottom + - 2 - HORIZONTAL - Split into 2 screens one on the left and one on the right - **Core Image Split Mode** - - **0 - AUTO** - Split in the same direction as the dual screen mode - - **1 - VERTICAL** - - **2 - HORIZONTAL** + - 0 - AUTO - Split in the same direction as the dual screen mode + - 1 - VERTICAL + - 2 - HORIZONTAL - **Core Image Split Offset** - Adjusts where we split the core image into two - This is an offset in pixels from the center @@ -653,15 +670,11 @@ Adds a shadow on top of the tube diffuse image and colored gel - **2nd Screen Aspect Ratio Mode** - 0 - Use the same Aspect ratio as the first Screen - 1 - PAR (Uses the square pixel aspect of the bottom screen's resolution) -- **2nd Screen Use Independent Scale** - - Don't affect the second screen with the scale of the first -- **2nd Screen Scale Offset** - - Increase or Decrease scale of second screen -- **2nd Screen Pos X** - - Move the second screen Horizontally -- **2nd Screen Pos Y** - - Move the second screen Vertically -- **2nd Screen Crop Zoom %** +- **2nd Screen Use Independent Scale** - Don't affect the second screen with the scale of the first +- **2nd Screen Scale Offset** - Increase or Decrease scale of second screen +- **2nd Screen Pos X** - Move the second screen Horizontally +- **2nd Screen Pos Y** - Move the second screen Vertically +- **2nd Screen Crop Zoom %** - Crop on all sides at once - **2nd Screen Crop Overscan Top** - **2nd Screen Crop Overscan Bottom** - **2nd Screen Crop Overscan Left** @@ -678,6 +691,41 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Screen Reflection Pos Y** - Shift the reflection up or down +----------------------------------------------------------------------------------------------- +**[ AMBIENT LIGHTING IMAGE 1 ]:** + +- **Hue** + - Shift the hue of the color of the image +- **Saturation** + - How saturated the ambient lighting is +- **Value** + - How dark or bright the ambient lighting is +- **Contrast** + - Contrast in the ambient lighting +- **Scale Aspect** + - **MATCH VIEWPORT** - Stretch the width of the image to the full viewport + - **USE TEXURE ASPECT** - The base aspect of the image will match the image file aspect +- **Scale With Zoom** + - **OFF** Don't scale the ambient lighting with the viewport Zoom + - **ON** Scale with the viewport Zoom +- **Scale Offset** + - Scale the lighting image in both directions +- **Scale Offset X** + - Scale the lighting image in the horizontal direction +- **Rotate** + - Rotate the lighting image +- **Mirror Horizontal** + - Flip the ambient lighting left to right +- **Position X** + - Move the image left and right +- **Position Y** + - Move the image up and down + + +----------------------------------------------------------------------------------------------- +**[ AMBIENT LIGHTING IMAGE 2 ]:** - Has the same parameters as Ambiend Image 1 + + ----------------------------------------------------------------------------------------------- **[ BEZEL INDEPENDENT SCALE & CURVATURE ]:** @@ -741,6 +789,9 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Highlight** - The highlight or shininess in the middle of the bezel +- **Noise** + - Noise or speckles in the color, default is 30 + - **Opacity of Shadow from Bezel on Tube** - How much of a darkness from the bezel onto the illuminated screen - Only visible when the black ring around the screen is reduced so that the bezel is almost on top of the screen @@ -754,8 +805,6 @@ Adds a shadow on top of the tube diffuse image and colored gel - How saturated or strong the color is - **Value/Brightness** - The brightness of the color, default is 10 which is 10% -- **Noise** - - Noise or speckles in the color, default is 30 ----------------------------------------------------------------------------------------------- **[ FRAME COLOR ]:** @@ -768,8 +817,6 @@ Adds a shadow on top of the tube diffuse image and colored gel - How saturated or strong the color is - **Value/Brightness** - The brightness of the color, default is 10 which is 10% -- **Noise** - - Noise or speckles in the color, default is 30 ----------------------------------------------------------------------------------------------- **[ FRAME GENERAL ]:** @@ -784,6 +831,8 @@ Adds a shadow on top of the tube diffuse image and colored gel - **1 - Normal Blending** - **2 - Additive Blending** - Added on as added with a projector - **3 - Multiply Blending** - Applied by darkening what is underneath +- **Noise** + - Noise or speckles in the color, default is 30 - **Inner Edge Thickness** - Thickness of the inner edge of the frame - **Inner Corner Radius Scale** @@ -907,6 +956,7 @@ Adds a shadow on top of the tube diffuse image and colored gel +----------------------------------------------------------------------------------------------- ## **POTATO Presets Only** ----------------------------------------------------------------------------------------------- @@ -930,6 +980,7 @@ Adds a shadow on top of the tube diffuse image and colored gel +----------------------------------------------------------------------------------------------- ## **GLASS Presets Only** ----------------------------------------------------------------------------------------------- @@ -943,9 +994,9 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Normal** - - **Additive** - Adds the image as if it is being projected on top + - **Additive** adds the image as if it is being projected on top - - **Multiply** - Image is applied as if it was a colored plastic film + - **Multiply** applies as if it was a colored plastic film ----------------------------------------------------------------------------------------------- diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/ShaderTodo.txt b/bezel/Mega_Bezel/shaders/HyperspaceMadness/ShaderTodo.txt index e2f8efa..171f1c9 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/ShaderTodo.txt +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/ShaderTodo.txt @@ -1,12 +1,35 @@ ![Mega_Bezel_Logo|512x256, 75%](upload://6PNkvcMF9Go9Wnk6OJXfYR1opXI.png) -Mega Bezel is updated to V 1.0.001 2022-06-24 Rev 1 +Mega Bezel is updated to V1.0.003_2022-07-28_Rev-1 Changes: - * Mega Bezel V1 + * Updated to the latest guest release: crt-guest-advanced-2022-07-27-release1 + * Changed Guest mask size to 1 by default so that there isn't inconsistency using guest settings in the Mega Bezel + * Adjusted the default SMOOTH-ADV scaling parameters for a sharper smooth look: + * HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = 300 + * HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 125 + * HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 + * HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 0 + * Added **Shift Sampling Relative to Scanlines** to shift the image relative to the scanlines + * The ScaleFx settings now only appear on the SMOOTH-ADV preset nearer the bottom of the parameter list + * Fixed Double image when using cropping in NTSC presets reported by @JHorbach1 + * Updated to crt-guest-advanced-2022-07-17-release1 + * Includes Scanline Gamma + * Tube Gel and Diffuse Fixes + * Gel is now mapped to the tube, independent of the black edge + * Added a feature to add a bit of tube diffuse shading to the GEL this should make it look a little more natural + * [ TUBE COLORED GEL IMAGE ] > Normal Multiply by Tube Diffuse Shading + * HSM_TUBE_BLACK_EDGE_LAYERING_MODE has been removed as it's not needed anymore + * CRT Multiply blend mode now works better when there is extra tube thickness + * Changed HSM_TUBE_DIFFUSE_IMAGE_SCALE to 120 by default to have a less rounded look + * If you want a stronger rounded shaded look reset it to 100 + * Fixed Scale discrepancy when using the Cab Glass Image + * Added Shadow Opacity param to control shadow being applied to the static tube highlight + ---------------------------------------------------- ---- V1 TODO --------------------------------------- +--- TODO --------------------------------------- ---------------------------------------------------- + * Fix Diffuse / Gel with extra tube thickness, currently showing black * Megatron HDR Combination at end of chain * Fix Tube Diffuse Shadow in 3D Curvature * Add .params #reference to with all parameters commented out diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-afterglow0.slang b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-afterglow0.slang index 54a1318..c3799e2 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-afterglow0.slang +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-afterglow0.slang @@ -73,7 +73,7 @@ void main() vec3 accumulate = COMPAT_TEXTURE(AfterglowPassFeedback, TEX0.xy).rgb; float w = 1.0; - if ((color.r + color.g + color.b < GDV_AFTERGLOW_THRESHOLD)) { w = 0.0; } + if ((color.r + color.g + color.b < 5.0/255.0)) { w = 0.0; } vec3 result = mix( max(mix(color, accumulate, 0.49 + vec3(PR, PG, PB))- 3.0/255.0, 0.0), color, w); diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-dariusg-gdv-mini.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-dariusg-gdv-mini.inc index 856ca94..0879341 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-dariusg-gdv-mini.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-dariusg-gdv-mini.inc @@ -117,7 +117,7 @@ vec3 Mask(vec2 pos, vec3 c) // If using automatic Mask Size if (masksize < 0.5) - final_mask_size = (global.FinalViewportSize.x + global.FinalViewportSize.y) / 3 > 1900 ? 2 : 1; + final_mask_size = global.FinalViewportSize.y > 2000 ? 2 : 1; final_mask_size = max(1, floor(((1 - HSM_VIEWPORT_ZOOM_MASK) + HSM_VIEWPORT_ZOOM_MASK * VIEWPORT_SCALE.y) * final_mask_size + 0.2)); diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass1.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass1.inc index f156cef..5968095 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass1.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass1.inc @@ -62,12 +62,7 @@ layout(push_constant) uniform Push #pragma parameter prescalex " Prescale-X Factor (for xBR...pre-shader) -- prescalex" 1.0 1.0 4.0 1.0 // Joint parameter with main pass, values must match #define prescalex params.prescalex // prescale-x factor -/// HSM Removed -// #define COMPAT_TEXTURE(c,d) texture(c,d) - -// HSM Added -#define COMPAT_TEXTURE(c,d) HSM_GetCroppedTexSample(c,d) -// End Addition +#define COMPAT_TEXTURE(c,d) texture(c,d) #define TEX0 vTexCoord diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass2.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass2.inc index e6c8ef7..a5ff4e0 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass2.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced-ntsc-pass2.inc @@ -62,6 +62,9 @@ layout(push_constant) uniform Push #pragma parameter bloom " Bloom Strength -- bloom" 0.0 -2.0 2.0 0.05 #define bloom global.bloom // bloom effect +#pragma parameter mask_bloom " Mask Bloom -- mask_bloom" 0.0 0.0 2.0 0.05 +#define mask_bloom global.mask_bloom // bloom effect + #pragma parameter bloom_dist " Bloom Distribution -- bloom_dist" 0.0 0.0 3.0 0.05 #define bloom_dist global.bloom_dist // bloom effect distribution @@ -106,7 +109,7 @@ layout(push_constant) uniform Push #pragma parameter scan_falloff " Scanline Falloff -- scan_falloff" 1.0 0.25 2.0 0.05 #define scan_falloff global.scan_falloff // scanline falloff -#pragma parameter scangamma " Scanline Gamma -- scangamma" 2.40 0.5 5.0 0.05 +#pragma parameter scangamma " Scanline Gamma -- scangamma" 2.40 0.5 10.0 0.05 #define scangamma global.scangamma #pragma parameter rolling_scan " Rolling Scanlines -- rolling_scan" 0.0 -1.0 1.0 0.01 diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced.inc index ac97558..eeca9a6 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-crt-guest-advanced.inc @@ -33,6 +33,9 @@ #pragma parameter bloom " Bloom Strength -- bloom" 0.0 -2.0 2.0 0.05 #define bloom global.bloom // bloom effect +#pragma parameter mask_bloom " Mask Bloom -- mask_bloom" 0.0 0.0 2.0 0.05 +#define mask_bloom global.mask_bloom // bloom effect + #pragma parameter bloom_dist " Bloom Distribution -- bloom_dist" 0.0 0.0 3.0 0.05 #define bloom_dist global.bloom_dist // bloom effect distribution @@ -81,7 +84,10 @@ #define spike global.spike #pragma parameter rolling_scan " Rolling Scanlines -- rolling_scan" 0.0 -1.0 1.0 0.01 -#define rolling_scan global.rolling_scan // rolling scanlines +#define rolling_scan global.rolling_scan // rolling scanlines + +#pragma parameter scangamma " Scanline Gamma" 2.40 0.5 10.0 0.05 +#define scangamma global.scangamma #pragma parameter bogus_filtering "[ FILTERING OPTIONS ]: " 0.0 0.0 1.0 1.0 @@ -439,6 +445,8 @@ void main() float fscolor1 = (lm2*swl2 + lm1*swl1 + rm1*swr1 + rm2*swr2)/(swl2+swl1+swr1+swr2); vec3 scolor1 = vec3(clamp(mix(max(max(color1.r,color1.g),color1.b), fscolor1, spike), 0.0, 1.0)); + + if(!interb) color1 = pow(color1, vec3(scangamma/gamma_in)); vec3 scolor2; @@ -481,6 +489,9 @@ void main() float fscolor2 = (lm2*swl2 + lm1*swl1 + rm1*swr1 + rm2*swr2)/(swl2+swl1+swr1+swr2); scolor2 = vec3(clamp(mix(max(max(color2.r,color2.g),color2.b), fscolor2, spike), 0.0, 1.0)); + + color2 = pow(color2, vec3(scangamma/gamma_in)); + } vec3 ctmp = color1; float w3 = 1.0; vec3 color = color1; @@ -582,8 +593,7 @@ if (!interb) float colmx = pow(max(max(ctmp.r,ctmp.g),ctmp.b), 1.40/gamma_in); - // TODO Don't add gamma, output from pass should be linear - // color = pow(color, vec3(1.0/gamma_out)); - + if(!interb) color = pow( color, vec3(gamma_in/scangamma) ); + FragColor = vec4(color, colmx); } diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-deconvergence.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-deconvergence.inc index 64cf8a4..bc11fd9 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-deconvergence.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-deconvergence.inc @@ -30,6 +30,9 @@ #pragma parameter bloom " Bloom Strength -- bloom" 0.0 -2.0 2.0 0.05 #define bloom global.bloom // bloom effect +#pragma parameter mask_bloom " Mask Bloom -- mask_bloom" 0.0 0.0 2.0 0.05 +#define mask_bloom global.mask_bloom // bloom effect + #pragma parameter bloom_dist " Bloom Distribution -- bloom_dist" 0.0 0.0 3.0 0.05 #define bloom_dist global.bloom_dist // bloom effect distribution @@ -102,7 +105,7 @@ #pragma parameter shadowMask "CRT Mask: -1:None|0:CGWG|1-4:Lottes|5-12:Trinitrn -- shadowMask" 0.0 -1.0 12.0 1.0 #define shadowMask global.shadowMask // Mask Style -#pragma parameter masksize " Mask Size - 0:Auto | 2K | 4k -- masksize" 0.0 0.0 4 1.0 +#pragma parameter masksize " Mask Size - 0:Auto | 2K | 4k -- masksize" 1.0 0.0 4 1.0 #define masksize global.masksize // Mask Size #pragma parameter maskstr " Mask Strength (0, 5-12) -- maskstr" 0.3 -0.5 1.0 0.025 @@ -138,7 +141,7 @@ #pragma parameter double_slot " Slot Mask Height: 2x1 or 4x1... -- double_slot" 1.0 1.0 4.0 1.0 #define double_slot global.double_slot // Slot Mask Height -#pragma parameter slotms " Slot Mask Size - Auto | 2K | 4k -- slotms" 0.0 0.0 4.0 1.0 +#pragma parameter slotms " Slot Mask Size - Auto | 2K | 4k -- slotms" 1.0 0.0 4.0 1.0 #define slotms global.slotms // Slot Mask Size #pragma parameter mclip " Keep Mask effect with clipping -- mclip" 0.50 0.0 1.0 0.05 @@ -231,7 +234,7 @@ vec3 Mask(vec2 pos, float mx) // If using automatic Mask Size if (masksize < 0.5) - final_mask_size = (global.FinalViewportSize.x + global.FinalViewportSize.y) / 3 > 1900 ? 2 : 1; + final_mask_size = global.FinalViewportSize.y > 2000 ? 2 : 1; final_mask_size = max(1, floor(((1 - HSM_VIEWPORT_ZOOM_MASK) + HSM_VIEWPORT_ZOOM_MASK * VIEWPORT_SCALE.y) * final_mask_size + 0.2)); @@ -670,7 +673,7 @@ void main() // HSM Added if (GDV_DECONVERGENCE_ON > 0.5) - fetch_pixel(color, Bloom, pos1, pos); + fetch_pixel(color, Bloom, pos1, pos); // deconvergence float cm = max(max(color.r,color.g),color.b); float mx1 = COMPAT_TEXTURE(Source, pos1 ).a; @@ -696,6 +699,19 @@ void main() cmask*= Mask(maskcoord, mx); if (mask_layout > 0.5) cmask = cmask.rbg; + + vec3 cmask1 = cmask; + float smask1 = smask; + + if (mask_bloom > 0.025) + { + float maxb = max(max(Bloom.r,Bloom.g),Bloom.b); + maxb = pow(sqrt(maxb*mix(maxb, colmx, 0.75)),0.275); + vec3 mBloom = 0.5*(1.5*Bloom+0.5*maxb) * mix(1.0, 2.0-colmx, (bloom_dist + 0.5)); + float maskmx = 1.0; if (shadowMask > 0.5 || shadowMask < 4.5) maskmx = maskLight; else if (shadowMask > 6.5 && shadowMask < 10.5) maskmx = 1.0; else maskmx = max(max(cmask.r,cmask.g),cmask.b); + cmask = min(cmask + maxb*mBloom*mask_bloom, maskmx); + smask = min(smask + 0.9*maxb*max(max(mBloom.r,mBloom.g),mBloom.b)*mask_bloom, 1.0); + } color = pow(color, vec3(mask_gamma/gamma_in)); color = color*cmask; @@ -704,6 +720,7 @@ void main() color = pow(color, vec3(gamma_in/mask_gamma)); cmask = min(cmask*smask, 1.0); + cmask1 = min(cmask1*smask1, 1.0); float bb = mix(brightboost, brightboost1, colmx); if (interb) bb = (abs(intera-0.5)<0.1) ? pow(0.80*bb, 0.65) : pow(bb, 0.70); @@ -718,7 +735,7 @@ void main() vec3 Glow = HSM_GetCroppedTexSample(GlowPass, pos).rgb; vec3 Ref = HSM_GetCroppedTexSample(LinearizePass, pos).rgb; - float maxb = COMPAT_TEXTURE(BloomPass, pos).a; + float maxb = HSM_GetCroppedTexSample(BloomPass, pos).a; vec3 Bloom1 = Bloom; @@ -731,13 +748,13 @@ void main() color = color + abs(bloom) * Bloom1; - color = min(color, mix(one, cmask, mclip)); + color = min(color, mix(one, cmask1, mclip)); if (!interb) color = declip(color, mix(1.0, w3, 0.6)); else w3 = 1.0; if (halation > 0.01) { Bloom = mix(0.5*(Bloom + Bloom*Bloom), 0.75*Bloom*Bloom, colmx); - color = color + 2.0*max((maxb+maxb*maxb-0.5*max(max(Ref.r,Ref.g),Ref.b)),0.25)*mix(1.0,w3,0.5*colmx)*mix(one,cmask,0.6)*Bloom*halation; } + color = color + 2.0*max((2.0*mix(maxb*maxb, maxb, colmx)-0.5*max(max(Ref.r,Ref.g),Ref.b)),0.25)*mix(1.0,w3,0.5*colmx)*mix(one,cmask,0.6)*Bloom*halation; } Glow = mix(Glow, 0.25*color, 0.7*colmx); diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-pre-shaders-afterglow.slang b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-pre-shaders-afterglow.slang index 2d66ae5..f1d2678 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-pre-shaders-afterglow.slang +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm-pre-shaders-afterglow.slang @@ -45,11 +45,9 @@ layout(push_constant) uniform Push #pragma parameter AS " Afterglow Strength -- AS" 0.20 0.0 0.60 0.01 #define AS params.AS -#pragma parameter sat " Afterglow Saturation -- sat" 0.33 0.0 1.0 0.01 +#pragma parameter sat " Afterglow Saturation -- sat" 0.50 0.0 1.0 0.01 #define sat params.sat -// #pragma parameter BP " Brighten Black (For Scanlines on Black) -- BP" 0.0 0.0 100.0 1.0 - #pragma parameter bogus_color "[ COLOR TWEAKS ]:" 0.0 0.0 1.0 1.0 #pragma parameter CS " Display Gamut: sRGB, Modern, DCI, Adobe, Rec.2020 -- CS" 0.0 0.0 4.0 1.0 @@ -74,17 +72,19 @@ layout(push_constant) uniform Push #pragma parameter pre_bb " Brightness Adjustment" 1.0 0.0 2.0 0.01 -#pragma parameter contr " Contrast Adjustment" 0.0 -1.0 1.0 0.05 +#pragma parameter contr " Contrast Adjustment" 0.0 -1.0 1.0 0.05 #pragma parameter sega_fix " Sega Brightness Fix" 0.0 0.0 1.0 1.0 +#pragma parameter BP " Raise Black Level" 0.0 -100.0 25.0 1.0 + // #pragma parameter vigstr " Vignette Strength" 0.0 0.0 2.0 0.025 // #pragma parameter vigdef " Vignette Definition" 7.0 0.4 15.0 0.2 #define WP params.WP #define wp_saturation params.wp_saturation -#define BP 0 +#define BP params.BP layout(std140, set = 0, binding = 0) uniform UBO { @@ -257,8 +257,6 @@ void main() aftglow.rgb = AS*w*normalize(pow(aftglow.rgb + 0.01, vec3(sat)))*l; float bp = w * BP/255.0; - imgColor.rgb = imgColor.rgb * params.pre_bb; - // Retro Sega Systems: Genesis, 32x, CD and Saturn 2D had color palettes designed in TV levels to save on transformations. if (params.sega_fix > 0.5) imgColor.rgb = imgColor.rgb * (255.0 / 239.0); @@ -370,7 +368,12 @@ void main() color = mix(color, comp, m); color = pow(max(color, 0.0), vec3(1.0/p)); - color = color + aftglow.rgb + bp; + if (BP > -0.5) color = color + aftglow.rgb + bp; else + { + color = max(color + BP/255.0, 0.0) / (1.0 + BP/255.0*step(- BP/255.0, max(max(color.r,color.g),color.b))) + aftglow.rgb; + } + + color = min(color * params.pre_bb, 1.0); /* HSM Removed FragColor = vec4(color, vignette(vTexCoord.xy)); diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm_crt-guest-advanced-release-version.txt b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm_crt-guest-advanced-release-version.txt index 0e175c2..b821d93 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm_crt-guest-advanced-release-version.txt +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/hsm_crt-guest-advanced-release-version.txt @@ -1 +1 @@ -crt-guest-advanced-2022-06-18-release1 \ No newline at end of file +crt-guest-advanced-2022-07-27-release1 \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass1.slang b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass1.slang index 3ad7927..76ad9d7 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass1.slang +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass1.slang @@ -19,7 +19,7 @@ layout(std140, set = 0, binding = 0) uniform UBO #pragma parameter quality " NTSC Preset: S-Video | Composite | RF | Custom:-1 -- quality" 1.0 -1.0 2.0 1.0 #pragma parameter ntsc_fields " NTSC Merge Fields" 0.0 0.0 1.0 1.0 #pragma parameter ntsc_phase " NTSC Phase: Auto | 2 phase | 3 phase" 1.0 1.0 3.0 1.0 -#pragma parameter ntsc_scale " NTSC Resolution Scaling" 1.0 0.20 2.25 0.01 +#pragma parameter ntsc_scale " NTSC Resolution Scaling" 1.0 0.20 2.5 0.01 #pragma parameter ntsc_sat " NTSC Color Saturation" 1.0 0.0 2.0 0.01 #pragma parameter ntsc_bright " NTSC Brightness" 1.0 0.0 1.5 0.01 #pragma parameter cust_fringing " NTSC Custom Fringing Value (When NTSC Preset = -1)" 0.0 0.0 5.0 0.1 diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass2.slang b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass2.slang index e439886..803ff16 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass2.slang +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-guest/ntsc/hsm-ntsc-pass2.slang @@ -16,7 +16,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float auto_res; } global; -#pragma parameter ntsc_scale " NTSC Resolution Scaling" 1.0 0.20 2.25 0.01 +#pragma parameter ntsc_scale " NTSC Resolution Scaling" 1.0 0.20 2.5 0.01 #pragma parameter ntsc_phase " NTSC Phase: Auto | 2 phase | 3 phase" 1.0 1.0 3.0 1.0 #pragma stage vertex diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-scalefx/hsm-scalefx.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-scalefx/hsm-scalefx.inc index ca3507e..8da1c25 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-scalefx/hsm-scalefx.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm-scalefx/hsm-scalefx.inc @@ -4,10 +4,6 @@ vec4 HSM_TextureOffset(in sampler2D in_sampler, vec2 in_coord, vec2 pixel_offset return texture(in_sampler, in_coord + uv_offset); } -#pragma parameter HSM_SCALEFX_TITLE "[ --- SMOOTHING - SCALEFX - SMOOTH-ADV Presets Only ---- ]:" 0 0 0.01 0.01 +#pragma parameter HSM_SCALEFX_TITLE "[ --- SMOOTHING - SCALEFX ---- ]:" 0 0 0.01 0.01 #pragma parameter HSM_SCALEFX_ON " ScaleFx ON - Must Increase Core Res Sampling" 0 0 1 1 -#define HSM_SCALEFX_ON params.HSM_SCALEFX_ON - -// #pragma parameter HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR " Source Resolution Division Factor" 1 0 10 1 -// #define HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR params.HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR - +#define HSM_SCALEFX_ON params.HSM_SCALEFX_ON \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions-bezel.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions-bezel.inc index 5ac1cc3..50e722b 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions-bezel.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions-bezel.inc @@ -97,19 +97,6 @@ float HSM_GetBezelCoords(vec2 screen_coord, return 0; } -// Change Transforms for Scale - -// Applies the position before scaling from the center -// Should allow having an image where the center of the tube in the graphic is off center -// the position offset moves it so the screen is centered, then the graphic is scaled from the center -vec2 HSM_AddPosScaleToCoord(vec2 in_base_coord, vec2 in_base_scale, vec2 in_pos, vec2 in_scale) -{ - // out_coord += in_base_scale * in_transform.zw; - vec2 positioned_coord = in_base_coord + in_pos; - vec2 out_coord = HSM_GetInverseScaledCoord(positioned_coord, in_scale); - return out_coord; -} - float MAX_LAYER_ORDER = 12; bool HSM_GetUseTubeStaticReflection() @@ -127,7 +114,7 @@ bool HSM_GetUseTubeColoredGelImage() return HSM_TUBE_COLORED_GEL_IMAGE_ON > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_TUBE_COLORED_GEL_IMAGE_DUALSCREEN_VIS_MODE); } -vec4 HSM_GetTubeHighlight(vec2 tube_curved_coord, bool apply_to_mirror, in sampler2D TubeStaticReflectionImage, vec4 ambient_lighting_image) +vec4 HSM_GetTubeHighlight(vec2 tube_curved_coord, bool apply_to_mirror, in sampler2D TubeStaticReflectionImage) { tube_curved_coord = HSM_GetViewportCoordWithFlip(tube_curved_coord); vec4 out_color = vec4(0); @@ -157,12 +144,6 @@ vec4 HSM_GetTubeHighlight(vec2 tube_curved_coord, bool apply_to_mirror, in sampl tube_highlight_image = HSM_Linearize(tube_highlight_image, DEFAULT_SRGB_GAMMA) * tube_highlight_mask; - if (HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING > 0) - { - ambient_lighting_image.rgb = (1 - HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING) * vec3(1) + HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING * ambient_lighting_image.rgb; - tube_highlight_image.rgb *= ambient_lighting_image.rgb; - } - out_color = HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY * tube_highlight_image * tube_highlight_image.a; out_color.rgb *= HSM_GLOBAL_GRAPHICS_BRIGHTNESS; diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions.inc index 88b63c3..edff06c 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-common-functions.inc @@ -296,6 +296,32 @@ vec2 HSM_GetInverseScaledCoord(vec2 in_coord, vec2 in_scale) return scaled_coord; } +// Applies the position before scaling from the center +// Should allow having an image where the center of the tube in the graphic is off center +// the position offset moves it so the screen is centered, then the graphic is scaled from the center +vec2 HSM_AddPosScaleToCoord(vec2 in_base_coord, vec2 in_pos, vec2 in_scale) +{ + vec2 positioned_coord = in_base_coord + in_pos; + vec2 out_coord = HSM_GetInverseScaledCoord(positioned_coord, in_scale); + return out_coord; +} + +vec2 GetSimpleImageScaledCoord(vec2 in_coord, vec2 in_viewport_unscaled_coord, in sampler2D in_sampler, vec2 in_pos, vec2 in_scale, float in_zoom_with_full, float in_keep_aspect, float in_mirror_horz, float in_rotate ) +{ + vec2 coord_ctr = (in_zoom_with_full == 1 ? in_coord : in_viewport_unscaled_coord) - 0.5; + coord_ctr.x = in_mirror_horz == 1 ? -1 * coord_ctr.x : coord_ctr.x; + + in_coord = HSM_RotateCoordinate(in_coord, in_rotate); + + vec2 tex_size = textureSize(in_sampler, 0); + float tex_aspect = in_rotate == 1 ? tex_size.y / tex_size.x : tex_size.x / tex_size.y; + float output_aspect = global.FinalViewportSize.x / global.FinalViewportSize.y; + + coord_ctr.x *= in_keep_aspect == 1 ? tex_aspect / output_aspect : 1; + + return HSM_AddPosScaleToCoord(coord_ctr + 0.5, in_pos, in_scale); +} + vec2 HSM_GetRotatedCorePreppedSizeWithResMult(float screen_index) { vec2 prepped_size = HSM_GetScreenCorePreppedSize(screen_index); @@ -656,10 +682,13 @@ vec2 HSM_GetCRTShaderCurvedCoord(vec2 in_coord) { vec2 out_coord = HSM_GetCurvedCoord(in_coord, 1, SCREEN_ASPECT); - if (HSM_CRT_CURVATURE_SCALE < 100 && !HHLP_IsOutsideCoordSpace(out_coord)) + if (HHLP_IsOutsideCoordSpace(out_coord)) { - out_coord = HSM_GetCurvedCoord(in_coord, HSM_CRT_CURVATURE_SCALE, SCREEN_ASPECT); + vec2 tube_scale_ratio = TUBE_SCALE / SCREEN_SCALE; + out_coord = (out_coord - 0.5) / tube_scale_ratio + 0.5; } + else if (HSM_CRT_CURVATURE_SCALE < 100) + out_coord = HSM_GetCurvedCoord(in_coord, HSM_CRT_CURVATURE_SCALE, SCREEN_ASPECT); return out_coord; } @@ -682,6 +711,22 @@ vec2 HSM_GetMirrorWrappedCoord(vec2 in_coord) return ctr_mirror_coord + 0.5; } +vec2 HSM_GetMirrorWrapCoord(vec2 in_coord) +{ + vec2 ctr_coord = in_coord - 0.5; + vec2 ctr_mirror_coord = vec2(0,0); + + float x_is_outside = clamp((clamp(abs(ctr_coord.x), 0.5, 1) - 0.5) * 100000, 0, 1); + ctr_mirror_coord.x = (1 - x_is_outside) * ctr_coord.x + + x_is_outside * (ctr_coord.x - 2 * sign(ctr_coord.x) * (abs(ctr_coord.x) - 0.5)); + + float y_is_outside = clamp((clamp(abs(ctr_coord.y), 0.5, 1) - 0.5) * 100000, 0, 1); + ctr_mirror_coord.y = (1 - y_is_outside) * ctr_coord.y + + y_is_outside * (ctr_coord.y - 2 * sign(ctr_coord.y) * (abs(ctr_coord.y) - 0.5)); + + return ctr_mirror_coord + 0.5; +} + // Borrowed from cgwg's crt-geom, under GPL float HSM_GetCornerMask(vec2 in_coord, float screen_aspect, float corner_radius, float edge_sharpness) // returns 0.0 - 1.0 value used for masking the corner so it looks round @@ -757,22 +802,6 @@ vec3 evaluateLight(in vec3 pos, in vec3 normal) } */ -vec2 HSM_GetMirrorWrapCoord(vec2 in_coord) -{ - vec2 ctr_coord = in_coord - 0.5; - vec2 ctr_mirror_coord = vec2(0,0); - - float x_is_outside = clamp((clamp(abs(ctr_coord.x), 0.5, 1) - 0.5) * 100000, 0, 1); - ctr_mirror_coord.x = (1 - x_is_outside) * ctr_coord.x + - x_is_outside * (ctr_coord.x - 2 * sign(ctr_coord.x) * (abs(ctr_coord.x) - 0.5)); - - float y_is_outside = clamp((clamp(abs(ctr_coord.y), 0.5, 1) - 0.5) * 100000, 0, 1); - ctr_mirror_coord.y = (1 - y_is_outside) * ctr_coord.y + - y_is_outside * (ctr_coord.y - 2 * sign(ctr_coord.y) * (abs(ctr_coord.y) - 0.5)); - - return ctr_mirror_coord + 0.5; -} - float HSM_rand(inout float r) { r = fract(3712.65 * r + 0.61432); @@ -1059,7 +1088,10 @@ vec4 HSM_GetMipmappedTexSample(sampler2D in_sampler, vec2 in_coord, vec2 in_scal vec4 HSM_GetCroppedTexSample(sampler2D in_sampler, vec2 in_screen_coord) { vec2 core_prepped_size = HSM_GetRotatedNegativeCropAddedSize(); - + if (HSM_GetUseVerticalScanlines(SCREEN_ASPECT) > 0.5) + in_screen_coord.x += HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR /CROPPED_ROTATED_SIZE_WITH_RES_MULT.x; + else + in_screen_coord.y += HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR /CROPPED_ROTATED_SIZE_WITH_RES_MULT.y; vec4 out_color = HSM_GetTexSampleFromSampleStartAndSize(in_sampler, in_screen_coord, SAMPLE_AREA_START_PIXEL_COORD, CROPPED_ROTATED_SIZE); return out_color; @@ -1102,42 +1134,121 @@ bool HSM_GetUseScreenVignette() return HSM_SCREEN_VIGNETTE_ON > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE); } -vec4 HSM_GetNightLightingMultiplyColor( vec2 viewport_coord, in sampler2D NightLightingImage ) +vec4 HSM_GetNightLightingMultiplyColor( vec2 in_coord, float hue, float saturation, float value, float contrast, float global_ambient_opacity, in sampler2D NightLightingImage ) { - vec2 night_lighting_coord = HSM_GetMirrorWrapCoord(viewport_coord); - - night_lighting_coord = (night_lighting_coord - 0.5) / HSM_AMBIENT_LIGHTING_SCALE + 0.5; - night_lighting_coord = HSM_RotateCoordinate(night_lighting_coord, HSM_AMBIENT_LIGHTING_ROTATE); - - if (HSM_AMBIENT_LIGHTING_MIRROR_HORZ == 1) - night_lighting_coord.x = (night_lighting_coord.x - 0.5) * -1 + 0.5; - - vec4 night_lighting_image = vec4(0); + vec4 lighting_image = vec4(0); // if (HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES > 0.5) // { // // Dithering if needed to reduce banding // float blur_max_size = 1; // float blur_amount = 0.2; - // night_lighting_image = HSM_GetStoichaicBlurredSample(NightLightingImage, night_lighting_coord.xy, HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES, blur_max_size, blur_amount); + // lighting_image = HSM_GetStoichaicBlurredSample(NightLightingImage, in_coord.xy, HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES, blur_max_size, blur_amount); // } // else - night_lighting_image = HSM_GetMipmappedTexSample(NightLightingImage, night_lighting_coord.xy, vec2(1), 0); - - night_lighting_image = HSM_Linearize(night_lighting_image, DEFAULT_SRGB_GAMMA); + lighting_image = HSM_GetMipmappedTexSample(NightLightingImage, in_coord.xy, vec2(1), 0); + lighting_image = HSM_Linearize(lighting_image, DEFAULT_SRGB_GAMMA); + + lighting_image = contrast * (lighting_image - 0.5) + 0.5; // Do HSV alterations on the night lighting image - if (HSM_AMBIENT_LIGHTING_HUE != 0 || HSM_AMBIENT_LIGHTING_SATURATION != 1 || HSM_AMBIENT_LIGHTING_VALUE != 1) + if (hue != 0 || saturation != 1 || value != 1) { - vec3 night_lighting_image_hsv = HSM_RGBtoHSV(night_lighting_image.rgb); - night_lighting_image_hsv.x += HSM_AMBIENT_LIGHTING_HUE; - night_lighting_image_hsv.y *= HSM_AMBIENT_LIGHTING_SATURATION; - night_lighting_image_hsv.z *= HSM_AMBIENT_LIGHTING_VALUE; - night_lighting_image = vec4(HSM_HSVtoRGB(night_lighting_image_hsv), night_lighting_image.a); + vec3 night_lighting_image_hsv = HSM_RGBtoHSV(lighting_image.rgb); + night_lighting_image_hsv.x += hue; + night_lighting_image_hsv.y *= saturation; + night_lighting_image_hsv.z *= value; + lighting_image = vec4(HSM_HSVtoRGB(night_lighting_image_hsv), lighting_image.a); } - night_lighting_image.rgb = mix( vec3(1), night_lighting_image.rgb, HSM_AMBIENT_LIGHTING_OPACITY ); + lighting_image.rgb = mix( vec3(1), lighting_image.rgb, global_ambient_opacity ); - return night_lighting_image; + return lighting_image; +} + +bool HSM_Fill_Ambient_Images(vec2 VIEWPORT_COORD, vec2 VIEWPORT_UNSCALED_COORD, float in_swap_images, in sampler2D in_ambient_sampler, in sampler2D in_ambient2_sampler, inout vec4 ambient_lighting_image, inout vec4 ambient2_lighting_image) +{ + ambient_lighting_image = vec4(1); + ambient2_lighting_image = vec4(1); + + if (HSM_AMBIENT_LIGHTING_OPACITY > 0) + { + vec2 lighting_coord = GetSimpleImageScaledCoord(VIEWPORT_COORD, + VIEWPORT_UNSCALED_COORD, + in_ambient_sampler, + vec2(HSM_AMBIENT_LIGHTING_POSITION_X, HSM_AMBIENT_LIGHTING_POSITION_Y), + vec2(HSM_AMBIENT_LIGHTING_SCALE * HSM_AMBIENT_LIGHTING_SCALE_X, HSM_AMBIENT_LIGHTING_SCALE), + HSM_AMBIENT_LIGHTING_SCALE_WITH_ZOOM, + HSM_AMBIENT_LIGHTING_SCALE_KEEP_ASPECT, + HSM_AMBIENT_LIGHTING_MIRROR_HORZ, + HSM_AMBIENT_LIGHTING_ROTATE ); + + ambient_lighting_image = HSM_GetNightLightingMultiplyColor( lighting_coord, + HSM_AMBIENT_LIGHTING_HUE, + HSM_AMBIENT_LIGHTING_SATURATION, + HSM_AMBIENT_LIGHTING_VALUE, + HSM_AMBIENT_LIGHTING_CONTRAST, + HSM_AMBIENT_LIGHTING_OPACITY, + in_ambient_sampler ); + } + + if (HSM_AMBIENT2_LIGHTING_OPACITY > 0) + { + vec2 lighting2_coord = GetSimpleImageScaledCoord(VIEWPORT_COORD, + VIEWPORT_UNSCALED_COORD, + in_ambient2_sampler, + vec2(HSM_AMBIENT2_LIGHTING_POSITION_X, HSM_AMBIENT2_LIGHTING_POSITION_Y), + vec2(HSM_AMBIENT2_LIGHTING_SCALE * HSM_AMBIENT2_LIGHTING_SCALE_X, HSM_AMBIENT2_LIGHTING_SCALE), + HSM_AMBIENT2_LIGHTING_SCALE_WITH_ZOOM, + HSM_AMBIENT2_LIGHTING_SCALE_KEEP_ASPECT, + HSM_AMBIENT2_LIGHTING_MIRROR_HORZ, + HSM_AMBIENT2_LIGHTING_ROTATE ); + + ambient2_lighting_image = HSM_GetNightLightingMultiplyColor( lighting2_coord, + HSM_AMBIENT2_LIGHTING_HUE, + HSM_AMBIENT2_LIGHTING_SATURATION, + HSM_AMBIENT2_LIGHTING_VALUE, + HSM_AMBIENT2_LIGHTING_CONTRAST, + HSM_AMBIENT2_LIGHTING_OPACITY, + in_ambient2_sampler ); + } + + // if (in_swap_images == 1) + // { + // vec4 temp_image = ambient_lighting_image; + // ambient_lighting_image = ambient2_lighting_image; + // ambient2_lighting_image = temp_image; + // } + + return true; +} + +vec3 ApplyAmbientImages(vec3 base_image, vec3 ambient_image, vec3 ambient2_image, float blend_ambient, float blend_ambient2, float apply_in_add_mode, float layer_blend_mode, float swap_images) +{ + vec3 outImage = base_image; + + if (swap_images == 1) + { + vec3 temp_image = ambient_image; + ambient_image = ambient2_image; + ambient2_image = temp_image; + } + + if ( (HSM_AMBIENT_LIGHTING_OPACITY > 0 || HSM_AMBIENT2_LIGHTING_OPACITY > 0) && (blend_ambient > 0 || blend_ambient2 > 0) ) + { + if( apply_in_add_mode == 1 || layer_blend_mode != BLEND_MODE_ADD) + { + if (blend_ambient > 0) + { + outImage = (1 - blend_ambient) * outImage.rgb + blend_ambient * outImage.rgb * ambient_image.rgb; + } + if (blend_ambient2 > 0) + { + outImage = (1 - blend_ambient2) * outImage.rgb + blend_ambient2 * outImage.rgb * ambient2_image.rgb; + } + } + } + + return outImage; } vec4 HSM_ApplyMonochrome(vec4 in_color) @@ -1182,4 +1293,12 @@ float HSM_Get_Screen_Black_Edge_Mask(vec2 screen_coord, bool apply_to_mirror) SCREEN_MASK = HSM_GetCornerMask(((SCREEN_BLACK_EDGE_CURVED_COORD - 0.5) * 1.001) + 0.5, SCREEN_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE, HSM_TUBE_BLACK_EDGE_SHARPNESS); return SCREEN_MASK; +} + +vec3 HSM_ApplyAmbientImage(vec3 base_image, vec3 ambient_image, float layer_blend_amount) +{ + if (layer_blend_amount > 0) + return (1 - layer_blend_amount) * base_image.rgb + layer_blend_amount * base_image.rgb * ambient_image.rgb; + else + return base_image; } \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-globals.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-globals.inc index 69e4a62..56e0bfe 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-globals.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-globals.inc @@ -46,15 +46,36 @@ layout(std140, set = 0, binding = 0) uniform UBO // Night Lighting float HSM_AMBIENT_LIGHTING_OPACITY; +float HSM_AMBIENT2_LIGHTING_OPACITY; +float HSM_AMBIENT_LIGHTING_SWAP_IMAGES; + float HSM_AMBIENT_LIGHTING_HUE; float HSM_AMBIENT_LIGHTING_SATURATION; float HSM_AMBIENT_LIGHTING_VALUE; +float HSM_AMBIENT_LIGHTING_CONTRAST; + float HSM_AMBIENT_LIGHTING_SCALE_KEEP_ASPECT; + float HSM_AMBIENT_LIGHTING_SCALE_WITH_ZOOM; float HSM_AMBIENT_LIGHTING_SCALE; + float HSM_AMBIENT_LIGHTING_SCALE_X; float HSM_AMBIENT_LIGHTING_ROTATE; float HSM_AMBIENT_LIGHTING_MIRROR_HORZ; - float HSM_AMBIENT_LIGHTING_SCALE_MODE; + float HSM_AMBIENT_LIGHTING_POSITION_X; + float HSM_AMBIENT_LIGHTING_POSITION_Y; float HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES; + float HSM_AMBIENT2_LIGHTING_HUE; + float HSM_AMBIENT2_LIGHTING_SATURATION; + float HSM_AMBIENT2_LIGHTING_VALUE; +float HSM_AMBIENT2_LIGHTING_CONTRAST; + float HSM_AMBIENT2_LIGHTING_SCALE_KEEP_ASPECT; + float HSM_AMBIENT2_LIGHTING_SCALE_WITH_ZOOM; + float HSM_AMBIENT2_LIGHTING_SCALE; + float HSM_AMBIENT2_LIGHTING_SCALE_X; + float HSM_AMBIENT2_LIGHTING_ROTATE; + float HSM_AMBIENT2_LIGHTING_MIRROR_HORZ; + float HSM_AMBIENT2_LIGHTING_POSITION_X; + float HSM_AMBIENT2_LIGHTING_POSITION_Y; + // Zoom & Pan float HSM_VIEWPORT_ZOOM; float HSM_VIEWPORT_POSITION_X; @@ -116,6 +137,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR; float HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR; float HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR; +float HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR; // INTERLACING float HSM_INTERLACE_TRIGGER_RES; @@ -201,7 +223,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_MONOCHROME_DUALSCREEN_VIS_MODE; // Reflection Transform - float HSM_SCREEN_REFLECTION_RENDER_ON; + // float HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS; float HSM_SCREEN_REFLECTION_SCALE; float HSM_SCREEN_REFLECTION_POS_X; float HSM_SCREEN_REFLECTION_POS_Y; @@ -221,16 +243,19 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS; float HSM_TUBE_DIFFUSE_IMAGE_GAMMA; float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING; + float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING; float HSM_TUBE_DIFFUSE_IMAGE_SCALE; float HSM_TUBE_DIFFUSE_IMAGE_SCALE_X; float HSM_TUBE_EMPTY_THICKNESS; float HSM_TUBE_EMPTY_THICKNESS_X_SCALE; + float HSM_SCREEN_CORNER_RADIUS_SCALE; float HSM_TUBE_COLORED_GEL_IMAGE_ON; float HSM_TUBE_COLORED_GEL_IMAGE_DUALSCREEN_VIS_MODE; float HSM_TUBE_COLORED_GEL_IMAGE_MULTIPLY_AMOUNT; float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT; float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS; + float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_MULTIPLY_BY_DIFFUSE; float HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD; float HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT; float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL; @@ -244,6 +269,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_TUBE_SHADOW_CURVATURE_SCALE; float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING; + float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING; float HSM_TUBE_COLORED_GEL_IMAGE_SCALE; float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL; float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL; @@ -253,7 +279,9 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE; float HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY; float HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING; + float HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT2_LIGHTING; float HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE; + float HSM_TUBE_STATIC_REFLECTION_IMAGE_SHADOW_OPACITY; float HSM_TUBE_STATIC_REFLECTION_IMAGE_DITHERING_SAMPLES; // SCREEN BLACK EDGE @@ -263,7 +291,6 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE; float HSM_TUBE_BLACK_EDGE_THICKNESS; float HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE; - float HSM_TUBE_BLACK_EDGE_LAYERING_MODE; // Bezel Independent Scale float HSM_BZL_USE_INDEPENDENT_SCALE; @@ -296,6 +323,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_BZL_BRIGHTNESS; float HSM_BZL_HIGHLIGHT; float HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER; + float HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER; // Generated Frame float HSM_FRM_USE_INDEPENDENT_COLOR; @@ -395,6 +423,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_BG_BRIGHTNESS; float HSM_BG_GAMMA; float HSM_BG_AMBIENT_LIGHTING_MULTIPLIER; + float HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER; float HSM_BG_APPLY_AMBIENT_IN_ADD_MODE; float HSM_BG_BLEND_MODE; float HSM_BG_SOURCE_MATTE_TYPE; @@ -430,6 +459,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_LED_BRIGHTNESS; float HSM_LED_GAMMA; float HSM_LED_AMBIENT_LIGHTING_MULTIPLIER; + float HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER; float HSM_LED_APPLY_AMBIENT_IN_ADD_MODE; float HSM_LED_BLEND_MODE; float HSM_LED_SOURCE_MATTE_TYPE; @@ -454,6 +484,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_DEVICE_BRIGHTNESS; float HSM_DEVICE_GAMMA; float HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER; + float HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER; float HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE; float HSM_DEVICE_BLEND_MODE; float HSM_DEVICE_SOURCE_MATTE_TYPE; @@ -486,6 +517,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_DECAL_BRIGHTNESS; float HSM_DECAL_GAMMA; float HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER; + float HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER; float HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE; float HSM_DECAL_BLEND_MODE; float HSM_DECAL_SOURCE_MATTE_TYPE; @@ -510,6 +542,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_CAB_GLASS_BRIGHTNESS; float HSM_CAB_GLASS_GAMMA; float HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER; + float HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER; float HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE; float HSM_CAB_GLASS_BLEND_MODE; float HSM_CAB_GLASS_SOURCE_MATTE_TYPE; @@ -534,6 +567,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_TOP_BRIGHTNESS; float HSM_TOP_GAMMA; float HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER; + float HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER; float HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE; float HSM_TOP_BLEND_MODE; float HSM_TOP_SOURCE_MATTE_TYPE; @@ -588,6 +622,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float glow; float bloom; +float mask_bloom; float bloom_dist; float halation; @@ -768,19 +803,6 @@ float FILL_MODE_SPLIT_FILL_VERTICAL = 2; bool CACHE_INFO_PARAM_SUM_CHANGED = false; float CURRENT_FRAME_FROM_CACHE_INFO = 0; -float PARAMETER_SUM_SCREEN_SCALE = 0; -float PARAMETER_SUM_SCREEN_SCALE_FEEDBACK = 0; -float PARAMETER_SUM_BEZEL = 0; -float PARAMETER_SUM_BEZEL_FEEDBACK = 0; -float PARAMETER_SUM_IMAGE_LAYERS_1 = 0; -float PARAMETER_SUM_IMAGE_LAYERS_1_FEEDBACK = 0; -float PARAMETER_SUM_IMAGE_LAYERS_2 = 0; -float PARAMETER_SUM_IMAGE_LAYERS_2_FEEDBACK = 0; -float PARAMETER_SUM_IMAGE_LAYERS_3 = 0; -float PARAMETER_SUM_IMAGE_LAYERS_3_FEEDBACK = 0; -float PARAMETER_SUM_IMAGE_LAYERS_4 = 0; -float PARAMETER_SUM_IMAGE_LAYERS_4_FEEDBACK = 0; - float SCREEN_MASK = 0; float TUBE_MASK = 0; float BEZEL_MASK = 0; diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-helper-functions.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-helper-functions.inc index 5a28682..bd633bb 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-helper-functions.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-helper-functions.inc @@ -277,4 +277,9 @@ vec4 HHLP_GetBilinearTextureSample(sampler2D in_sampler, vec2 in_coord, vec4 in_ bool HHLP_IsOutsideCoordSpace(vec2 in_coord) { return (in_coord.x < -0.01 || in_coord.x > 1.01 || in_coord.y < -0.01 || in_coord.y > 1.01); -} \ No newline at end of file +} + + + + + diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-0-screen-scale.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-0-screen-scale.inc index 47865c2..779fbf2 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-0-screen-scale.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-0-screen-scale.inc @@ -23,7 +23,7 @@ */ // Screen Scale Required Parameters -#pragma parameter HSM_MEGA_BEZEL_TITLE "[ --- HSM MEGA BEZEL V 1.0.001 2022-06-24 Rev 1 --- ]" 0 0 0.01 0.01 +#pragma parameter HSM_MEGA_BEZEL_TITLE "[ --- HSM MEGA BEZEL V1.0.003_2022-07-28_Rev-1 --- ]" 0 0 0.01 0.01 #pragma parameter HSM_RESOLUTION_DEBUG_ON " Show Resolution Info" 0 0 1 1 float HSM_RESOLUTION_DEBUG_ON = global.HSM_RESOLUTION_DEBUG_ON; @@ -75,34 +75,14 @@ float HSM_STATIC_LAYERS_GAMMA = global.HSM_STATIC_LAYERS_GAMMA; //--------------------------------------------------------------------------------------------------- #pragma parameter HSM_AMBIENT_LIGHTING_TITLE "[ AMBIENT LIGHTING ]:" 0 0 0.01 0.01 -#pragma parameter HSM_AMBIENT_LIGHTING_OPACITY " Opacity" 0 0 100 1 +#pragma parameter HSM_AMBIENT_LIGHTING_OPACITY " Ambient 1st Image Opacity" 0 0 100 1 float HSM_AMBIENT_LIGHTING_OPACITY = global.HSM_AMBIENT_LIGHTING_OPACITY / 100; -#pragma parameter HSM_AMBIENT_LIGHTING_HUE " Hue" 0 -180 180 1 -float HSM_AMBIENT_LIGHTING_HUE = global.HSM_AMBIENT_LIGHTING_HUE / 360; +#pragma parameter HSM_AMBIENT2_LIGHTING_OPACITY " Ambient 2nd Image Opacity" 0 0 100 1 +float HSM_AMBIENT2_LIGHTING_OPACITY = global.HSM_AMBIENT2_LIGHTING_OPACITY / 100; -#pragma parameter HSM_AMBIENT_LIGHTING_SATURATION " Saturation" 100 0 300 1 -float HSM_AMBIENT_LIGHTING_SATURATION = global.HSM_AMBIENT_LIGHTING_SATURATION / 100; - -#pragma parameter HSM_AMBIENT_LIGHTING_VALUE " Value" 100 0 400 1 -float HSM_AMBIENT_LIGHTING_VALUE = global.HSM_AMBIENT_LIGHTING_VALUE / 100; - -#pragma parameter HSM_AMBIENT_LIGHTING_SCALE_MODE " Scale Mode - VIEW WITH ZOOM | FULL" 1 0 1 1 -float HSM_AMBIENT_LIGHTING_SCALE_MODE = global.HSM_AMBIENT_LIGHTING_SCALE_MODE; - -#pragma parameter HSM_AMBIENT_LIGHTING_SCALE " Scale Offset" 100 10 1000 1 -float HSM_AMBIENT_LIGHTING_SCALE = global.HSM_AMBIENT_LIGHTING_SCALE / 100; - -#pragma parameter HSM_AMBIENT_LIGHTING_ROTATE " Rotate" 0 0 1 1 -float HSM_AMBIENT_LIGHTING_ROTATE = global.HSM_AMBIENT_LIGHTING_ROTATE; - -#pragma parameter HSM_AMBIENT_LIGHTING_MIRROR_HORZ " Mirror Horizontal" 0 0 1 1 -float HSM_AMBIENT_LIGHTING_MIRROR_HORZ = global.HSM_AMBIENT_LIGHTING_MIRROR_HORZ; - -// Commented out because I don't think anyone is using this -// #pragma parameter HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES " Dithering Noise Samples (Reduces Banding)" 0 0 10 1 -// float HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES = global.HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES; -float HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES = 0; +#pragma parameter HSM_AMBIENT_LIGHTING_SWAP_IMAGES " Swap Ambient Images" 0 0 1 1 +float HSM_AMBIENT_LIGHTING_SWAP_IMAGES = global.HSM_AMBIENT_LIGHTING_SWAP_IMAGES; //--------------------------------------------------------------------------------------------------- @@ -298,13 +278,6 @@ float HSM_CROP_PERCENT_RIGHT = global.HSM_CROP_PERCENT_RIGHT / 100; float HSM_CROP_BLACK_THRESHOLD = global.HSM_CROP_BLACK_THRESHOLD / 100; -//--------------------------------------------------------------------------------------------------- -// SHADERFX -//--------------------------------------------------------------------------------------------------- -#pragma parameter HSM_SCALEFX_TITLE "[ --- SMOOTHING - SCALEFX - SMOOTH-ADV Presets Only ---- ]:" 0 0 0.01 0.01 -#pragma parameter HSM_SCALEFX_ON " ScaleFx ON - Must Increase Core Res Sampling" 0 0 1 1 - - //--------------------------------------------------------------------------------------------------- // SCANLINES //--------------------------------------------------------------------------------------------------- @@ -331,6 +304,10 @@ float HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = global.HSM_CORE_RES_SAMPLING_MUL #pragma parameter HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR " Opposite Dir Downsample Blur" 0 0 200 1 float HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = global.HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR / 100; +#pragma parameter HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR " Shift Sampling Relative to Scanlines" 0 -100 100 5 +float HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR = global.HSM_CORE_RES_SAMPLING_SHIFT_OPPOSITE_DIR / 100; + + //--------------------------------------------------------------------------------------------------- // INTERLACING @@ -501,19 +478,6 @@ float HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE = global.HSM_SCREEN_VIGNETTE_DUALS float HSM_MONOCHROME_DUALSCREEN_VIS_MODE = global.HSM_MONOCHROME_DUALSCREEN_VIS_MODE; -//--------------------------------------------------------------------------------------------------- -// CRT Blend Over Diffuse -//--------------------------------------------------------------------------------------------------- - -#pragma parameter HSM_CRT_BLEND_TITLE "[ CRT ON TUBE DIFFUSE BLENDING ]:" 0 0 0.01 0.01 - -#pragma parameter HSM_CRT_BLEND_MODE " CRT On Tube Diffuse Blend Mode: OFF | ADD | MULTIPLY" 1 0 2 1 -#define HSM_CRT_BLEND_MODE global.HSM_CRT_BLEND_MODE - -#pragma parameter HSM_CRT_BLEND_AMOUNT " CRT On Tube Diffuse Blend Amount" 100 0 100 1 -#define HSM_CRT_BLEND_AMOUNT global.HSM_CRT_BLEND_AMOUNT / 100 - - //--------------------------------------------------------------------------------------------------- // TUBE DIFFUSE COLOR //--------------------------------------------------------------------------------------------------- @@ -546,18 +510,24 @@ float HSM_TUBE_DIFFUSE_IMAGE_GAMMA = global.HSM_TUBE_DIFFUSE_IMAGE_GAMMA; #pragma parameter HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING " Ambient Lighting Multiplier" 100 0 100 1 float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING = global.HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING / 100; -#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_SCALE " Scale" 100 0 1000 1 +#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING = global.HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING / 100; + +#pragma parameter HSM_TUBE_DIFFUSE_IMAGE_SCALE " Scale" 120 0 1000 1 float HSM_TUBE_DIFFUSE_IMAGE_SCALE = global.HSM_TUBE_DIFFUSE_IMAGE_SCALE / 100; #pragma parameter HSM_TUBE_DIFFUSE_IMAGE_SCALE_X " Scale X" 100 0 1000 1 float HSM_TUBE_DIFFUSE_IMAGE_SCALE_X = global.HSM_TUBE_DIFFUSE_IMAGE_SCALE_X / 100; -#pragma parameter HSM_TUBE_EMPTY_THICKNESS " Empty Tube Thickness" 0 0 6000 5 +#pragma parameter HSM_TUBE_EMPTY_THICKNESS " Empty Tube Thickness" 0 0 6000 10 #define HSM_TUBE_EMPTY_THICKNESS (0.7 * global.HSM_TUBE_EMPTY_THICKNESS / 100) #pragma parameter HSM_TUBE_EMPTY_THICKNESS_X_SCALE " Empty Tube Thicknes X Scale" 100 0 3000 1 #define HSM_TUBE_EMPTY_THICKNESS_X_SCALE (global.HSM_TUBE_EMPTY_THICKNESS_X_SCALE / 100) +#pragma parameter HSM_SCREEN_CORNER_RADIUS_SCALE " Screen (Game Image) Corner Radius Scale" 100 5 3000 1 +#define HSM_SCREEN_CORNER_RADIUS_SCALE (global.HSM_SCREEN_CORNER_RADIUS_SCALE / 100) + //--------------------------------------------------------------------------------------------------- // TUBE SHADOW IMAGE @@ -587,27 +557,16 @@ float HSM_TUBE_SHADOW_CURVATURE_SCALE = global.HSM_TUBE_SHADOW_CURVATURE_SCALE / //--------------------------------------------------------------------------------------------------- -// TUBE STATIC REFLECTION +// CRT Blend Over Diffuse //--------------------------------------------------------------------------------------------------- -#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_TITLE "[ TUBE STATIC REFLECTION IMAGE ]:" 0 0 0.01 0.01 -#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_ON " Use Tube Static Reflection Image - OFF | ON" 0 0 1 1 -float HSM_TUBE_STATIC_REFLECTION_IMAGE_ON = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_ON; +#pragma parameter HSM_CRT_BLEND_TITLE "[ CRT ON TUBE DIFFUSE BLENDING ]:" 0 0 0.01 0.01 -#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE " Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1 -float HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE; +#pragma parameter HSM_CRT_BLEND_MODE " CRT On Tube Diffuse Blend Mode: OFF | ADD | MULTIPLY" 1 0 2 1 +#define HSM_CRT_BLEND_MODE global.HSM_CRT_BLEND_MODE -#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY " Opacity" 10 0 100 0.1 -float HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY / 100; - -#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING " Ambient Lighting Multiplier" 100 0 100 1 -float HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING / 100; - -#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE " Scale" 110 0 1000 1 -float HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE / 100; - -// #pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_DITHERING_SAMPLES "[ TUBE IMAGES ] Tube Static Reflection Noise Samples (Reduces Banding)" 0 0 10 1 -// float HSM_TUBE_STATIC_REFLECTION_IMAGE_DITHERING_SAMPLES = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_DITHERING_SAMPLES; +#pragma parameter HSM_CRT_BLEND_AMOUNT " CRT On Tube Diffuse Blend Amount" 100 0 100 1 +#define HSM_CRT_BLEND_AMOUNT global.HSM_CRT_BLEND_AMOUNT / 100 //--------------------------------------------------------------------------------------------------- @@ -630,15 +589,21 @@ float HSM_TUBE_COLORED_GEL_IMAGE_ADDITIVE_AMOUNT = global.HSM_TUBE_COLORED_GEL_I #pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT " Normal Blend Amount" 15 0 100 1 float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT = global.HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT / 100; -#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS " Normal Blend Brightness" 100 0 200 1 -float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS = global.HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS / 100; - #pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD " Normal Blend Transparency Threshold" 23 0 100 1 float HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD = global.HSM_TUBE_COLORED_GEL_IMAGE_TRANSPARENCY_THRESHOLD / 100; +#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS " Normal Blend Brightness" 100 0 200 1 +float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS = global.HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS / 100; + +#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_MULTIPLY_BY_DIFFUSE " Normal Multiply by Tube Diffuse Shading" 0 0 100 1 +float HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_MULTIPLY_BY_DIFFUSE = global.HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_MULTIPLY_BY_DIFFUSE / 100; + #pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING " Ambient Lighting Multiplier" 100 0 100 1 float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING = global.HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING / 100; +#pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING = global.HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING / 100; + #pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_SCALE " Scale" 100 0 1000 1 float HSM_TUBE_COLORED_GEL_IMAGE_SCALE = global.HSM_TUBE_COLORED_GEL_IMAGE_SCALE / 100; @@ -648,8 +613,39 @@ float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL = -(global.HSM_TUBE_COLORED_GEL #pragma parameter HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL " Flip Vertical" 0 0 1 1 float HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL = -(global.HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL * 2 - 1); -#pragma parameter HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL " Show CRT on Top of Colored Gel Normal" 0 0 1 1 -float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL = global.HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL; +// #pragma parameter HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL " Show CRT on Top of Colored Gel Normal" 0 0 1 1 +// float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL = global.HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL; +float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL = 0; + + +//--------------------------------------------------------------------------------------------------- +// TUBE STATIC REFLECTION +//--------------------------------------------------------------------------------------------------- +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_TITLE "[ TUBE STATIC REFLECTION IMAGE ]:" 0 0 0.01 0.01 + +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_ON " Use Tube Static Reflection Image - OFF | ON" 0 0 1 1 +float HSM_TUBE_STATIC_REFLECTION_IMAGE_ON = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_ON; + +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE " Dual Screen Visibility - BOTH | SCREEN 1 | SCREEN 2" 0 0 2 1 +float HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_DUALSCREEN_VIS_MODE; + +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY " Opacity" 10 0 100 0.1 +float HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY / 100; + +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING " Ambient Lighting Multiplier" 100 0 100 1 +float HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING / 100; + +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT2_LIGHTING " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT2_LIGHTING = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT2_LIGHTING / 100; + +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE " Scale" 110 0 1000 1 +float HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_SCALE / 100; + +#pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_SHADOW_OPACITY " Shadow Opacity" 40 0 100 1 +float HSM_TUBE_STATIC_REFLECTION_IMAGE_SHADOW_OPACITY = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_SHADOW_OPACITY / 100; + +// #pragma parameter HSM_TUBE_STATIC_REFLECTION_IMAGE_DITHERING_SAMPLES "[ TUBE IMAGES ] Tube Static Reflection Noise Samples (Reduces Banding)" 0 0 10 1 +// float HSM_TUBE_STATIC_REFLECTION_IMAGE_DITHERING_SAMPLES = global.HSM_TUBE_STATIC_REFLECTION_IMAGE_DITHERING_SAMPLES; //--------------------------------------------------------------------------------------------------- @@ -657,19 +653,16 @@ float HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL = global.HSM_SHOW_CRT_ON_TOP_OF_COLORED //--------------------------------------------------------------------------------------------------- #pragma parameter HSM_SCREEN_EDGE_TITLE "[ SCREEN BLACK EDGE ]:" 0 0 0.01 0.01 -#pragma parameter HSM_TUBE_BLACK_EDGE_LAYERING_MODE " Show Black Edge: OFF | OVER DIFFUSE & GEL" 1 0 1 1 -float HSM_TUBE_BLACK_EDGE_LAYERING_MODE = global.HSM_TUBE_BLACK_EDGE_LAYERING_MODE; - #pragma parameter HSM_GLOBAL_CORNER_RADIUS " Global Corner Radius - Def 10" 10 4 500 2 #define HSM_GLOBAL_CORNER_RADIUS global.HSM_GLOBAL_CORNER_RADIUS -#pragma parameter HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE " Black Edge Corner Radius Scale" 100 100 8000 10 +#pragma parameter HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE " Black Edge Corner Radius Scale" 100 10 8000 10 #define HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE global.HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE / 100 #pragma parameter HSM_TUBE_BLACK_EDGE_SHARPNESS " Black Edge Sharpness - Def 70" 70 0 90 1 #define HSM_TUBE_BLACK_EDGE_SHARPNESS global.HSM_TUBE_BLACK_EDGE_SHARPNESS / 100 -#pragma parameter HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE " Black Edge Curvature Scale Multiplier" 100 100 8000 10 +#pragma parameter HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE " Black Edge Curvature Scale Multiplier" 100 20 8000 10 #define HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE global.HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE / 100 #pragma parameter HSM_TUBE_BLACK_EDGE_THICKNESS " Black Edge Thickness" 100 -800 6000 5 @@ -744,6 +737,9 @@ float HSM_2ND_SCREEN_CROP_PERCENT_RIGHT = global.HSM_2ND_SCREEN_CROP_PERCENT_RIG //--------------------------------------------------------------------------------------------------- #pragma parameter HSM_REFLECTIONAPPEARANCE_TITLE "[ REFLECTION POSITION & SCALE ]:" 0 0 0.01 0.01 +// #pragma parameter HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS " Follow Tube Diffuse Extra Thickness" 0 1 200 1 +// float HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS = global.HSM_SCREEN_REFLECTION_FOLLOW_DIFFUSE_THICKNESS / 100; + #pragma parameter HSM_SCREEN_REFLECTION_SCALE " Screen Reflection Scale" 100 1 300 1 float HSM_SCREEN_REFLECTION_SCALE = global.HSM_SCREEN_REFLECTION_SCALE / 100; @@ -754,6 +750,95 @@ float HSM_SCREEN_REFLECTION_POS_X = global.HSM_SCREEN_REFLECTION_POS_X / 600; float HSM_SCREEN_REFLECTION_POS_Y = global.HSM_SCREEN_REFLECTION_POS_Y / 600; + +#pragma parameter HSM_AMBIENT_LIGHTING_TITLE_01 "[ AMBIENT LIGHTING IMAGE 1 ]:" 0 0 0.01 0.01 + +#pragma parameter HSM_AMBIENT_LIGHTING_HUE " Hue" 0 -180 180 1 +float HSM_AMBIENT_LIGHTING_HUE = global.HSM_AMBIENT_LIGHTING_HUE / 360; + +#pragma parameter HSM_AMBIENT_LIGHTING_SATURATION " Saturation" 100 0 300 1 +float HSM_AMBIENT_LIGHTING_SATURATION = global.HSM_AMBIENT_LIGHTING_SATURATION / 100; + +#pragma parameter HSM_AMBIENT_LIGHTING_VALUE " Value" 100 0 400 1 +float HSM_AMBIENT_LIGHTING_VALUE = global.HSM_AMBIENT_LIGHTING_VALUE / 100; + +#pragma parameter HSM_AMBIENT_LIGHTING_CONTRAST " Contrast" 100 0 200 0.5 +float HSM_AMBIENT_LIGHTING_CONTRAST = global.HSM_AMBIENT_LIGHTING_CONTRAST / 100; + +#pragma parameter HSM_AMBIENT_LIGHTING_SCALE_KEEP_ASPECT " Scale Aspect - MATCH VIEWPORT | USE TEXURE ASPECT" 0 0 1 1 +float HSM_AMBIENT_LIGHTING_SCALE_KEEP_ASPECT = global.HSM_AMBIENT_LIGHTING_SCALE_KEEP_ASPECT; + +#pragma parameter HSM_AMBIENT_LIGHTING_SCALE_WITH_ZOOM " Scale With Zoom - OFF | ON" 1 0 1 1 +float HSM_AMBIENT_LIGHTING_SCALE_WITH_ZOOM = global.HSM_AMBIENT_LIGHTING_SCALE_WITH_ZOOM; + +#pragma parameter HSM_AMBIENT_LIGHTING_SCALE " Scale Offset" 100 10 1000 1 +float HSM_AMBIENT_LIGHTING_SCALE = global.HSM_AMBIENT_LIGHTING_SCALE / 100; + +#pragma parameter HSM_AMBIENT_LIGHTING_SCALE_X " Scale Offset X" 100 10 1000 0.5 +float HSM_AMBIENT_LIGHTING_SCALE_X = global.HSM_AMBIENT_LIGHTING_SCALE_X / 100; + +#pragma parameter HSM_AMBIENT_LIGHTING_ROTATE " Rotate" 0 0 1 1 +float HSM_AMBIENT_LIGHTING_ROTATE = global.HSM_AMBIENT_LIGHTING_ROTATE; + +#pragma parameter HSM_AMBIENT_LIGHTING_MIRROR_HORZ " Mirror Horizontal" 0 0 1 1 +float HSM_AMBIENT_LIGHTING_MIRROR_HORZ = global.HSM_AMBIENT_LIGHTING_MIRROR_HORZ; + +#pragma parameter HSM_AMBIENT_LIGHTING_POSITION_X " Position X" 0 -1000 1000 1 +float HSM_AMBIENT_LIGHTING_POSITION_X = global.HSM_AMBIENT_LIGHTING_POSITION_X / 1000; + +#pragma parameter HSM_AMBIENT_LIGHTING_POSITION_Y " Position Y" 0 -1000 1000 1 +float HSM_AMBIENT_LIGHTING_POSITION_Y = -1 * global.HSM_AMBIENT_LIGHTING_POSITION_Y / 1000; + + +// Commented out because I don't think anyone is using this +// #pragma parameter HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES " Dithering Noise Samples (Reduces Banding)" 0 0 10 1 +// float HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES = global.HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES; +float HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES = 0; + + +//--------------------------------------------------------------------------------------------------- +// Ambient Lighting Image 2 +//--------------------------------------------------------------------------------------------------- + +#pragma parameter HSM_AMBIENT2_LIGHTING_TITLE "[ AMBIENT LIGHTING IMAGE 2 ]:" 0 0 0.01 0.01 + +#pragma parameter HSM_AMBIENT2_LIGHTING_HUE " Hue" 0 -180 180 1 +float HSM_AMBIENT2_LIGHTING_HUE = global.HSM_AMBIENT2_LIGHTING_HUE / 360; + +#pragma parameter HSM_AMBIENT2_LIGHTING_SATURATION " Saturation" 100 0 300 1 +float HSM_AMBIENT2_LIGHTING_SATURATION = global.HSM_AMBIENT2_LIGHTING_SATURATION / 100; + +#pragma parameter HSM_AMBIENT2_LIGHTING_VALUE " Value" 200 0 400 1 +float HSM_AMBIENT2_LIGHTING_VALUE = global.HSM_AMBIENT2_LIGHTING_VALUE / 100; + +#pragma parameter HSM_AMBIENT2_LIGHTING_CONTRAST " Contrast" 100 0 200 0.5 +float HSM_AMBIENT2_LIGHTING_CONTRAST = global.HSM_AMBIENT2_LIGHTING_CONTRAST / 100; + +#pragma parameter HSM_AMBIENT2_LIGHTING_SCALE_KEEP_ASPECT " Scale Aspect - MATCH VIEWPORT | USE TEXURE ASPECT" 1 0 1 1 +float HSM_AMBIENT2_LIGHTING_SCALE_KEEP_ASPECT = global.HSM_AMBIENT2_LIGHTING_SCALE_KEEP_ASPECT; + +#pragma parameter HSM_AMBIENT2_LIGHTING_SCALE_WITH_ZOOM " Scale With Zoom - OFF | ON" 1 0 1 1 +float HSM_AMBIENT2_LIGHTING_SCALE_WITH_ZOOM = global.HSM_AMBIENT2_LIGHTING_SCALE_WITH_ZOOM; + +#pragma parameter HSM_AMBIENT2_LIGHTING_SCALE " Scale Offset" 100 10 1000 0.5 +float HSM_AMBIENT2_LIGHTING_SCALE = global.HSM_AMBIENT2_LIGHTING_SCALE / 100; + +#pragma parameter HSM_AMBIENT2_LIGHTING_SCALE_X " Scale Offset X" 100 10 1000 0.5 +float HSM_AMBIENT2_LIGHTING_SCALE_X = global.HSM_AMBIENT2_LIGHTING_SCALE_X / 100; + +#pragma parameter HSM_AMBIENT2_LIGHTING_ROTATE " Rotate" 0 0 1 1 +float HSM_AMBIENT2_LIGHTING_ROTATE = global.HSM_AMBIENT2_LIGHTING_ROTATE; + +#pragma parameter HSM_AMBIENT2_LIGHTING_MIRROR_HORZ " Mirror Horizontal" 0 0 1 1 +float HSM_AMBIENT2_LIGHTING_MIRROR_HORZ = global.HSM_AMBIENT2_LIGHTING_MIRROR_HORZ; + +#pragma parameter HSM_AMBIENT2_LIGHTING_POSITION_X " Position X" 0 -1000 1000 1 +float HSM_AMBIENT2_LIGHTING_POSITION_X = global.HSM_AMBIENT2_LIGHTING_POSITION_X / 1000; + +#pragma parameter HSM_AMBIENT2_LIGHTING_POSITION_Y " Position Y" 0 -1000 1000 1 +float HSM_AMBIENT2_LIGHTING_POSITION_Y = -1 * global.HSM_AMBIENT2_LIGHTING_POSITION_Y / 1000; + + //--------------------------------------------------------------------------------------------------- // BEZEL INDEPENDENT SCALE //--------------------------------------------------------------------------------------------------- diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-2-bezel.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-2-bezel.inc index 0ee89a8..6512999 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-2-bezel.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-2-bezel.inc @@ -53,6 +53,9 @@ float HSM_BZL_BRIGHTNESS = global.HSM_BZL_BRIGHTNESS / 100; #pragma parameter HSM_BZL_HIGHLIGHT " Highlight" 1 0 100 0.2 float HSM_BZL_HIGHLIGHT = global.HSM_BZL_HIGHLIGHT / 100; +#pragma parameter HSM_BZL_NOISE " Noise - Def 30" 30 0 100 1 +float HSM_BZL_NOISE = global.HSM_BZL_NOISE / 100; + #pragma parameter HSM_BZL_INNER_EDGE_SHADOW " Opacity of Shadow from Bezel on Tube" 70 0 200 5 float HSM_BZL_INNER_EDGE_SHADOW = global.HSM_BZL_INNER_EDGE_SHADOW / 100; @@ -71,18 +74,19 @@ float HSM_BZL_COLOR_SATURATION = global.HSM_BZL_COLOR_SATURATION / 100; #pragma parameter HSM_BZL_COLOR_VALUE " Value/Brightness - Def 10" 10 0 100 0.2 float HSM_BZL_COLOR_VALUE = global.HSM_BZL_COLOR_VALUE / 100; -#pragma parameter HSM_BZL_NOISE " Noise - Def 30" 30 0 100 1 -float HSM_BZL_NOISE = global.HSM_BZL_NOISE / 100; - #pragma parameter HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER " Bezel Ambient Lighting Multiplier" 100 0 100 1 float HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER / 100; +#pragma parameter HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER / 100; + + //--------------------------------------------------------------------------------------------------- // Frame Color //--------------------------------------------------------------------------------------------------- #pragma parameter HSM_FRM_COLOR_TITLE "[ FRAME COLOR ]:" 0 0 0.01 0.01 -#pragma parameter HSM_FRM_USE_INDEPENDENT_COLOR " Use Inependent Frame Color" 0 0 1 1 +#pragma parameter HSM_FRM_USE_INDEPENDENT_COLOR " Use Independent Frame Color" 0 0 1 1 float HSM_FRM_USE_INDEPENDENT_COLOR = global.HSM_FRM_USE_INDEPENDENT_COLOR; #pragma parameter HSM_FRM_COLOR_HUE " Hue" 0 0 360 1 @@ -94,8 +98,6 @@ float HSM_FRM_COLOR_SATURATION = global.HSM_FRM_COLOR_SATURATION / 100; #pragma parameter HSM_FRM_COLOR_VALUE " Value/Brightness - Def 10" 10 0 100 0.2 float HSM_FRM_COLOR_VALUE = global.HSM_FRM_COLOR_VALUE / 100; -#pragma parameter HSM_FRM_NOISE " Noise - Def 30" 30 0 100 1 -float HSM_FRM_NOISE = global.HSM_FRM_NOISE / 100; //--------------------------------------------------------------------------------------------------- // FRAME @@ -116,6 +118,9 @@ float HSM_FRM_TEXTURE_OPACITY = global.HSM_FRM_TEXTURE_OPACITY / 100; #pragma parameter HSM_FRM_TEXTURE_BLEND_MODE " Texture Overlay Blend Mode - Off | Normal | Add | Mult" 2 0 3 1 float HSM_FRM_TEXTURE_BLEND_MODE = global.HSM_FRM_TEXTURE_BLEND_MODE; +#pragma parameter HSM_FRM_NOISE " Noise - Def 30" 30 0 100 1 +float HSM_FRM_NOISE = global.HSM_FRM_NOISE / 100; + #pragma parameter HSM_FRM_INNER_EDGE_THICKNESS " Inner Edge Thickness" 100 0 5000 5 float HSM_FRM_INNER_EDGE_THICKNESS = global.HSM_FRM_INNER_EDGE_THICKNESS * 0.00003; diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-4-image-layers.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-4-image-layers.inc index 66713a9..9049611 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-4-image-layers.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/common/hsm-params-4-image-layers.inc @@ -124,6 +124,9 @@ float HSM_BG_GAMMA = global.HSM_BG_GAMMA; #pragma parameter HSM_BG_AMBIENT_LIGHTING_MULTIPLIER " Ambient Lighting Multiplier" 100 0 100 1 float HSM_BG_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_BG_AMBIENT_LIGHTING_MULTIPLIER / 100; +#pragma parameter HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER / 100; + #pragma parameter HSM_BG_APPLY_AMBIENT_IN_ADD_MODE " Apply Ambient Lighting in ADD Blend Mode" 0 0 1 1 float HSM_BG_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_BG_APPLY_AMBIENT_IN_ADD_MODE; @@ -230,6 +233,9 @@ float HSM_LED_GAMMA = global.HSM_LED_GAMMA; #pragma parameter HSM_LED_AMBIENT_LIGHTING_MULTIPLIER " Ambient Lighting Multiplier" 100 0 100 1 float HSM_LED_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_LED_AMBIENT_LIGHTING_MULTIPLIER / 100; +#pragma parameter HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER / 100; + #pragma parameter HSM_LED_APPLY_AMBIENT_IN_ADD_MODE " Apply Ambient Lighting in ADD Blend Mode" 0 0 1 1 float HSM_LED_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_LED_APPLY_AMBIENT_IN_ADD_MODE; @@ -302,6 +308,9 @@ float HSM_DEVICE_GAMMA = global.HSM_DEVICE_GAMMA; #pragma parameter HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER " Ambient Lighting Multiplier" 100 0 100 1 float HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER / 100; +#pragma parameter HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER / 100; + #pragma parameter HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE " Apply Ambient Lighting in ADD Blend Mode" 0 0 1 1 float HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE; @@ -378,6 +387,9 @@ float HSM_DECAL_GAMMA = global.HSM_DECAL_GAMMA; #pragma parameter HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER " Ambient Lighting Multiplier" 100 0 100 1 float HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER / 100; +#pragma parameter HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER / 100; + #pragma parameter HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE " Apply Ambient Lighting in ADD Blend Mode" 0 0 1 1 float HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE; @@ -450,6 +462,9 @@ float HSM_CAB_GLASS_GAMMA = global.HSM_CAB_GLASS_GAMMA; #pragma parameter HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER " Ambient Lighting Multiplier" 100 0 100 1 float HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER / 100; +#pragma parameter HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER / 100; + #pragma parameter HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE " Apply Ambient Lighting in ADD Blend Mode" 0 0 1 1 float HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE; @@ -519,10 +534,13 @@ float HSM_TOP_BRIGHTNESS = global.HSM_TOP_BRIGHTNESS / 100; #pragma parameter HSM_TOP_GAMMA " Gamma Adjust" 1 0 5 0.01 float HSM_TOP_GAMMA = global.HSM_TOP_GAMMA; -#pragma parameter HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER " Ambient Lighting Multiplier" 100 0 100 1 +#pragma parameter HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER " Ambient Lighting Multiplier" 100 0 100 1 float HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER = global.HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER / 100; -#pragma parameter HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE " Apply Ambient Lighting in ADD Blend Mode" 0 0 1 1 +#pragma parameter HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER " Ambient 2nd Image Lighting Multiplier" 0 0 100 1 +float HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER = global.HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER / 100; + +#pragma parameter HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE " Apply Ambient Lighting in ADD Blend Mode" 0 0 1 1 float HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE = global.HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE; #pragma parameter HSM_TOP_BLEND_MODE " Blend Mode - OFF | NORMAL | ADD | MULTIPLY" 1 0 3 1 diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-bezel-images.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-bezel-images.inc index 9618249..f1cdcf1 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-bezel-images.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-bezel-images.inc @@ -203,13 +203,13 @@ vec2 HSM_GetScaledCoord(vec2 in_viewport_coord, out_placement_scale.x *= inherited_aspect_difference; out_placement_scale = out_placement_scale * offset_scale; - out_placement_coord = HSM_AddPosScaleToCoord(inherited_placement_coord, inherited_scale, offset_pos, out_placement_scale / inherited_scale); + out_placement_coord = HSM_AddPosScaleToCoord(inherited_placement_coord, offset_pos, out_placement_scale / inherited_scale); vec2 out_coord = vec2(0.5); if (use_inherited_curved_coord == 1) { - out_coord = HSM_AddPosScaleToCoord(inherited_coord, inherited_scale, offset_pos, offset_scale); + out_coord = HSM_AddPosScaleToCoord(inherited_coord, offset_pos, offset_scale); } else { @@ -233,7 +233,7 @@ vec2 HSM_GetScaledCoord(vec2 in_viewport_coord, // The inherited_coord is already the coord from the inherited space // We only need to apply an offset from this - out_coord = HSM_AddPosScaleToCoord(inherited_coord, inherited_scale, offset_pos, drawing_scale / inherited_scale); + out_coord = HSM_AddPosScaleToCoord(inherited_coord, offset_pos, drawing_scale / inherited_scale); // out_coord.x -= slide_x; } @@ -246,20 +246,6 @@ float GetFade(float current_position, float corner_position, float fade_distance return smoothstep(corner_position + fade_distance / 2, corner_position - fade_distance / 2, current_position); } -vec3 ApplyAmbientImage(vec3 base_image, vec3 ambient_image, float layer_blend_amount, float applyInAddMode, float layerBlendMode) -{ - vec3 outImage = base_image; - - if (HSM_AMBIENT_LIGHTING_OPACITY > 0 && - (applyInAddMode == 1 || layerBlendMode != BLEND_MODE_ADD) && - layer_blend_amount > 0) - { - outImage = (1 - layer_blend_amount) * base_image.rgb + layer_blend_amount * base_image.rgb * ambient_image.rgb; - } - - return outImage; -} - ////////////////////////////////////////////////////////////////////////////////////////////////// #pragma stage vertex @@ -297,20 +283,21 @@ layout(set = 0, binding = 3) uniform sampler2D TubeDiffuseImage; layout(set = 0, binding = 4) uniform sampler2D BackgroundImage; layout(set = 0, binding = 5) uniform sampler2D BackgroundVertImage; layout(set = 0, binding = 6) uniform sampler2D NightLightingImage; +layout(set = 0, binding = 7) uniform sampler2D NightLighting2Image; -layout(set = 0, binding = 7) uniform sampler2D LEDImage; -layout(set = 0, binding = 8) uniform sampler2D FrameTextureImage; -layout(set = 0, binding = 9) uniform sampler2D DeviceImage; -layout(set = 0, binding = 10) uniform sampler2D DeviceVertImage; -layout(set = 0, binding = 11) uniform sampler2D DecalImage; -layout(set = 0, binding = 12) uniform sampler2D CabinetGlassImage; -layout(set = 0, binding = 13) uniform sampler2D TopLayerImage; +layout(set = 0, binding = 8) uniform sampler2D LEDImage; +layout(set = 0, binding = 9) uniform sampler2D FrameTextureImage; +layout(set = 0, binding = 10) uniform sampler2D DeviceImage; +layout(set = 0, binding = 11) uniform sampler2D DeviceVertImage; +layout(set = 0, binding = 12) uniform sampler2D DecalImage; +layout(set = 0, binding = 13) uniform sampler2D CabinetGlassImage; +layout(set = 0, binding = 14) uniform sampler2D TopLayerImage; #ifdef LAYERS_OVER_CRT -layout(set = 0, binding = 14) uniform sampler2D BR_LayersOverCRTPassFeedback; +layout(set = 0, binding = 15) uniform sampler2D BR_LayersOverCRTPassFeedback; #define PassFeedback BR_LayersOverCRTPassFeedback #else -layout(set = 0, binding = 14) uniform sampler2D BR_LayersUnderCRTPassFeedback; +layout(set = 0, binding = 15) uniform sampler2D BR_LayersUnderCRTPassFeedback; #define PassFeedback BR_LayersUnderCRTPassFeedback #endif @@ -335,14 +322,10 @@ void main() return; } - //----------------------------------------------------------------------------------------- - // Night Lighting Image - //----------------------------------------------------------------------------------------- - // Add Multiplied Image for Darkening - // Sample the image and do some color correction - vec4 ambient_lighting_image = vec4(1); - if (HSM_AMBIENT_LIGHTING_OPACITY > 0) - ambient_lighting_image = HSM_GetNightLightingMultiplyColor( HSM_AMBIENT_LIGHTING_SCALE_MODE > 0.5 ? VIEWPORT_UNSCALED_COORD : VIEWPORT_COORD, NightLightingImage ); + // AMBIENT LIGHTING IMAGES + vec4 ambient_image = vec4(1); + vec4 ambient2_image = vec4(1); + HSM_Fill_Ambient_Images(VIEWPORT_COORD, VIEWPORT_UNSCALED_COORD, HSM_AMBIENT_LIGHTING_SWAP_IMAGES, NightLightingImage, NightLighting2Image, ambient_image, ambient2_image); SCREEN_BLACK_EDGE_CURVED_COORD = HSM_GetCurvedCoord(SCREEN_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, SCREEN_ASPECT); @@ -387,8 +370,6 @@ void main() // Get a coordinate offset so it is centered around the corner vec2 outermap_coord_warped_ctr_at_screen_corner = abs(tube_curved_coord_ctr) - vec2(0.5); - - // Have to get the scale of the coordinates so we can figure out the size of the onscreen rectangle of the area HSM_GetBezelCoords(SCREEN_COORD, SCREEN_SCALE, @@ -531,7 +512,7 @@ void main() frame_base_color_with_noise = mix(frame_base_color, 1.5 * frame_base_color * noise_mask, HSM_FRM_NOISE); } - vec3 frame_color = hmbz_frame_brightness / 100 * mix(frame_base_color, 1.5 * frame_base_color * noise_mask, 0.6 * HSM_BZL_NOISE);; + vec3 frame_color = hmbz_frame_brightness / 100 * mix(frame_base_color, 1.5 * frame_base_color * noise_mask, 0.6 * HSM_FRM_NOISE); vec3 outside_frame_color = hmbz_brightness_shadow * base_color_with_noise; vec3 bezel_diffuse_color = mix(sides_color, top_color, top_mask); @@ -597,11 +578,14 @@ void main() if (HSM_STATIC_LAYERS_GAMMA != 1) bezel_and_frame_rgba = HSM_ApplyGamma(bezel_and_frame_rgba, HSM_STATIC_LAYERS_GAMMA); - bezel_and_frame_rgba.rgb = ApplyAmbientImage(bezel_and_frame_rgba.rgb, - ambient_lighting_image.rgb, - HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER, - 1, - HSM_BZL_BLEND_MODE); + bezel_and_frame_rgba.rgb = ApplyAmbientImages(bezel_and_frame_rgba.rgb, + ambient_image.rgb, + ambient2_image.rgb, + HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER, + HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER, + 1, + HSM_BZL_BLEND_MODE, + HSM_AMBIENT_LIGHTING_SWAP_IMAGES); float FRAME_AND_BEZEL_MASK = outside_tube_mask * (1 - OUTSIDE_FRAME_MASK); @@ -672,11 +656,14 @@ void main() if (HSM_STATIC_LAYERS_GAMMA != 1) bg_image = HSM_ApplyGamma(bg_image, HSM_STATIC_LAYERS_GAMMA); - bg_image.rgb = ApplyAmbientImage(bg_image.rgb, - ambient_lighting_image.rgb, - HSM_BG_AMBIENT_LIGHTING_MULTIPLIER, - HSM_BG_APPLY_AMBIENT_IN_ADD_MODE, - HSM_BG_BLEND_MODE); + bg_image.rgb = ApplyAmbientImages(bg_image.rgb, + ambient_image.rgb, + ambient2_image.rgb, + HSM_BG_AMBIENT_LIGHTING_MULTIPLIER, + HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER, + HSM_BG_APPLY_AMBIENT_IN_ADD_MODE, + HSM_BG_BLEND_MODE, + HSM_AMBIENT_LIGHTING_SWAP_IMAGES); } //---------------------------------------------------- @@ -713,11 +700,14 @@ void main() if (HSM_STATIC_LAYERS_GAMMA != 1) device_image = HSM_ApplyGamma(device_image, HSM_STATIC_LAYERS_GAMMA); - device_image.rgb = ApplyAmbientImage(device_image.rgb, - ambient_lighting_image.rgb, - HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER, - HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE, - HSM_DEVICE_BLEND_MODE); + device_image.rgb = ApplyAmbientImages(device_image.rgb, + ambient_image.rgb, + ambient2_image.rgb, + HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER, + HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER, + HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE, + HSM_DEVICE_BLEND_MODE, + HSM_AMBIENT_LIGHTING_SWAP_IMAGES); } //---------------------------------------------------- @@ -754,11 +744,14 @@ void main() if (HSM_STATIC_LAYERS_GAMMA != 1) led_image = HSM_ApplyGamma(led_image, HSM_STATIC_LAYERS_GAMMA); - led_image.rgb = ApplyAmbientImage(led_image.rgb, - ambient_lighting_image.rgb, - HSM_LED_AMBIENT_LIGHTING_MULTIPLIER, - HSM_LED_APPLY_AMBIENT_IN_ADD_MODE, - HSM_LED_BLEND_MODE); + led_image.rgb = ApplyAmbientImages(led_image.rgb, + ambient_image.rgb, + ambient2_image.rgb, + HSM_LED_AMBIENT_LIGHTING_MULTIPLIER, + HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER, + HSM_LED_APPLY_AMBIENT_IN_ADD_MODE, + HSM_LED_BLEND_MODE, + HSM_AMBIENT_LIGHTING_SWAP_IMAGES); } //---------------------------------------------------- @@ -794,11 +787,14 @@ void main() if (HSM_STATIC_LAYERS_GAMMA != 1) decal_image = HSM_ApplyGamma(decal_image, HSM_STATIC_LAYERS_GAMMA); - decal_image.rgb = ApplyAmbientImage(decal_image.rgb, - ambient_lighting_image.rgb, - HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER, - HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE, - HSM_DECAL_BLEND_MODE); + decal_image.rgb = ApplyAmbientImages(decal_image.rgb, + ambient_image.rgb, + ambient2_image.rgb, + HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER, + HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER, + HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE, + HSM_DECAL_BLEND_MODE, + HSM_AMBIENT_LIGHTING_SWAP_IMAGES); } //---------------------------------------------------- @@ -839,11 +835,14 @@ void main() if (HSM_STATIC_LAYERS_GAMMA != 1) top_image = HSM_ApplyGamma(top_image, HSM_STATIC_LAYERS_GAMMA); - top_image.rgb = ApplyAmbientImage(top_image.rgb, - ambient_lighting_image.rgb, - HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER, - HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE, - HSM_TOP_BLEND_MODE); + top_image.rgb = ApplyAmbientImages(top_image.rgb, + ambient_image.rgb, + ambient2_image.rgb, + HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER, + HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER, + HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE, + HSM_TOP_BLEND_MODE, + HSM_AMBIENT_LIGHTING_SWAP_IMAGES); } //---------------------------------------------------- @@ -869,9 +868,6 @@ void main() CAB_GLASS_COORD, CAB_GLASS_SCALE); - // Add Scaling - CAB_GLASS_CURVED_COORD = (CAB_GLASS_CURVED_COORD - 0.5) * 1 / HSM_CAB_GLASS_SCALE + 0.5; - // Sample Texture cab_glass_image = HSM_GetMipmappedTexSample(CabinetGlassImage, CAB_GLASS_CURVED_COORD, CAB_GLASS_SCALE, HSM_CAB_GLASS_MIPMAPPING_BLEND_BIAS); @@ -885,11 +881,14 @@ void main() if (HSM_STATIC_LAYERS_GAMMA != 1) cab_glass_image = HSM_ApplyGamma(cab_glass_image, HSM_STATIC_LAYERS_GAMMA); - cab_glass_image.rgb = ApplyAmbientImage(cab_glass_image.rgb, - ambient_lighting_image.rgb, - HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER, - HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE, - HSM_CAB_GLASS_BLEND_MODE); + cab_glass_image.rgb = ApplyAmbientImages(cab_glass_image.rgb, + ambient_image.rgb, + ambient2_image.rgb, + HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER, + HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER, + HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE, + HSM_CAB_GLASS_BLEND_MODE, + HSM_AMBIENT_LIGHTING_SWAP_IMAGES); } @@ -989,8 +988,7 @@ void main() SHOW_ON_DUALSCREEN_MODE_BOTH, HSM_VIEWPORT_VIGNETTE_OPACITY); // LED IMAGE - if (HSM_LED_LAYER_ORDER == i) - if (HSM_LED_OPACITY > 0) + if (HSM_LED_LAYER_ORDER == i && HSM_LED_OPACITY > 0) frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, led_image, HSM_LED_BLEND_MODE, @@ -1000,8 +998,7 @@ void main() HSM_LED_OPACITY); // DEVICE IMAGE - if (HSM_DEVICE_LAYER_ORDER == i) - if (HSM_DEVICE_OPACITY > 0) + if (HSM_DEVICE_LAYER_ORDER == i && HSM_DEVICE_OPACITY > 0) frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, device_image, HSM_DEVICE_BLEND_MODE, @@ -1011,8 +1008,7 @@ void main() HSM_DEVICE_OPACITY); // DECAL IMAGE - if (HSM_DECAL_LAYER_ORDER == i) - if (HSM_DECAL_OPACITY > 0) + if (HSM_DECAL_LAYER_ORDER == i && HSM_DECAL_OPACITY > 0) frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, decal_image, HSM_DECAL_BLEND_MODE, @@ -1022,8 +1018,7 @@ void main() HSM_DECAL_OPACITY); // CABINET GLASS - if (HSM_CAB_GLASS_LAYER_ORDER == i) - if (HSM_CAB_GLASS_OPACITY > 0) + if (HSM_CAB_GLASS_LAYER_ORDER == i && HSM_CAB_GLASS_OPACITY > 0) frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, cab_glass_image, HSM_CAB_GLASS_BLEND_MODE, @@ -1034,8 +1029,7 @@ void main() // Top Layer - if (HSM_TOP_LAYER_ORDER == i) - if (HSM_TOP_OPACITY > 0) + if (HSM_TOP_LAYER_ORDER == i && HSM_TOP_OPACITY > 0) frag_color_linear = BlendModeMaskLayerMix(frag_color_linear, top_image, HSM_TOP_BLEND_MODE, diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-cache-info.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-cache-info.inc index 47d2036..c0e0ea2 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-cache-info.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-cache-info.inc @@ -185,7 +185,6 @@ bool HSM_ResolutionIsEqual(vec2 in_res, vec2 match_res) float HSM_GetScreenAspect(float screen_index, vec2 cropped_size) { - float epsilon = 0.002; vec2 original_size = HSM_GetRotatedCoreOriginalSize(); vec2 rotated_original_size = HSM_GetRotatedCoreOriginalSize(); float core_aspect_ratio = rotated_original_size.x / rotated_original_size.y; @@ -363,7 +362,6 @@ void HSM_GetCroppedRotatedSizeAndPixelSampleAreaStart(float screen_index, sample { screen_index = HSM_GetSwappedScreenIndex(screen_index); vec2 rotated_negative_crop_added_size = HSM_GetRotatedNegativeCropAddedSize(); - float prepped_size_aspect = rotated_negative_crop_added_size.y / rotated_negative_crop_added_size.x; float default_crop_left_px = floor(MAX_NEGATIVE_CROP * rotated_negative_crop_added_size.x); float default_crop_top_px = floor(MAX_NEGATIVE_CROP * rotated_negative_crop_added_size.y); @@ -430,7 +428,6 @@ void HSM_GetCroppedRotatedSizeAndPixelSampleAreaStart(float screen_index, sample } vec2 base_cropped_size = rotated_negative_crop_added_size - vec2(final_crop_left_px + final_crop_right_px, final_crop_top_px + final_crop_bottom_px); - float crop_percent_zoom = 0; if (HSM_GetCoreImageSplitDirection() == 1) { @@ -513,51 +510,89 @@ float HSM_GetParameterSum() // Night Lighting + HSM_AMBIENT_LIGHTING_OPACITY * 100 - + abs(HSM_AMBIENT_LIGHTING_HUE) * 360 + + HSM_AMBIENT2_LIGHTING_OPACITY * 100 + + HSM_AMBIENT_LIGHTING_SWAP_IMAGES + + // AMBIENT LIGHTING 1 + + HSM_AMBIENT_LIGHTING_HUE * 360 + HSM_AMBIENT_LIGHTING_SATURATION * 100 + HSM_AMBIENT_LIGHTING_VALUE * 100 + + HSM_AMBIENT_LIGHTING_CONTRAST + + HSM_AMBIENT_LIGHTING_SCALE_KEEP_ASPECT + + HSM_AMBIENT_LIGHTING_SCALE_WITH_ZOOM + HSM_AMBIENT_LIGHTING_SCALE * 100 + + HSM_AMBIENT_LIGHTING_SCALE_X * 100 + HSM_AMBIENT_LIGHTING_ROTATE + + HSM_AMBIENT_LIGHTING_POSITION_X * 1000 + + HSM_AMBIENT_LIGHTING_POSITION_Y * 1000 + HSM_AMBIENT_LIGHTING_MIRROR_HORZ - + HSM_AMBIENT_LIGHTING_SCALE_MODE + HSM_AMBIENT_LIGHTING_DITHERING_SAMPLES + // AMBIENT LIGHTING 2 + + HSM_AMBIENT2_LIGHTING_HUE * 360 + + HSM_AMBIENT2_LIGHTING_SATURATION * 100 + + HSM_AMBIENT2_LIGHTING_VALUE * 100 + + HSM_AMBIENT2_LIGHTING_CONTRAST + + HSM_AMBIENT2_LIGHTING_SCALE_KEEP_ASPECT + + HSM_AMBIENT2_LIGHTING_SCALE_WITH_ZOOM + + HSM_AMBIENT2_LIGHTING_SCALE * 100 + + HSM_AMBIENT2_LIGHTING_SCALE_X * 100 + + HSM_AMBIENT2_LIGHTING_ROTATE + + HSM_AMBIENT2_LIGHTING_POSITION_X * 1000 + + HSM_AMBIENT2_LIGHTING_POSITION_Y * 1000 + + HSM_AMBIENT2_LIGHTING_MIRROR_HORZ + // Zoom & Pan - + HSM_VIEWPORT_ZOOM * 1000 + + HSM_VIEWPORT_ZOOM * 100 + HSM_VIEWPORT_POSITION_X * 1000 + HSM_VIEWPORT_POSITION_Y * 1000 - // // FLIP & ROTATE + // FLIP & ROTATE + HSM_FLIP_VIEWPORT_VERTICAL + HSM_FLIP_VIEWPORT_HORIZONTAL // + HSM_FLIP_CORE_VERTICAL // + HSM_FLIP_CORE_HORIZONTAL // + HSM_ROTATE_CORE_IMAGE - // // ASPECT RATIO + // ASPECT RATIO + HSM_ASPECT_RATIO_ORIENTATION + HSM_ASPECT_RATIO_MODE + HSM_ASPECT_RATIO_EXPLICIT - // // SCALING + // SCALING + HSM_INT_SCALE_MODE + + HSM_VERTICAL_PRESET + + // Integer Scale + + HSM_INT_SCALE_MAX_HEIGHT + HSM_INT_SCALE_MULTIPLE_OFFSET + HSM_INT_SCALE_MULTIPLE_OFFSET_LONG - + HSM_INT_SCALE_MAX_HEIGHT - + HSM_VERTICAL_PRESET + + // Non Integer Scale + HSM_NON_INTEGER_SCALE - // // Extended Scale - // + HSM_USE_IMAGE_FOR_PLACEMENT - // + HSM_PLACEMENT_IMAGE_MODE - // + HSM_NON_INTEGER_SCALE_OFFSET * 100 - // + HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE + + HSM_USE_PHYSICAL_SIZE_FOR_NON_INTEGER + + HSM_PHYSICAL_MONITOR_ASPECT_RATIO + + HSM_PHYSICAL_MONITOR_DIAGONAL_SIZE + + HSM_PHYSICAL_SIM_TUBE_DIAGONAL_SIZE - // // Position - // + HSM_SCREEN_POSITION_X * 1000 - // + HSM_SCREEN_POSITION_Y * 1000 + // Extended Scale + + HSM_USE_IMAGE_FOR_PLACEMENT + + HSM_PLACEMENT_IMAGE_USE_HORIZONTAL + + HSM_PLACEMENT_IMAGE_MODE - // // CROPPING + // Non Integer Scale Offset + + HSM_NON_INTEGER_SCALE_OFFSET * 100 + + // Snap to Integer Scale + + HSM_USE_SNAP_TO_CLOSEST_INT_SCALE + + HSM_SNAP_TO_CLOSEST_INT_SCALE_TOLERANCE + + // Position + + HSM_SCREEN_POSITION_X * 1000 + + HSM_SCREEN_POSITION_Y * 1000 + + // CROPPING + HSM_CROP_MODE + HSM_CROP_PERCENT_ZOOM * 100 + HSM_CROP_PERCENT_TOP * 100 @@ -588,8 +623,8 @@ float HSM_GetParameterSum() + HSM_2ND_SCREEN_CROP_PERCENT_LEFT * 100 + HSM_2ND_SCREEN_CROP_PERCENT_RIGHT * 100 - // // CURVATURE - + HSM_CURVATURE_MODE * 2 + // CURVATURE + + HSM_CURVATURE_MODE + HSM_CURVATURE_2D_SCALE_LONG_AXIS * 100 + HSM_CURVATURE_2D_SCALE_SHORT_AXIS * 100 + HSM_CURVATURE_3D_RADIUS * 100 @@ -602,23 +637,24 @@ float HSM_GetParameterSum() + HSM_AB_COMPARE_FREEZE_GRAPHICS // // TUBE DIFFUSE - + HSM_TUBE_DIFFUSE_OPACITY - + HSM_TUBE_DIFFUSE_MODE + // + HSM_TUBE_DIFFUSE_OPACITY + // + HSM_TUBE_DIFFUSE_MODE // + HSM_TUBE_DIFFUSE_IMAGE_DUALSCREEN_VIS_MODE // + HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON // + HSM_TUBE_DIFFUSE_IMAGE_HUE // + HSM_TUBE_DIFFUSE_IMAGE_SATURATION // + HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS // + HSM_TUBE_DIFFUSE_IMAGE_GAMMA + + HSM_TUBE_EMPTY_THICKNESS + + HSM_TUBE_EMPTY_THICKNESS_X_SCALE - // // SCREEN BLACK EDGE + // SCREEN BLACK EDGE + HSM_GLOBAL_CORNER_RADIUS + HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE * 100 + HSM_TUBE_BLACK_EDGE_SHARPNESS * 100 + HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE * 100 + HSM_TUBE_BLACK_EDGE_THICKNESS * 100 + HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE * 100 - + HSM_TUBE_BLACK_EDGE_LAYERING_MODE // // BEZEL INDEPENDENT SCALE + HSM_BZL_USE_INDEPENDENT_SCALE @@ -627,7 +663,7 @@ float HSM_GetParameterSum() + HSM_BZL_INDEPENDENT_CURVATURE_SCALE_LONG_AXIS * 100 + HSM_BZL_INDEPENDENT_CURVATURE_SCALE_SHORT_AXIS * 100 - // // BEZEL GENERAL + // BEZEL GENERAL + HSM_BZL_OPACITY * 100 + HSM_BZL_BLEND_MODE + HSM_BZL_WIDTH / 0.0008624 @@ -653,6 +689,7 @@ float HSM_GetParameterSum() + HSM_BZL_COLOR_VALUE * 100 + HSM_BZL_NOISE * 100 + HSM_BZL_AMBIENT_LIGHTING_MULTIPLIER * 100 + + HSM_BZL_AMBIENT2_LIGHTING_MULTIPLIER * 100 // Frame Color + HSM_FRM_USE_INDEPENDENT_COLOR @@ -707,6 +744,7 @@ float HSM_GetParameterSum() + HSM_BG_BRIGHTNESS * 100 + HSM_BG_GAMMA + HSM_BG_AMBIENT_LIGHTING_MULTIPLIER * 100 + + HSM_BG_AMBIENT2_LIGHTING_MULTIPLIER * 100 + HSM_BG_APPLY_AMBIENT_IN_ADD_MODE + HSM_BG_BLEND_MODE + HSM_BG_SOURCE_MATTE_TYPE @@ -754,6 +792,7 @@ float HSM_GetParameterSum() + HSM_LED_BRIGHTNESS * 100 + HSM_LED_GAMMA + HSM_LED_AMBIENT_LIGHTING_MULTIPLIER * 100 + + HSM_LED_AMBIENT2_LIGHTING_MULTIPLIER * 100 + HSM_LED_APPLY_AMBIENT_IN_ADD_MODE + HSM_LED_BLEND_MODE + HSM_LED_SOURCE_MATTE_TYPE @@ -778,6 +817,7 @@ float HSM_GetParameterSum() + HSM_DEVICE_BRIGHTNESS * 100 + HSM_DEVICE_GAMMA + HSM_DEVICE_AMBIENT_LIGHTING_MULTIPLIER * 100 + + HSM_DEVICE_AMBIENT2_LIGHTING_MULTIPLIER * 100 + HSM_DEVICE_APPLY_AMBIENT_IN_ADD_MODE + HSM_DEVICE_BLEND_MODE + HSM_DEVICE_SOURCE_MATTE_TYPE @@ -803,6 +843,7 @@ float HSM_GetParameterSum() + HSM_DECAL_BRIGHTNESS * 100 + HSM_DECAL_GAMMA + HSM_DECAL_AMBIENT_LIGHTING_MULTIPLIER * 100 + + HSM_DECAL_AMBIENT2_LIGHTING_MULTIPLIER * 100 + HSM_DECAL_APPLY_AMBIENT_IN_ADD_MODE + HSM_DECAL_BLEND_MODE + HSM_DECAL_SOURCE_MATTE_TYPE @@ -827,6 +868,7 @@ float HSM_GetParameterSum() + HSM_CAB_GLASS_BRIGHTNESS * 100 + HSM_CAB_GLASS_GAMMA + HSM_CAB_GLASS_AMBIENT_LIGHTING_MULTIPLIER * 100 + + HSM_CAB_GLASS_AMBIENT2_LIGHTING_MULTIPLIER * 100 + HSM_CAB_GLASS_APPLY_AMBIENT_IN_ADD_MODE + HSM_CAB_GLASS_BLEND_MODE + HSM_CAB_GLASS_SOURCE_MATTE_TYPE @@ -851,6 +893,7 @@ float HSM_GetParameterSum() + HSM_TOP_BRIGHTNESS * 100 + HSM_TOP_GAMMA + HSM_TOP_AMBIENT_LIGHTING_MULTIPLIER * 100 + + HSM_TOP_AMBIENT2_LIGHTING_MULTIPLIER * 100 + HSM_TOP_APPLY_AMBIENT_IN_ADD_MODE + HSM_TOP_BLEND_MODE + HSM_TOP_SOURCE_MATTE_TYPE @@ -892,7 +935,7 @@ vec4 HSM_GetColorForScreenInfoCache(vec2 viewport_coord, sampler2D feedback_pass vec3 screen_pos_and_height = HSM_GetScreenPlacementAndHeight(screen_placement_image, 60); float screen_aspect = HSM_GetScreenAspect(1, cropped_rotated_size); vec2 screen_scale = HSM_GetScreenScale(screen_aspect, screen_pos_and_height.z, cropped_rotated_size); - vec2 tube_scale = HSM_GetTubeScale(screen_scale, screen_pos_and_height.z, vec2(HSM_TUBE_EMPTY_THICKNESS + HSM_TUBE_BLACK_EDGE_THICKNESS) * vec2(HSM_TUBE_EMPTY_THICKNESS_X_SCALE * HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE, 1)); + vec2 tube_scale = HSM_GetTubeScale(screen_scale, screen_pos_and_height.z, vec2(HSM_TUBE_EMPTY_THICKNESS * HSM_TUBE_EMPTY_THICKNESS_X_SCALE + HSM_TUBE_BLACK_EDGE_THICKNESS * HSM_TUBE_BLACK_EDGE_THICKNESS_X_SCALE, HSM_TUBE_EMPTY_THICKNESS + HSM_TUBE_BLACK_EDGE_THICKNESS)); vec2 black_edge_scale = HSM_GetTubeScale(screen_scale, screen_pos_and_height.z, vec2(HSM_TUBE_EMPTY_THICKNESS) * vec2(HSM_TUBE_EMPTY_THICKNESS_X_SCALE, 1)); vec2 pos_offset = HSM_GetScreenPositionOffset(screen_pos_and_height.xy, screen_scale, 1); diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-post-crt-prep.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-post-crt-prep.inc index 06ea426..50994ae 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-post-crt-prep.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-post-crt-prep.inc @@ -61,20 +61,18 @@ layout(set = 0, binding = 8) uniform sampler2D BackgroundImage; layout(set = 0, binding = 9) uniform sampler2D BackgroundVertImage; layout(set = 0, binding = 10) uniform sampler2D NightLightingImage; -layout(set = 0, binding = 11) uniform sampler2D IntroPass; +layout(set = 0, binding = 11) uniform sampler2D NightLighting2Image; +layout(set = 0, binding = 12) uniform sampler2D IntroPass; -layout(set = 0, binding = 12) uniform sampler2D MBZ_PostCRTPassFeedback; +layout(set = 0, binding = 13) uniform sampler2D MBZ_PostCRTPassFeedback; #define PassFeedback MBZ_PostCRTPassFeedback // Torridgristle - ScanlineSimple pass - Public domain vec4 HSM_ApplyScanlineMask(vec4 in_color, vec2 screen_scale, vec2 in_coord, vec2 in_curved_coord) { // Stuff to try implementing - // Option to try to match a integer division of the core resolution - // Curvature Multiplier // Try mame hlsl darkening // Check Lottes tone mapping - // Crawl in_coord = mix(in_coord, in_curved_coord, HSM_FAKE_SCANLINE_CURVATURE); @@ -128,13 +126,10 @@ vec4 HSM_ApplyScanlineMask(vec4 in_color, vec2 screen_scale, vec2 in_coord, vec2 masked_color = clamp(final_scanline_mask * masked_color, 0, 1); masked_color.w = in_color.w; - // Split Screen for debugging - // masked_color = scan_opposite_axis_pos > 0.7 ? in_color : masked_color; - return clamp(masked_color, 0, 1); } -vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, vec2 screen_curved_coord, in sampler2D source_pass, bool source_is_linear, in sampler2D TubeDiffuseImage, in sampler2D TubeColoredGelImage, in sampler2D TubeStaticReflectionImage, in sampler2D BackgroundImage, in sampler2D BackgroundVertImage, in sampler2D NightLightingImage) +vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, vec2 screen_curved_coord, in sampler2D source_pass, bool source_is_linear, in sampler2D TubeDiffuseImage, in sampler2D TubeColoredGelImage, in sampler2D TubeStaticReflectionImage, in sampler2D BackgroundImage, in sampler2D BackgroundVertImage, in sampler2D NightLightingImage, in sampler2D NightLighting2Image) { if (HSM_MONOCHROME_MODE > 0.5 && HSM_GetUseOnCurrentScreenIndex(HSM_MONOCHROME_DUALSCREEN_VIS_MODE)) in_color_with_gamma = HSM_ApplyMonochrome(in_color_with_gamma); @@ -143,12 +138,10 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, v out_color *= HSM_POST_CRT_BRIGHTNESS; vec2 mirrored_screen_coord = HSM_GetMirrorWrappedCoord(screen_curved_coord); - float screen_mask = HSM_GetCornerMask((screen_curved_coord - 0.5) * 0.999 + 0.5, SCREEN_ASPECT, HSM_GLOBAL_CORNER_RADIUS, 0.9); + float screen_mask = HSM_GetCornerMask((screen_curved_coord - 0.5) * 0.999 + 0.5, SCREEN_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_SCREEN_CORNER_RADIUS_SCALE, 0.9); if (HSM_GetUseScreenVignette()) { - // out_color *= HSM_GetScreenVignetteFactor(screen_curved_coord); - float vignette_factor = HSM_GetScreenVignetteFactor(mirrored_screen_coord); float vignette_factor_outside_screen = HSM_SCREEN_VIGNETTE_IN_REFLECTION * vignette_factor + (1 - HSM_SCREEN_VIGNETTE_IN_REFLECTION) * 1; @@ -157,13 +150,6 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, v out_color *= vignette_factor; } - vec4 ambient_lighting_image = HSM_GetNightLightingMultiplyColor( HSM_AMBIENT_LIGHTING_SCALE_MODE > 0.5 ? VIEWPORT_UNSCALED_COORD : VIEWPORT_COORD, NightLightingImage ); - - // float screen_edge_mask = HSM_GetCornerMask(screen_curved_coord, SCREEN_ASPECT, HSM_GLOBAL_CORNER_RADIUS, HSM_TUBE_BLACK_EDGE_SHARPNESS); - // screen_edge_mask = 1 - ((1 - screen_edge_mask) * screen_mask); - - // out_color *= screen_edge_mask; - if (HSM_AB_COMPARE_SHOW_MODE == 1 && HSM_GetIsInABCompareArea(VIEWPORT_COORD)) { vec2 ab_screen_coord = HSM_CRT_CURVATURE_SCALE * screen_curved_coord + (1 - HSM_CRT_CURVATURE_SCALE) * SCREEN_COORD; @@ -193,21 +179,44 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, v out_color = mix(out_color, scanline_masked_color, tube_highlight_mask); } + float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS; + if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0) + bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * DEFAULT_SCREEN_CORNER_RADIUS; + + float tube_mask = HSM_GetCornerMask(tube_curved_coord, SCREEN_ASPECT, bezel_corner_radius, 0.99); + float screen_to_tube_mask_invert = 1 - (tube_mask - screen_mask); + + float black_edge_corner_radius = HSM_TUBE_BLACK_EDGE_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS; + vec2 tube_diffuse_curved_coord = HSM_GetTubeCurvedCoord(SCREEN_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, SCREEN_SCALE, BLACK_EDGE_SCALE, SCREEN_ASPECT, 1); + float tube_diffuse_mask = HSM_GetCornerMask(tube_diffuse_curved_coord, SCREEN_ASPECT, black_edge_corner_radius, 0.99); + + float black_edge_mask_invert = 1 - (tube_mask - tube_diffuse_mask); + + out_color *= screen_to_tube_mask_invert; + + // AMBIENT LIGHTING IMAGES + vec4 ambient_lighting_image = vec4(1); + vec4 ambient2_lighting_image = vec4(1); + HSM_Fill_Ambient_Images(VIEWPORT_COORD, VIEWPORT_UNSCALED_COORD, HSM_AMBIENT_LIGHTING_SWAP_IMAGES, NightLightingImage, NightLighting2Image, ambient_lighting_image, ambient2_lighting_image); + vec3 tube_shadow = vec3(1); - if (HSM_TUBE_SHADOW_IMAGE_ON > 0.5) + if (HSM_TUBE_SHADOW_IMAGE_ON > 0.5 && (HSM_GetUseTubeDiffuseImage() || HSM_GetUseTubeColoredGelImage() || HSM_GetUseTubeStaticReflection())) { - vec2 shadow_coord = SCREEN_COORD; + vec2 shadow_coord = tube_diffuse_curved_coord; + shadow_coord = HSM_GetMirrorWrappedCoord(shadow_coord); // TODO Shadow Coordinate isn't right with 3D Curvature shadow_coord.x = (shadow_coord.x - HSM_TUBE_SHADOW_IMAGE_POS_X - 0.5) / HSM_TUBE_SHADOW_IMAGE_SCALE_X + 0.5; shadow_coord.y = (shadow_coord.y + HSM_TUBE_SHADOW_IMAGE_POS_Y) / HSM_TUBE_SHADOW_IMAGE_SCALE_Y; - shadow_coord = HSM_GetTubeCurvedCoord(shadow_coord, HSM_TUBE_SHADOW_CURVATURE_SCALE, SCREEN_SCALE, TUBE_SCALE, SCREEN_ASPECT, 1); - shadow_coord = HSM_GetMirrorWrappedCoord(shadow_coord); + + vec2 curvature_values = HSM_TUBE_SHADOW_CURVATURE_SCALE * HSM_GetCurvatureValues(SCREEN_ASPECT); + shadow_coord = HSM_Get2DCurvedCoord(shadow_coord, curvature_values); shadow_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * (shadow_coord.x - 0.5) + 0.5; shadow_coord.y = HSM_FLIP_VIEWPORT_VERTICAL * (shadow_coord.y - 0.5) + 0.5; + vec4 tube_shadow_sample = HSM_GetMipmappedTexSample(TubeShadowImage, shadow_coord, TUBE_SCALE * vec2(HSM_TUBE_SHADOW_IMAGE_SCALE_X, HSM_TUBE_SHADOW_IMAGE_SCALE_Y), 0); tube_shadow_sample = HSM_GLOBAL_GRAPHICS_BRIGHTNESS * HSM_GetPreMultipliedColorLinear(tube_shadow_sample, SOURCE_MATTE_PREMULTIPLIED, DEFAULT_SRGB_GAMMA); @@ -217,19 +226,23 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, v // If the crt blend mode is multiply then use the diffuse image float tube_diffuse_mode = HSM_CRT_BLEND_MODE == 2 ? 1 : HSM_TUBE_DIFFUSE_MODE; vec4 tube_diffuse = vec4(0, 0, 0, 1); + vec4 diffuse_unshaded = vec4(0, 0, 0, 1); if (tube_diffuse_mode == 1) { // TubeDiffuseImage if (HSM_TUBE_DIFFUSE_MODE == 1 || HSM_CRT_BLEND_MODE == 2) { - vec2 diffuse_coord = mirrored_tube_coord; + vec2 diffuse_coord = tube_diffuse_curved_coord; + + diffuse_coord = HSM_GetMirrorWrappedCoord(diffuse_coord); diffuse_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * (diffuse_coord.x - 0.5) + 0.5; diffuse_coord.y = HSM_FLIP_VIEWPORT_VERTICAL * (diffuse_coord.y - 0.5) + 0.5; diffuse_coord = (diffuse_coord - 0.5) / (HSM_TUBE_DIFFUSE_IMAGE_SCALE * vec2(HSM_TUBE_DIFFUSE_IMAGE_SCALE_X, 1)) + 0.5; - tube_diffuse = HSM_GetMipmappedTexSample(TubeDiffuseImage, diffuse_coord, TUBE_SCALE * HSM_TUBE_DIFFUSE_IMAGE_SCALE, 0); - tube_diffuse = HSM_GLOBAL_GRAPHICS_BRIGHTNESS * HSM_GetPreMultipliedColorLinear(tube_diffuse, SOURCE_MATTE_PREMULTIPLIED, DEFAULT_SRGB_GAMMA); + diffuse_unshaded = HSM_GetMipmappedTexSample(TubeDiffuseImage, diffuse_coord, TUBE_SCALE * HSM_TUBE_DIFFUSE_IMAGE_SCALE, 0); + tube_diffuse = diffuse_unshaded; + tube_diffuse *= HSM_GLOBAL_GRAPHICS_BRIGHTNESS * HSM_GetPreMultipliedColorLinear(tube_diffuse, SOURCE_MATTE_PREMULTIPLIED, DEFAULT_SRGB_GAMMA); tube_diffuse.rgb = HSM_ApplyHSVAdjustment(tube_diffuse.rgb, HSM_TUBE_DIFFUSE_IMAGE_HUE, HSM_TUBE_DIFFUSE_IMAGE_SATURATION, HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS, HSM_TUBE_DIFFUSE_IMAGE_COLORIZE_ON, HSM_TUBE_DIFFUSE_IMAGE_GAMMA); tube_diffuse.rgb *= tube_shadow; @@ -237,22 +250,14 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, v // If CRT Blend Mode is Multiply (2) then the tube must be fully opaque tube_diffuse *= HSM_GetTubeDiffuseOpacity(); - tube_diffuse.rgb *= (1 - HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING) * vec3(1) + HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING * ambient_lighting_image.rgb; + tube_diffuse.rgb = HSM_ApplyAmbientImage(tube_diffuse.rgb, ambient_lighting_image.rgb, HSM_TUBE_DIFFUSE_IMAGE_AMBIENT_LIGHTING); + tube_diffuse.rgb = HSM_ApplyAmbientImage(tube_diffuse.rgb, ambient2_lighting_image.rgb, HSM_TUBE_DIFFUSE_IMAGE_AMBIENT2_LIGHTING); } out_color.a = in_color_with_gamma.a; - float bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * HSM_GLOBAL_CORNER_RADIUS; - if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0) - bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * DEFAULT_SCREEN_CORNER_RADIUS; - - float tube_mask = HSM_GetCornerMask(tube_curved_coord, SCREEN_ASPECT, bezel_corner_radius, 0.99); - float black_edge_mask_invert = 1 - (tube_mask - screen_mask); - - out_color *= black_edge_mask_invert; - // Don't apply the CRT images if (HSM_CRT_BLEND_MODE == 0) - out_color = vec4(0); + out_color = tube_diffuse; // Apply the CRT image additively to the tube diffuse color if (HSM_CRT_BLEND_MODE == 1) @@ -260,12 +265,16 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, v // Apply the CRT image with multiply blending if (HSM_CRT_BLEND_MODE == 2) + { + out_color = clamp(out_color, 0, 1); + out_color *= screen_mask; out_color = HSM_BlendModeLayerMix(tube_diffuse, out_color, BLEND_MODE_MULTIPLY, HSM_CRT_BLEND_AMOUNT); + } // Add a Colored Gel image on top of the screen, this is what colors games like space invaders or battlezone if (HSM_GetUseTubeColoredGelImage()) { - vec2 gel_coord = mirrored_tube_coord; + vec2 gel_coord = HSM_GetMirrorWrappedCoord(tube_diffuse_curved_coord); gel_coord.x = HSM_TUBE_COLORED_GEL_IMAGE_FLIP_HORIZONTAL * (gel_coord.x - 0.5) + 0.5; gel_coord.y = HSM_TUBE_COLORED_GEL_IMAGE_FLIP_VERTICAL * (gel_coord.y - 0.5) + 0.5; gel_coord = (gel_coord - 0.5) / HSM_TUBE_COLORED_GEL_IMAGE_SCALE + 0.5; @@ -285,27 +294,44 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_with_gamma, vec2 VIEWPORT_COORD, v gel_image.rgb *= HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_BRIGHTNESS; gel_image.rgb *= tube_shadow; - if (HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING > 0) - gel_image.rgb *= (1 - HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING) * vec3(1) + HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING * ambient_lighting_image.rgb; + gel_image.rgb = HSM_ApplyAmbientImage(gel_image.rgb, ambient_lighting_image.rgb, HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT_LIGHTING); + gel_image.rgb = HSM_ApplyAmbientImage(gel_image.rgb, ambient2_lighting_image.rgb, HSM_TUBE_COLORED_GEL_IMAGE_AMBIENT2_LIGHTING); + + gel_image = HSM_BlendModeLayerMix(gel_image, vec4(vec3(diffuse_unshaded.r) * 3, 1), BLEND_MODE_MULTIPLY, HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_MULTIPLY_BY_DIFFUSE); if ( HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL == 0 ) out_color = HSM_BlendModeLayerMix(out_color, gel_image, BLEND_MODE_NORMAL, HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT); + if ( HSM_SHOW_CRT_ON_TOP_OF_COLORED_GEL == 1 ) { + gel_image.rgb *= tube_shadow; vec4 normal_blended = HSM_BlendModeLayerMix(vec4(0, 0, 0, 1), gel_image, BLEND_MODE_NORMAL, HSM_TUBE_COLORED_GEL_IMAGE_NORMAL_AMOUNT); out_color = normal_blended + out_color; } } } - #ifdef IS_NO_REFLECT_PRESET - out_color.rgb *= HSM_Get_Screen_Black_Edge_Mask(BLACK_EDGE_COORD, false); + #ifndef IS_NO_REFLECT_PRESET + + out_color *= black_edge_mask_invert; + + #else + + out_color *= tube_diffuse_mask; - // TUBE HIGHLIGHT - if (HSM_GetUseTubeStaticReflection()) - out_color += HSM_GetTubeHighlight(tube_curved_coord, false, TubeStaticReflectionImage, ambient_lighting_image); #endif + if (HSM_GetUseTubeStaticReflection()) + { + vec3 tube_highlight_image = HSM_GetTubeHighlight(tube_curved_coord, false, TubeStaticReflectionImage).rgb; + tube_highlight_image = HSM_ApplyAmbientImage(tube_highlight_image.rgb, ambient_lighting_image.rgb, HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT_LIGHTING); + tube_highlight_image = HSM_ApplyAmbientImage(tube_highlight_image.rgb, ambient2_lighting_image.rgb, HSM_TUBE_STATIC_REFLECTION_IMAGE_AMBIENT2_LIGHTING); + + tube_highlight_image.rgb *= HSM_TUBE_STATIC_REFLECTION_IMAGE_SHADOW_OPACITY * tube_shadow + (1 - HSM_TUBE_STATIC_REFLECTION_IMAGE_SHADOW_OPACITY); + + out_color.rgb += tube_highlight_image * HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY; + } + // #ifndef IS_NO_REFLECT_PRESET // Apply the final Gamma out_color = HSM_Delinearize(out_color, DEFAULT_SRGB_GAMMA); @@ -324,7 +350,6 @@ void main() } VIEWPORT_UNSCALED_COORD = HSM_GetViewportCoordWithFlip(vTexCoord); - // VIEWPORT_COORD = HSM_GetViewportCoordWithZoomAndPan(vTexCoord); vec2 viewportCoordTransformed = HSM_GetViewportCoordWithZoomAndPan(vTexCoord); HSM_UpdateGlobalScreenValuesFromCache(InfoCachePass, InfoCachePassFeedback, vTexCoord); @@ -351,5 +376,5 @@ void main() FragColor = texture(Source, UNFLIPPED_VIEWPORT_COORD); - FragColor = HSM_GetPostCrtPreppedColor(FragColor, vTexCoord, screen_curved_coord, IntroPass, false, TubeDiffuseImage, TubeColoredGelImage, TubeStaticReflectionImage, BackgroundImage, BackgroundVertImage, NightLightingImage); + FragColor = HSM_GetPostCrtPreppedColor(FragColor, vTexCoord, screen_curved_coord, IntroPass, false, TubeDiffuseImage, TubeColoredGelImage, TubeStaticReflectionImage, BackgroundImage, BackgroundVertImage, NightLightingImage, NightLighting2Image); } diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-reflection.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-reflection.inc index e79bea8..99708e0 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-reflection.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-reflection.inc @@ -37,7 +37,6 @@ layout(push_constant) uniform Push } params; - //TODO remove this and replace with simpler calls float GetFade(float current_position, float corner_position, float fade_distance) { @@ -81,23 +80,25 @@ layout(set = 0, binding = 1) uniform sampler2D InfoCachePass; layout(set = 0, binding = 2) uniform sampler2D InfoCachePassFeedback; layout(set = 0, binding = 3) uniform sampler2D NightLightingImage; -layout(set = 0, binding = 4) uniform sampler2D BackgroundImage; -layout(set = 0, binding = 5) uniform sampler2D ReflectionMaskImage; +layout(set = 0, binding = 4) uniform sampler2D NightLighting2Image; +layout(set = 0, binding = 5) uniform sampler2D BackgroundImage; +layout(set = 0, binding = 6) uniform sampler2D ReflectionMaskImage; -layout(set = 0, binding = 6) uniform sampler2D TubeStaticReflectionImage; -layout(set = 0, binding = 7) uniform sampler2D TubeColoredGelImage; +layout(set = 0, binding = 7) uniform sampler2D TubeStaticReflectionImage; +layout(set = 0, binding = 8) uniform sampler2D TubeColoredGelImage; -layout(set = 0, binding = 8) uniform sampler2D MBZ_PostCRTPass; -layout(set = 0, binding = 9) uniform sampler2D BR_MirrorBlurredPass; -layout(set = 0, binding = 10) uniform sampler2D BR_MirrorReflectionDiffusedPass; -layout(set = 0, binding = 11) uniform sampler2D BR_MirrorFullscreenGlowPass; +layout(set = 0, binding = 9) uniform sampler2D MBZ_PostCRTPass; +layout(set = 0, binding = 10) uniform sampler2D BR_MirrorBlurredPass; +layout(set = 0, binding = 11) uniform sampler2D BR_MirrorReflectionDiffusedPass; +layout(set = 0, binding = 12) uniform sampler2D BR_MirrorFullscreenGlowPass; -layout(set = 0, binding = 12) uniform sampler2D BR_CRTAndReflectionPassFeedback; +layout(set = 0, binding = 13) uniform sampler2D BR_CRTAndReflectionPassFeedback; #define PassFeedback BR_CRTAndReflectionPassFeedback ////////////////////////////////////////////////////////////////////////////////////////////////// void main() { + if (HSM_AB_COMPARE_FREEZE_CRT_TUBE == 1 && HSM_GetIsInABCompareArea(vTexCoord)) { FragColor = texture(PassFeedback, vTexCoord); @@ -281,7 +282,6 @@ void main() edge_highlight_mask = hmbz_bezel_highlight_edge * edge_mask * (edge_top_center_highlight_mask + edge_bottom_center_highlight_mask + edge_sides_highlight_mask); - //---------------------------------------------------- // Reflection //---------------------------------------------------- @@ -418,25 +418,12 @@ void main() // } } - if (HSM_TUBE_BLACK_EDGE_LAYERING_MODE > 0.5) - crt_linear.rgb *= (1 - HSM_TUBE_BLACK_EDGE_LAYERING_MODE) + HSM_TUBE_BLACK_EDGE_LAYERING_MODE * HSM_Get_Screen_Black_Edge_Mask(BLACK_EDGE_COORD, false); - crt_linear.rgb *= TUBE_MASK; // Put the frame and bezel over top a black tube // It must be a little wider than the inside of the bezel so we don't see a gap crt_linear = HSM_PreMultAlphaBlend(vec4(0, 0, 0, 1 - outside_tube_mask_wider), crt_linear); - // TUBE HIGHLIGHT - if (HSM_GetUseTubeStaticReflection()) - { - vec4 night_lighting_image = vec4(1); - if (HSM_AMBIENT_LIGHTING_OPACITY > 0) - night_lighting_image = HSM_GetNightLightingMultiplyColor( HSM_AMBIENT_LIGHTING_SCALE_MODE > 0.5 ? VIEWPORT_UNSCALED_COORD : VIEWPORT_COORD, NightLightingImage ); - crt_linear += HSM_GetTubeHighlight(tube_curved_coord, false, TubeStaticReflectionImage, night_lighting_image); - } - - // Clamp otherwise we get artifacts (blue overlays of brighter parts of image) crt_linear = clamp(crt_linear, 0, 1); FragColor = vec4(0); diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-text-resolution.inc b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-text-resolution.inc index 65ac5dd..fdf9d38 100644 --- a/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-text-resolution.inc +++ b/bezel/Mega_Bezel/shaders/HyperspaceMadness/hsm/hsm-text-resolution.inc @@ -156,7 +156,10 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze col += GetChar(ch_dsh, uv); col += GetChar(ch_spc, uv); - col += print_number(int_mult.y, uv, 3); + if (fract(int_mult.y) < 0.01 || fract(int_mult.y) > 0.99) + col += print_number(int_mult.y, uv, 0); + else + col += print_number(int_mult.y, uv, 3); // Line 09 Int Scale Horizontal ---------------------------------------------------------- @@ -180,7 +183,10 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze col += GetChar(ch_dsh, uv); col += GetChar(ch_spc, uv); - col += print_number(int_mult.x, uv, 3); + if (fract(int_mult.x) < 0.01 || fract(int_mult.x) > 0.99) + col += print_number(int_mult.x, uv, 0); + else + col += print_number(int_mult.x, uv, 3); // Line 08 Sampling Resolution ---------------------------------------------------------- @@ -404,7 +410,7 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze col += GetChar(ch_per, uv); col += GetChar(ch_0, uv); col += GetChar(ch_0, uv); - col += GetChar(ch_1, uv); + col += GetChar(ch_3, uv); col += GetChar(ch_spc, uv); // Date @@ -414,10 +420,10 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze col += GetChar(ch_2, uv); col += GetChar(ch_dsh, uv); col += GetChar(ch_0, uv); - col += GetChar(ch_6, uv); + col += GetChar(ch_7, uv); col += GetChar(ch_dsh, uv); col += GetChar(ch_2, uv); - col += GetChar(ch_4, uv); + col += GetChar(ch_8, uv); // Revision col += GetChar(ch_spc, uv); diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/BackgroundImage_Transparent_3840x2160.png b/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/BackgroundImage_Transparent_3840x2160.png deleted file mode 100644 index 9e977d0..0000000 Binary files a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/BackgroundImage_Transparent_3840x2160.png and /dev/null differ diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/Baked_Frame_MegaBezel_Background.png b/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/Baked_Frame_MegaBezel_Background.png deleted file mode 100644 index e7c88c2..0000000 Binary files a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/Baked_Frame_MegaBezel_Background.png and /dev/null differ diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_192.png b/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_192.png deleted file mode 100644 index 4b1d7b3..0000000 Binary files a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_192.png and /dev/null differ diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_256.png b/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_256.png deleted file mode 100644 index d6563f5..0000000 Binary files a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_256.png and /dev/null differ diff --git a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_512.png b/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_512.png deleted file mode 100644 index fa295f4..0000000 Binary files a/bezel/Mega_Bezel/shaders/HyperspaceMadness/textures/IntroImage_MegaBezelLogo_512.png and /dev/null differ