[qfusion-cvs-commits] SF.net SVN: l33t: [808] trunk/qfusion/source

[qfusion s. c. <l33...@li...>]

Revision: 808
          http://l33t.svn.sourceforge.net/l33t/?rev=808&view=rev
Author:   digiman
Date:     2008-02-19 12:33:28 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
Add cvars for outlines

Modified Paths:
--------------
    trunk/qfusion/source/cgame/cg_boneposes.c
    trunk/qfusion/source/cgame/cg_local.h
    trunk/qfusion/source/cgame/cg_main.c
    trunk/qfusion/source/cgame/cg_pmodels.c
    trunk/qfusion/source/cgame/cg_view.c
    trunk/qfusion/source/game/q_shared.h

Modified: trunk/qfusion/source/cgame/cg_boneposes.c
===================================================================
--- trunk/qfusion/source/cgame/cg_boneposes.c	2008-02-19 19:34:44 UTC (rev 807)
+++ trunk/qfusion/source/cgame/cg_boneposes.c	2008-02-19 20:33:28 UTC (rev 808)
@@ -110,6 +110,18 @@
 */
 void CG_AddEntityToScene( entity_t *ent ) 
 {
+	if( cg_outlineModels->integer )
+	{
+		if( ent->flags & RF_WEAPONMODEL )
+			ent->outlineHeight = 0.1;
+		else
+			ent->outlineHeight = 0.5;
+	}
+	else
+	{
+		ent->outlineHeight = 0;
+	}
+
 	if( ent->model && trap_R_SkeletalGetNumBones( ent->model, NULL ) ) {
 		if( !ent->boneposes || !ent->oldboneposes )
 			CG_SetBoneposesForTemporaryEntity( ent );

Modified: trunk/qfusion/source/cgame/cg_local.h
===================================================================
--- trunk/qfusion/source/cgame/cg_local.h	2008-02-19 19:34:44 UTC (rev 807)
+++ trunk/qfusion/source/cgame/cg_local.h	2008-02-19 20:33:28 UTC (rev 808)
@@ -442,6 +442,9 @@
 extern	cvar_t	*cg_testLights;
 extern	cvar_t	*cg_testBlend;
 
+extern	cvar_t	*cg_outlineWorld;
+extern	cvar_t	*cg_outlineModels;
+
 extern	cvar_t	*cg_thirdPerson;
 extern	cvar_t	*cg_thirdPersonAngle;
 extern	cvar_t	*cg_thirdPersonRange;

Modified: trunk/qfusion/source/cgame/cg_main.c
===================================================================
--- trunk/qfusion/source/cgame/cg_main.c	2008-02-19 19:34:44 UTC (rev 807)
+++ trunk/qfusion/source/cgame/cg_main.c	2008-02-19 20:33:28 UTC (rev 808)
@@ -36,6 +36,9 @@
 cvar_t			*gender;
 cvar_t			*gender_auto;
 
+cvar_t			*cg_outlineWorld;
+cvar_t			*cg_outlineModels;
+
 cvar_t			*cg_testEntities;
 cvar_t			*cg_testLights;
 cvar_t			*cg_testBlend;
@@ -285,6 +288,9 @@
 	cg_predict = trap_Cvar_Get ( "cg_predict", "1", 0 );
 	cg_showMiss = trap_Cvar_Get ( "cg_showMiss", "0", 0 );
 
+	cg_outlineWorld = trap_Cvar_Get ( "cg_outlineWorld", "0", CVAR_ARCHIVE );
+	cg_outlineModels = trap_Cvar_Get ( "cg_outlineModels", "0", CVAR_ARCHIVE );
+
 	cg_testBlend = trap_Cvar_Get ( "cg_testBlend", "0", CVAR_CHEAT );
 	cg_testEntities = trap_Cvar_Get ( "cg_testEntities", "0", CVAR_CHEAT );
 	cg_testLights = trap_Cvar_Get ( "cg_testLights", "0", CVAR_CHEAT );

Modified: trunk/qfusion/source/cgame/cg_pmodels.c
===================================================================
--- trunk/qfusion/source/cgame/cg_pmodels.c	2008-02-19 19:34:44 UTC (rev 807)
+++ trunk/qfusion/source/cgame/cg_pmodels.c	2008-02-19 20:33:28 UTC (rev 808)
@@ -1731,7 +1731,6 @@
 	ent->customShader = NULL;
 	ent->model = pmodel->pmodelinfo->model;
 	ent->customSkin = pmodel->pSkin->skin;
-
 	
 	CG_AddEntityToScene( ent );
 	if( !ent->model )

Modified: trunk/qfusion/source/cgame/cg_view.c
===================================================================
--- trunk/qfusion/source/cgame/cg_view.c	2008-02-19 19:34:44 UTC (rev 807)
+++ trunk/qfusion/source/cgame/cg_view.c	2008-02-19 20:33:28 UTC (rev 808)
@@ -253,6 +253,9 @@
 	if( cg.portalInView )
 		rdflags |= RDF_PORTALINVIEW;
 
+	if( cg_outlineWorld->integer )
+		rdflags |= RDF_WORLDOUTLINES;
+
 	rdflags |= RDF_BLOOM;
 
 	rdflags |= CG_SkyPortal ();

Modified: trunk/qfusion/source/game/q_shared.h
===================================================================
--- trunk/qfusion/source/game/q_shared.h	2008-02-19 19:34:44 UTC (rev 807)
+++ trunk/qfusion/source/game/q_shared.h	2008-02-19 20:33:28 UTC (rev 808)
@@ -228,6 +228,8 @@
 # define ALIGN(x)
 #endif
 
+#define HARDWARE_OUTLINES
+
 //==============================================
 
 typedef unsigned char 			qbyte;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.