diff --git a/android/app/src/main/assets/pakQ3Q.pk3 b/android/app/src/main/assets/pakQ3Q.pk3 index 7ebed7d4..c48b7ec7 100644 Binary files a/android/app/src/main/assets/pakQ3Q.pk3 and b/android/app/src/main/assets/pakQ3Q.pk3 differ diff --git a/android/app/src/main/cpp/code/cgame/cg_draw.c b/android/app/src/main/cpp/code/cgame/cg_draw.c index fc98983f..003d158c 100644 --- a/android/app/src/main/cpp/code/cgame/cg_draw.c +++ b/android/app/src/main/cpp/code/cgame/cg_draw.c @@ -2623,14 +2623,19 @@ static void CG_DrawVignette( void ) int y = (int)(0 + currentComfortVignetteValue * cg.refdef.height / 3.5f); int h = (int)(cg.refdef.height - 2 * y); + vec4_t black = {0.0, 0.0, 0.0, 1}; + trap_R_SetColor( black ); + // sides - trap_R_DrawStretchPic( 0, 0, x, cg.refdef.height, 0, 0, 1, 1, cgs.media.maskShader ); - trap_R_DrawStretchPic( cg.refdef.width - x, 0, x, cg.refdef.height, 0, 0, 1, 1, cgs.media.maskShader ); + trap_R_DrawStretchPic( 0, 0, x, cg.refdef.height, 0, 0, 1, 1, cgs.media.whiteShader ); + trap_R_DrawStretchPic( cg.refdef.width - x, 0, x, cg.refdef.height, 0, 0, 1, 1, cgs.media.whiteShader ); // top/bottom - trap_R_DrawStretchPic( x, 0, cg.refdef.width - x, y, 0, 0, 1, 1, cgs.media.maskShader ); - trap_R_DrawStretchPic( x, cg.refdef.height - y, cg.refdef.width - x, y, 0, 0, 1, 1, cgs.media.maskShader ); + trap_R_DrawStretchPic( x, 0, cg.refdef.width - x, y, 0, 0, 1, 1, cgs.media.whiteShader ); + trap_R_DrawStretchPic( x, cg.refdef.height - y, cg.refdef.width - x, y, 0, 0, 1, 1, cgs.media.whiteShader ); // vignette trap_R_DrawStretchPic( x, y, w, h, 0, 0, 1, 1, cgs.media.vignetteShader ); + + trap_R_SetColor( NULL ); } } diff --git a/android/app/src/main/cpp/code/cgame/cg_local.h b/android/app/src/main/cpp/code/cgame/cg_local.h index e7e8b735..a5c81a85 100644 --- a/android/app/src/main/cpp/code/cgame/cg_local.h +++ b/android/app/src/main/cpp/code/cgame/cg_local.h @@ -1012,7 +1012,6 @@ typedef struct { // comfort vignette qhandle_t vignetteShader; - qhandle_t maskShader; } cgMedia_t; diff --git a/android/app/src/main/cpp/code/cgame/cg_main.c b/android/app/src/main/cpp/code/cgame/cg_main.c index 268d0dd5..b43ebc4b 100644 --- a/android/app/src/main/cpp/code/cgame/cg_main.c +++ b/android/app/src/main/cpp/code/cgame/cg_main.c @@ -1052,7 +1052,6 @@ static void CG_RegisterGraphics( void ) { //Load from pakQ3Q cgs.media.reticleShader = trap_R_RegisterShader( "gfx/weapon/scope" ); cgs.media.vignetteShader = trap_R_RegisterShader( "gfx/vignette" ); - cgs.media.maskShader = trap_R_RegisterShader( "gfx/mask" ); //Used for the weapon selector cgs.media.smallSphereModel = trap_R_RegisterModel("models/powerups/health/small_sphere.md3"); diff --git a/android/app/src/main/pakQ3Q/gfx/mask.tga b/android/app/src/main/pakQ3Q/gfx/mask.tga deleted file mode 100644 index 06cf5045..00000000 Binary files a/android/app/src/main/pakQ3Q/gfx/mask.tga and /dev/null differ diff --git a/android/app/src/main/pakQ3Q/gfx/vignette.tga b/android/app/src/main/pakQ3Q/gfx/vignette.tga index b5fe0225..4a036db6 100644 Binary files a/android/app/src/main/pakQ3Q/gfx/vignette.tga and b/android/app/src/main/pakQ3Q/gfx/vignette.tga differ