scripts: cirrus: enable configure log temporarily

3rdparty/libbacktrace/wscript

@@ -148,7 +148,8 @@ def configure(conf):
 	conf.write_config_header('backtrace-supported.h')
 
 @TaskGen.feature('frandomseed')
-@TaskGen.after_method('propagate_uselib_vars')
+@TaskGen.after_method('process_source')
+@TaskGen.before_method('apply_link')
 def process_frandom_seed(ctx):
 	tasks = getattr(ctx, 'compiled_tasks', [])
 

common/netadr.h

@@ -90,12 +90,12 @@ typedef struct netadr_s
 static inline netadrtype_t NET_NetadrType( const netadr_t *a )
 {
 	if( a->type == NA_IP6 || a->type == NA_MULTICAST_IP6 )
-		return (netadrtype_t)a->type;
+		return a->type;
 
 	if( a->ip6_0[0] || a->ip6_0[1] )
 		return NA_UNDEFINED;
 
-	return (netadrtype_t)a->type;
+	return a->type;
 }
 
 static inline void NET_NetadrSetType( netadr_t *a, netadrtype_t type )

engine/client/cl_game.c

@@ -1766,7 +1766,7 @@ static cvar_t *GAME_EXPORT pfnCvar_RegisterClientVariable( const char *szName, c
 		|| !Q_stricmp( szName, "sensitivity" ))
 		flags |= FCVAR_PRIVILEGED;
 
-	return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_CLIENTDLL, Cvar_BuildAutoDescription( szName, flags|FCVAR_CLIENTDLL ));
+	return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_CLIENTDLL, NULL );
 }
 
 static int GAME_EXPORT Cmd_AddClientCommand( const char *cmd_name, xcommand_t function )

engine/client/cl_gameui.c

@@ -691,7 +691,7 @@ pfnCvar_RegisterVariable
 */
 static cvar_t *GAME_EXPORT pfnCvar_RegisterGameUIVariable( const char *szName, const char *szValue, int flags )
 {
-	return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_GAMEUIDLL, Cvar_BuildAutoDescription( szName, flags|FCVAR_GAMEUIDLL ));
+	return (cvar_t *)Cvar_Get( szName, szValue, flags|FCVAR_GAMEUIDLL, NULL );
 }
 
 static int GAME_EXPORT Cmd_AddGameUICommand( const char *cmd_name, xcommand_t function )

engine/common/cvar.c

@@ -103,16 +103,10 @@ Cvar_BuildAutoDescription
 build cvar auto description that based on the setup flags
 ============
 */
