StrobeAPI Implementation

common/wrect.h

@@ -21,4 +21,9 @@ typedef struct wrect_s
 	int	left, right, top, bottom;
 } wrect_t;
 
-#endif//WRECT_H
+typedef struct rectf_s
+{
+	float x, y, w, h;
+} rectf_t;
+
+#endif //WRECT_H

engine/Android.mk

@@ -91,6 +91,8 @@ LOCAL_SRC_FILES := \
            client/s_stream.c \
            client/s_utils.c \
            client/s_vox.c \
+		   client/strobe/r_strobe_api.c \
+		   client/strobe/r_strobe_core.c \
            common/avikit.c \
            common/build.c \
            common/base_cmd.c \

engine/client/cl_scrn.c

@@ -49,71 +49,66 @@ SCR_DrawFPS
 */
 void SCR_DrawFPS( void )
 {
-	float		calc;
-	rgba_t		color;
-	static double	nexttime = 0, lasttime = 0;
-	static double	framerate = 0, avgrate = 0;
-	static int	framecount = 0;
-	static int	minfps = 9999;
-	static int	maxfps = 0;
-	double		newtime;
-	char		fpsstring[64];
-	int		offset;
-	int strobeInterval = r_strobe->integer; // cvar: r_strobe
-	int eFPS; // Effective FPS (strobing effect)
-
-	if( cls.state != ca_active ) return; 
-	if( !cl_showfps->integer || cl.background ) return;
+	float calc;
+	rgba_t color;
+	static double nexttime = 0, lasttime = 0;
+	static double framerate = 0, avgrate = 0;
+	static int framecount = 0;
+	static int minfps     = 9999;
+	static int maxfps     = 0;
+	double newtime;
+	char fpsstring[64];
+	int offset;
+
+	if ( cls.state != ca_active )
+		return;
+	if ( !cl_showfps->integer || cl.background )
+		return;
 
-	switch( cls.scrshot_action )
+	switch ( cls.scrshot_action )
 	{
 	case scrshot_normal:
 	case scrshot_snapshot:
 	case scrshot_inactive:
 		break;
-	default: return;
+	default:
+		return;
 	}
 
-	newtime = Sys_DoubleTime();
-	if( newtime >= nexttime )
+	newtime = Sys_DoubleTime( );
+	if ( newtime >= nexttime )
 	{
-		framerate = framecount / (newtime - lasttime);
-		lasttime = newtime;
-		nexttime = max( nexttime + 1, lasttime - 1 );
+		framerate  = framecount / ( newtime - lasttime );
+		lasttime   = newtime;
+		nexttime   = max( nexttime + 1, lasttime - 1 );
 		framecount = 0;
 	}
 
 	framecount++;
 	calc = framerate;
 
-	if( calc == 0 ) return;
+	if ( calc == 0 )
+		return;
 
-	if( calc < 1.0f )
+	if ( calc < 1.0f )
 	{
-		Q_snprintf( fpsstring, sizeof( fpsstring ), "%4i spf", (int)(1.0f / calc + 0.5f));
+		Q_snprintf( fpsstring, sizeof( fpsstring ), "%4i spf", (int)( 1.0f / calc + 0.5f ) );
 		MakeRGBA( color, 255, 0, 0, 255 );
 	}
 	else
 	{
-		int	curfps = (int)(calc + 0.5f);
+		int curfps = (int)( calc + 0.5f );
 
-		if( curfps < minfps ) minfps = curfps;
-		if( curfps > maxfps ) maxfps = curfps;
+		if ( curfps < minfps )
+			minfps = curfps;
+		if ( curfps > maxfps )
+			maxfps = curfps;
 
 		/*if( !avgrate ) avgrate = ( maxfps - minfps ) / 2.0f;
-		else */avgrate += ( calc - avgrate ) / host.framecount;
-
-		if( strobeInterval > 0 )
-		{
-			eFPS = (int)(( curfps ) / ( strobeInterval + 1 ));
-		}
-		else if( strobeInterval < 0 )
-		{
-			strobeInterval = abs( strobeInterval );
-			eFPS = (int)(( curfps * strobeInterval ) / ( strobeInterval + 1 ));
-		}
+		else */
+		avgrate += ( calc - avgrate ) / host.framecount;
 
-		switch( cl_showfps->integer )
+		switch ( cl_showfps->integer )
 		{
 		case 3:
 			Q_snprintf( fpsstring, sizeof( fpsstring ), "fps: ^1%4i min, ^3%4i cur, ^2%4i max | ^3%.2f avg", minfps, curfps, maxfps, avgrate );
@@ -123,21 +118,14 @@ void SCR_DrawFPS( void )
 			break;
 		case 1:
 		default:
-			if( !strobeInterval )
-			{
-				Q_snprintf( fpsstring, sizeof( fpsstring ), "%4i fps", curfps );
-			}
-			else
-			{
-				Q_snprintf( fpsstring, sizeof( fpsstring ), "%4i FPS\n%3i eFPS", curfps, eFPS );
-			}
+			Q_snprintf( fpsstring, sizeof( fpsstring ), "%4i fps", curfps );
 		}
 
 		MakeRGBA( color, 255, 255, 255, 255 );
 	}
 
 	Con_DrawStringLen( fpsstring, &offset, NULL );
-	Con_DrawString( scr_width->integer - offset - 5, 4, fpsstring, color );
+	Con_DrawString( scr_width->integer - offset - 2, 4, fpsstring, color );
 }
 
 /*

engine/client/cl_view.c

@@ -21,9 +21,13 @@ GNU General Public License for more details.
 #include "entity_types.h"
 #include "gl_local.h"
 #include "vgui_draw.h"
+
+#include "strobe/r_strobe_core.h"
+
 #include "touch.h" // IN_TouchDraw( )
 #include "joyinput.h" // Joy_DrawOnScreenKeyboard( )
 
+
 /*
 ===============
 V_SetupRefDef
@@ -417,6 +421,14 @@ void V_PostRender( void )
 		SCR_RSpeeds();
 		SCR_NetSpeeds();
 		SCR_DrawFPS();
+
+#ifdef STROBE_ENABLED
+		// if ( STROBE_TEMPLATE )
+		//  STROBE_TEMPLATE->STROBE_IMPL_FUNC_DEBUGHANDLER( &STROBE_TEMPLATE );
+		if ( STROBE_CORE )
+			STROBE_CORE->STROBE_IMPL_FUNC_DEBUGHANDLER( &STROBE_CORE );
+#endif
+
 		SCR_DrawPos();
 		SV_DrawOrthoTriangles();
 		CL_DrawDemoRecording();

engine/client/console.c

@@ -33,7 +33,7 @@ convar_t	*con_fontscale;
 convar_t	*con_fontnum;
 convar_t	*vgui_utf8;
 
-conrect_t	con_rect;
+rectf_t	con_rect;
 
 static int g_codepage = 0;
 static qboolean g_utf8 = false;

engine/client/gl_local.h

@@ -363,7 +363,6 @@ qboolean R_InitRenderAPI( void );
 void R_SetupFrustum( void );
 void R_FindViewLeaf( void );
 void R_DrawFog( void );
-void R_Strobe( void );
 
 #define cmatrix3x4 vec4_t *const
 #define cmatrix4x4 vec4_t *const
@@ -703,7 +702,6 @@ extern convar_t	*r_vbo;
 extern convar_t	*r_vbo_dlightmode;
 
 extern convar_t	*r_bump;
-extern convar_t	*r_strobe;
 extern convar_t *r_underwater_distortion;
 
 extern convar_t *mp_decals;

engine/client/gl_rmain.c

@@ -24,6 +24,8 @@ GNU General Public License for more details.
 #include "particledef.h"
 #include "entity_types.h"
 
+#include "strobe/r_strobe_core.h"
+
 #define IsLiquidContents( cnt )	( cnt == CONTENTS_WATER || cnt == CONTENTS_SLIME || cnt == CONTENTS_LAVA )
 
 msurface_t	*r_debug_surface;
@@ -1326,99 +1328,21 @@ void R_RenderFrame( const ref_params_t *fd, qboolean drawWorld )
 	GL_BackendEndFrame();
 }
 
-_inline void GL_InsertBlackFrame( void )
-{
-	// No strobing on the console
-	if( CL_IsInConsole() )
-	{
-		pglEnable( GL_SCISSOR_TEST );
-		pglScissor( con_rect.x, (-con_rect.y) - (con_rect.h*1.25), con_rect.w, con_rect.h ); // Preview strobe setting on static
-		pglClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
-		pglClear( GL_COLOR_BUFFER_BIT );
-		pglDisable( GL_SCISSOR_TEST );
-	}
-	else
-	{
-		pglClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
-		pglClear( GL_COLOR_BUFFER_BIT );
-	}
-}
-
-/*
-===============
-R_Strobe
-
-TODO: Consider vsync timings and do not render the supposed black frame at all.
-===============
-*/
-void R_Strobe( void )
-{
-	static int sCounter = 0;
-	int getInterval = r_strobe->integer; // Check through modified tag first?
-
-	if( CL_IsInMenu() )
-	{
-		R_Set2DMode(false);
-		return;
-	}
-
-	if( !getInterval || ( !gl_swapInterval->integer && getInterval ) )
-	{
-		if( getInterval ) //If v-sync is off, turn off strobing
-		{
-			Cvar_Set( "r_strobe", "0" );
-			MsgDev( D_WARN, "Strobing (Black Frame Replacement) requires V-Sync not being turned off! (gl_swapInterval != 0)\n" );
-		}
-		else if( sCounter )
-			sCounter = 0;
-
-		// flush any remaining 2D bits
-		R_Set2DMode(false);
-		return;
-	}
-
-	// If interval is positive, insert (replace with) black frames.
-	// For example result of interval = 3 will be: "black-black-black-normal-black-black-black-normal-black-black-black-normal"
-	if( getInterval > 0 )
-	{
-		if( sCounter < getInterval )
-		{
-			GL_InsertBlackFrame();
-			++sCounter;
-		}
-		else
-		{
-			sCounter = 0;
-			R_Set2DMode( false );
-		}
-	}
-	// If interval is negative, the procedure will be the opposite reverse.
-	// For example result of interval = -4 will be: "normal-normal-normal-normal-black-normal-normal-normal-normal-black"
-	else
-	{
-		getInterval = abs( getInterval );
-		if( sCounter < getInterval )
-		{
-			++sCounter;
-			R_Set2DMode( false );
-		}
-		else
-		{
-			GL_InsertBlackFrame();
-			sCounter = 0;
-		}
-	}
-}
-
 /*
 ===============
 R_EndFrame
 ===============
 */
 void R_EndFrame( void )
 {
-	R_Strobe();
-
+#ifdef STROBE_ENABLED
+	// StrobeAPI.Invoker( STROBE_INVOKE(STROBE_TEMPLATE) );
+	StrobeAPI.Invoker( STROBE_INVOKE(STROBE_CORE) );
+#else
+	// flush any remaining 2D bits
+	R_Set2DMode( false );
+#endif
+
 #ifdef XASH_SDL
 	SDL_GL_SwapWindow( host.hWnd );
 #elif defined __ANDROID__ // For direct android backend