-const char *Cvar_BuildAutoDescription( const char *szName, int flags )
+static const char *Cvar_BuildAutoDescription( int flags )
 {
 	static char	desc[256];
 
-	if( FBitSet( flags, FCVAR_GLCONFIG ))
-	{
-		Q_snprintf( desc, sizeof( desc ), CVAR_GLCONFIG_DESCRIPTION, szName );
-		return desc;
-	}
-
 	desc[0] = '\0';
 
 	if( FBitSet( flags, FCVAR_EXTDLL ))
@@ -447,7 +441,7 @@ convar_t *Cvar_Get( const char *name, const char *value, int flags, const char *
 			Cvar_DirectSet( var, value );
 		}
 
-		if( FBitSet( var->flags, FCVAR_ALLOCATED ) && Q_strcmp( var_desc, var->desc ))
+		if( FBitSet( var->flags, FCVAR_ALLOCATED ) && var_desc != NULL && Q_strcmp( var_desc, var->desc ))
 		{
 			if( !FBitSet( flags, FCVAR_GLCONFIG ))
 				Con_Reportf( "%s change description from %s to %s\n", var->name, var->desc, var_desc );
@@ -460,6 +454,10 @@ convar_t *Cvar_Get( const char *name, const char *value, int flags, const char *
 	}
 
 	// allocate a new cvar
+
+	if( !var_desc )
+		var_desc = Cvar_BuildAutoDescription( flags );
+
 	var = Mem_Malloc( cvar_pool, sizeof( *var ));
 	var->name = copystringpool( cvar_pool, name );
 	var->string = copystringpool( cvar_pool, value );
@@ -1206,7 +1204,7 @@ static void Cvar_List_f( void )
 
 		if( FBitSet( var->flags, FCVAR_EXTENDED|FCVAR_ALLOCATED ))
 			Con_Printf( " %-*s %s ^3%s^7\n", 32, var->name, value, var->desc );
-		else Con_Printf( " %-*s %s ^3%s^7\n", 32, var->name, value, Cvar_BuildAutoDescription( var->name, var->flags ));
+		else Con_Printf( " %-*s %s ^3%s^7\n", 32, var->name, value, Cvar_BuildAutoDescription( var->flags ));
 
 		count++;
 	}

engine/common/cvar.h

@@ -44,7 +44,6 @@ void Cvar_DirectSet( convar_t *var, const char *value );
 void Cvar_DirectSetValue( convar_t *var, float value );
 void Cvar_Set( const char *var_name, const char *value );
 void Cvar_SetValue( const char *var_name, float value );
-const char *Cvar_BuildAutoDescription( const char *szName, int flags ) RETURNS_NONNULL;
 float Cvar_VariableValue( const char *var_name );
 int Cvar_VariableInteger( const char *var_name );
 const char *Cvar_VariableString( const char *var_name ) RETURNS_NONNULL;

engine/common/filesystem_engine.c

@@ -258,7 +258,8 @@ static qboolean FS_DetermineReadOnlyRootDirectory( char *out, size_t size )
 
 void FS_CheckConfig( void )
 {
-	if( fs_mount_lv.value || fs_mount_hd.value || fs_mount_addon.value || fs_mount_l10n.value )
+	// only used to prevent rescan after reading config.cfg when user hasn't enabled any addon directories
+	if( fs_mount_lv.value || fs_mount_hd.value || fs_mount_addon.value || fs_mount_l10n.value || Q_stricmp( ui_language.string, "english" ))
 		FS_Rescan_f();
 }
 
@@ -318,6 +319,7 @@ void FS_Init( const char *basedir )
 	Cvar_RegisterVariable( &fs_mount_lv );
 	Cvar_RegisterVariable( &fs_mount_addon );
 	Cvar_RegisterVariable( &fs_mount_l10n );
+	Cvar_RegisterVariable( &ui_language );
 
 	if( !Sys_GetParmFromCmdLine( "-dll", host.gamedll ))
 		host.gamedll[0] = 0;

engine/common/mod_studio.c

@@ -382,7 +382,8 @@ static void Mod_StudioCalcRotations( int boneused[], int numbones, const byte *p
 	for( j = numbones - 1; j >= 0; j-- )
 	{
 		i = boneused[j];
-		R_StudioCalcBones( frame, s, &pbone[i], &panim[i], adj, pos[i], q[i] );
+		R_StudioCalcBoneQuaternion( frame, s, &pbone[i], &panim[i], adj, q[i] );
+		R_StudioCalcBonePosition( frame, s, &pbone[i], &panim[i], adj, pos[i] );
 	}
 
 	if( pseqdesc->motiontype & STUDIO_X ) pos[pseqdesc->motionbone][0] = 0.0f;
@@ -723,7 +724,7 @@ void Mod_StudioComputeBounds( void *buffer, vec3_t mins, vec3_t maxs, qboolean i
 		{
 			for( k = 0; k < pseqdesc->numframes; k++ )
 			{
-				R_StudioCalcBones( k, 0, &pbones[j], panim, NULL, pos, NULL );
+				R_StudioCalcBonePosition( k, 0, &pbones[j], panim, NULL, pos );
 				Mod_StudioBoundVertex( vert_mins, vert_maxs, &bone_count, pos );
 			}
 		}

engine/platform/platform.h

@@ -170,11 +170,7 @@ static inline void Platform_Sleep( int msec )
 #if XASH_TIMER == TIMER_SDL
 	SDL_Delay( msec );
 #elif XASH_TIMER == TIMER_POSIX
-	const struct timespec tv = {
-		.tv_sec = msec / 1000,
-		.tv_nsec = (msec % 1000) * 1000000,
-	};
-	nanosleep( &tv, NULL );
+	usleep( msec * 1000 );
 #elif XASH_TIMER == TIMER_WIN32
 	Sleep( msec );
 #else

engine/server/sv_world.c

@@ -601,7 +601,7 @@ static void SV_FindTouchedLeafs( edict_t *ent, model_t *mod, mnode_t *node, int
 	// add an efrag if the node is a leaf
 	if( node->contents < 0 )
 	{
-		if( ent->num_leafs >= MAX_ENT_LEAFS( FBitSet( mod->flags, MODEL_QBSP2 )))
+		if( ent->num_leafs > MAX_ENT_LEAFS( FBitSet( mod->flags, MODEL_QBSP2 )))
 		{
 			// continue counting leafs,
 			// so we know how many it's overrun

public/xash3d_mathlib.c

@@ -453,83 +453,174 @@ int BoxOnPlaneSide( const vec3_t emins, const vec3_t emaxs, const mplane_t *p )
 	return sides;
 }
 
-void R_StudioCalcBones( int frame, float s, const mstudiobone_t *pbone, const mstudioanim_t *panim, const float *adj, vec3_t pos, vec4_t q )
+/*
+====================
+StudioCalcBoneQuaternion
+
+====================
+*/
+void R_StudioCalcBoneQuaternion( int frame, float s, const mstudiobone_t *pbone, const mstudioanim_t *panim, const float *adj, vec4_t q )
 {
-	float v1[6], v2[6];
-	int i, max;
+	vec3_t	angles1;
+	vec3_t	angles2;
+	int	j, k;
 
-	max = q != NULL ? 6 : 3;
-
-	for( i = 0; i < max; i++ )
+	for( j = 0; j < 3; j++ )
 	{
-		mstudioanimvalue_t *panimvalue = (mstudioanimvalue_t *)((byte *)panim + panim->offset[i] );
-		int j = frame;
-		float fadj = 0.0f;
-
-		if( pbone->bonecontroller[i] >= 0 && adj != NULL )
-			fadj = adj[pbone->bonecontroller[i]];
-
-		if( panim->offset[i] == 0 )
+		if( !panim || panim->offset[j+3] == 0 )
 		{
-			v1[i] = v2[i] = pbone->value[i] + fadj;
-			continue;
-		}
-
-		if( panimvalue->num.total < panimvalue->num.valid )
-			j = 0;
-
-		while( panimvalue->num.total <= j )
-		{
-			j -= panimvalue->num.total;
-			panimvalue += panimvalue->num.valid + 1;
-
-			if( panimvalue->num.total < panimvalue->num.valid )
-				j = 0;
-		}
-
-		if( panimvalue->num.valid > j )
-		{
-			v1[i] = panimvalue[j + 1].value;
-
-			if( panimvalue->num.valid > j + 1 )
-				v2[i] = panimvalue[j + 2].value;
-			else if( panimvalue->num.total > j + 1 )
-				v2[i] = v1[i];
-			else
-				v2[i] = panimvalue[panimvalue->num.valid + 2].value;
+			angles2[j] = angles1[j] = pbone->value[j+3]; // default;
 		}
 		else
 		{
-			v1[i] = panimvalue[panimvalue->num.valid].value;
+			mstudioanimvalue_t *panimvalue = (mstudioanimvalue_t *)((byte *)panim + panim->offset[j+3]);
 
-			if( panimvalue->num.total > j + 1 )
-				v2[i] = v1[i];
+			k = frame;
+
+			// debug
+			if( panimvalue->num.total < panimvalue->num.valid )
+				k = 0;
+
+			// find span of values that includes the frame we want
+			while( panimvalue->num.total <= k )
+			{
+				k -= panimvalue->num.total;
+				panimvalue += panimvalue->num.valid + 1;
+
+				// debug
+				if( panimvalue->num.total < panimvalue->num.valid )
+					k = 0;
+			}
+
+			// bah, missing blend!
+			if( panimvalue->num.valid > k )
+			{
+				angles1[j] = panimvalue[k+1].value;
+
+				if( panimvalue->num.valid > k + 1 )
+				{
+					angles2[j] = panimvalue[k+2].value;
+				}
+				else
+				{
+					if( panimvalue->num.total > k + 1 )
+						angles2[j] = angles1[j];
+					else angles2[j] = panimvalue[panimvalue->num.valid+2].value;
+				}
+			}
 			else
-				v2[i] = panimvalue[panimvalue->num.valid + 2].value;
+			{
+				angles1[j] = panimvalue[panimvalue->num.valid].value;
+				if( panimvalue->num.total > k + 1 )
+					angles2[j] = angles1[j];
+				else angles2[j] = panimvalue[panimvalue->num.valid+2].value;
+			}
+
+			angles1[j] = pbone->value[j+3] + angles1[j] * pbone->scale[j+3];
+			angles2[j] = pbone->value[j+3] + angles2[j] * pbone->scale[j+3];
 		}
 
-		v1[i] = pbone->value[i] + v1[i] * pbone->scale[i] + fadj;
-		v2[i] = pbone->value[i] + v2[i] * pbone->scale[i] + fadj;
+		if( pbone->bonecontroller[j+3] != -1 && adj != NULL )
+		{
+			angles1[j] += adj[pbone->bonecontroller[j+3]];
+			angles2[j] += adj[pbone->bonecontroller[j+3]];
+		}
 	}
 
-	if( !VectorCompare( v1, v2 ))
-		VectorLerp( v1, s, v2, pos );
-	else
-		VectorCopy( v1, pos );
-
-	if( q != NULL )
+	if( !VectorCompare( angles1, angles2 ))
 	{
-		if( !VectorCompare( &v1[3], &v2[3] ))
-		{
-			vec4_t q1, q2;
+		vec4_t	q1, q2;
 
-			AngleQuaternion( &v1[3], q1, true );
-			AngleQuaternion( &v2[3], q2, true );
-			QuaternionSlerp( q1, q2, s, q );
-		}
-		else
-		{
-			AngleQuaternion( &v1[3], q, true );
-		}
+		AngleQuaternion( angles1, q1, true );
+		AngleQuaternion( angles2, q2, true );
+		QuaternionSlerp( q1, q2, s, q );
+	}
+	else
+	{
+		AngleQuaternion( angles1, q, true );
+	}
+}
+
+/*
+====================
+StudioCalcBonePosition
+
+====================
+*/
+void R_StudioCalcBonePosition( int frame, float s, const mstudiobone_t *pbone, const mstudioanim_t *panim, const float *adj, vec3_t pos )
+{
+	vec3_t	origin1;
+	vec3_t	origin2;
+	int	j, k;
+
+	for( j = 0; j < 3; j++ )
+	{
+		if( !panim || panim->offset[j] == 0 )
+		{
+			origin2[j] = origin1[j] = pbone->value[j]; // default;
+		}
+		else
+		{
+			mstudioanimvalue_t	*panimvalue = (mstudioanimvalue_t *)((byte *)panim + panim->offset[j]);
+
+			k = frame;
+
+			// debug
+			if( panimvalue->num.total < panimvalue->num.valid )
+				k = 0;
+
+			// find span of values that includes the frame we want
+			while( panimvalue->num.total <= k )
+			{
+				k -= panimvalue->num.total;
+				panimvalue += panimvalue->num.valid + 1;
+
+				// debug
+				if( panimvalue->num.total < panimvalue->num.valid )
+					k = 0;
+			}
+
+			// bah, missing blend!
+			if( panimvalue->num.valid > k )
+			{
+				origin1[j] = panimvalue[k+1].value;
+
+				if( panimvalue->num.valid > k + 1 )
+				{
+					origin2[j] = panimvalue[k+2].value;
+				}
+				else
+				{
+					if( panimvalue->num.total > k + 1 )
+						origin2[j] = origin1[j];
+					else origin2[j] = panimvalue[panimvalue->num.valid+2].value;
+				}
+			}
+			else
+			{
+				origin1[j] = panimvalue[panimvalue->num.valid].value;
+				if( panimvalue->num.total > k + 1 )
+					origin2[j] = origin1[j];
+				else origin2[j] = panimvalue[panimvalue->num.valid+2].value;
+			}
+
+			origin1[j] = pbone->value[j] + origin1[j] * pbone->scale[j];
+			origin2[j] = pbone->value[j] + origin2[j] * pbone->scale[j];
+		}
+
+		if( pbone->bonecontroller[j] != -1 && adj != NULL )
+		{
+			origin1[j] += adj[pbone->bonecontroller[j]];
+			origin2[j] += adj[pbone->bonecontroller[j]];
+		}
+	}
+
+	if( !VectorCompare( origin1, origin2 ))
+	{
+		VectorLerp( origin1, s, origin2, pos );
+	}
+	else
+	{
+		VectorCopy( origin1, pos );
 	}
 }

public/xash3d_mathlib.h

@@ -168,8 +168,8 @@ void VectorsAngles( const vec3_t forward, const vec3_t right, const vec3_t up, v
 void PlaneIntersect( const mplane_t *plane, const vec3_t p0, const vec3_t p1, vec3_t out );
 qboolean SphereIntersect( const vec3_t vSphereCenter, float fSphereRadiusSquared, const vec3_t vLinePt, const vec3_t vLineDir );
 void QuaternionSlerp( const vec4_t p, const vec4_t q, float t, vec4_t qt );
-
-void R_StudioCalcBones( int frame, float s, const mstudiobone_t *pbone, const mstudioanim_t *panim, const float *adj, vec3_t pos, vec4_t q );
+void R_StudioCalcBoneQuaternion( int frame, float s, const mstudiobone_t *pbone, const mstudioanim_t *panim, const float *adj, vec4_t q );
+void R_StudioCalcBonePosition( int frame, float s, const mstudiobone_t *pbone, const mstudioanim_t *panim, const vec3_t adj, vec3_t pos );
 int BoxOnPlaneSide( const vec3_t emins, const vec3_t emaxs, const mplane_t *p );
 #define BOX_ON_PLANE_SIDE( emins, emaxs, p )           \
 	((( p )->type < 3 ) ?                              \

ref/gl/gl_rsurf.c

@@ -2476,14 +2476,10 @@ static void R_SetupVBOArrayDlight( vboarray_t *vbo, texture_t *texture )
 
 static void R_SetupVBOArrayDecalDlight( int decalcount )
 {
-	if( vbos.decal_dlight_vbo )
-	{
-		pglBindBufferARB( GL_ARRAY_BUFFER_ARB, vbos.decal_dlight_vbo );
+	pglBindBufferARB( GL_ARRAY_BUFFER_ARB, vbos.decal_dlight_vbo );
 #if !SPARSE_DECALS_UPLOAD
-		pglBufferDataARB( GL_ARRAY_BUFFER_ARB, sizeof( vbovertex_t ) * DECAL_VERTS_MAX * decalcount, vbos.decal_dlight, GL_STREAM_DRAW_ARB );
+	pglBufferDataARB( GL_ARRAY_BUFFER_ARB, sizeof( vbovertex_t ) * DECAL_VERTS_MAX * decalcount, vbos.decal_dlight , GL_STREAM_DRAW_ARB );
 #endif
-	}
-
 	R_SetDecalMode( true );
 	// hack: fix decal dlights on gl_vbo_details == 2 (wrong state??)
 	/*if( mtst.details_enabled && mtst.tmu_dt != -1 )

ref/gl/gl_studio.c

@@ -816,7 +816,10 @@ static void R_StudioCalcRotations( cl_entity_t *e, float pos[][3], vec4_t *q, ms
 	R_StudioCalcBoneAdj( dadt, adj, e->curstate.controller, e->latched.prevcontroller, e->mouth.mouthopen );
 
 	for( i = 0; i < m_pStudioHeader->numbones; i++, pbone++, panim++ )
-		R_StudioCalcBones( frame, s, pbone, panim, adj, q[i], pos[i] );
+	{
+		R_StudioCalcBoneQuaternion( frame, s, pbone, panim, adj, q[i] );
+		R_StudioCalcBonePosition( frame, s, pbone, panim, adj, pos[i] );
+	}
 
 	if( pseqdesc->motiontype & STUDIO_X ) pos[pseqdesc->motionbone][0] = 0.0f;
 	if( pseqdesc->motiontype & STUDIO_Y ) pos[pseqdesc->motionbone][1] = 0.0f;

ref/soft/r_studio.c

@@ -835,7 +835,10 @@ static void R_StudioCalcRotations( cl_entity_t *e, float pos[][3], vec4_t *q, ms
 	R_StudioCalcBoneAdj( dadt, adj, e->curstate.controller, e->latched.prevcontroller, e->mouth.mouthopen );
 
 	for( i = 0; i < m_pStudioHeader->numbones; i++, pbone++, panim++ )
-		R_StudioCalcBones( frame, s, pbone, panim, adj, q[i], pos[i] );
+	{
+		R_StudioCalcBoneQuaternion( frame, s, pbone, panim, adj, q[i] );
+		R_StudioCalcBonePosition( frame, s, pbone, panim, adj, pos[i] );
+	}
 
 	if( pseqdesc->motiontype & STUDIO_X )
 		pos[pseqdesc->motionbone][0] = 0.0f;

scripts/cirrus/build_freebsd.sh

@@ -21,6 +21,8 @@ build_engine()
 		die
 	fi
 
+	cat build/config.log
+
 	./waf build || die
 }
 

wscript

@@ -487,10 +487,7 @@ def configure(conf):
 	if not conf.options.BUILD_BUNDLED_DEPS:
 		frag='''#include <backtrace.h>
 #include <backtrace-supported.h>
-#if !BACKTRACE_SUPPORTS_THREADS
-#error
-#endif
-int main(int argc, char **argv) { return backtrace_create_state(argv[0], 1, 0, 0) != 0; }'''
+int main(int argc, char **argv) { return backtrace_create_state( argv[0], BACKTRACE_SUPPORTS_THREADS, 0, 0 ) != 0; }'''
 
 		conf.env.HAVE_SYSTEM_LIBBACKTRACE = conf.check_cc(lib='backtrace', fragment=frag, uselib_store='backtrace', mandatory=False)
 
@@ -535,7 +532,7 @@ def build(bld):
 
 	# don't clean QtCreator files and reconfigure saved options
 	bld.clean_files = bld.bldnode.ant_glob('**',
-		excl='*.user configuration.py .lock* *conf_check_*/** config.log 3rdparty/libbacktrace/*.h %s/*' % Build.CACHE_DIR,
+		excl='*.user configuration.py .lock* *conf_check_*/** config.log %s/*' % Build.CACHE_DIR,
 		quiet=True, generator=True)
 
 	bld.load('xshlib')