From 4f04a97fdfe5fbb3bcd797c6e08cd0fc522e34b1 Mon Sep 17 00:00:00 2001 From: q3rally Date: Sat, 3 Apr 2021 23:31:23 +0000 Subject: [PATCH] worked out the surfaceparms stuff added visual effect for SURF_SNOW (needs fixing) deleted useless surfaceparms files --- baseq3r/gfx/misc/snowpuff3.tga | Bin 0 -> 16428 bytes baseq3r/scripts/custinfoparms.txt | 1 + baseq3r/scripts/gfx.shader | 12 +++++ baseq3r/scripts/q3r_arenas.txt | 0 baseq3r/scripts/q3r_surfaceparms.txt | 54 ----------------------- baseq3r/scripts/q3r_textures.shader | 2 +- baseq3r/scripts/surfaceparms.txt | 46 ------------------- engine/code/cgame/cg_local.h | 11 +++-- engine/code/cgame/cg_main.c | 7 ++- engine/code/cgame/cg_players.c | 63 ++++++++++++++++++++++----- engine/code/game/bg_physics.h | 10 +++-- engine/code/game/g_local.h | 1 + engine/code/game/g_main.c | 2 + engine/code/game/g_spawn.c | 5 ++- engine/code/qcommon/q_shared.h | 2 +- engine/code/qcommon/surfaceflags.h | 8 ---- q3rallycode.ppr | 58 ++++++++++++++++-------- 17 files changed, 133 insertions(+), 149 deletions(-) create mode 100644 baseq3r/gfx/misc/snowpuff3.tga delete mode 100644 baseq3r/scripts/q3r_arenas.txt delete mode 100644 baseq3r/scripts/q3r_surfaceparms.txt delete mode 100644 baseq3r/scripts/surfaceparms.txt diff --git a/baseq3r/gfx/misc/snowpuff3.tga b/baseq3r/gfx/misc/snowpuff3.tga new file mode 100644 index 0000000000000000000000000000000000000000..a0cb9cd824dc6e30c3fdd7bbefcf3cc91f37ca20 GIT binary patch literal 16428 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 z z_HV>;A`a;5-*`)7i){>RKN9b7qtpZPfbn5%1MQ*(J)o{J$QLhAl=#(JEIph3FD@) zi5*UTf=Sv0i$k5@^aR0^*j1?W&C-mn3K^^1)3@p2{*6!W>RY${sg>)u?p(S4mrpKV z^XMk>Bip~qwV!ExVgIZ9WIi#{eawH+Z-4F*#QD_gv&T<9nEfN7j|x0sA2j0V(d@}) zpErA9ZFtuxh&|kbz!MjFp-r$NruJ#ksjL@2y=!-rYrLoL=MVL7*tYZD)tk3wulWn; z0V(_3*Bz5ztj(P1J~w&~@!OiwlzqlI-wZ$d1~NPVAH?q$&bq2?oeedW+1|NnJ zdX(9>?9wJ8FTK(q#`}^;dXZcw);*-ItcKIKptrKz6@#P0#xtbs8WyHaR(>F1$m6n)a#IfI1Xf`C8xT?hL0p&uUf zi6g%&Vjm@Z=T^o@^r5J2l%ijJn#&)YiawlT)(+(Qb4U6SUSGZH{-rBXcaYZ^gRNM# zzBxOFKK1d(|HYb5TZdcZ{M38t+s+>UP#&1JkiSI}yr55{Er31rn!o!Q_{|P~w_}p| zTNm0(_SAaOR~kTXf?rEa524o`xqdNoE!5_wpl4&MtR+iaxg&YT{sh0)$zH-@_M?iP zR4p+Jb>~?Dydye!@{h~cZFr~}J<(IJuEJWp`(w__UdL~?_tH1y>VcF4_y*H1;P+nx zzXQYXMEF|~N&Jlz?In8=p);c$4)r{j&$!T|M!xOWqu=p@>~8f!n=5dk%Nw~|){=8^ z%fC^}?!j*Wu0T&Z`u{`U_65S15GQ-aG3Z1TgjlRVD+-qDOB2VzOAhx@^P<2v?akT2L9=9{cL zpmscq_}@GE{wsVZ@x>QkoZ{bn_iM5G#@97iP`@Q6)-KtfPKrXF%nL~PCY8a$z2<~v&0%kiiw78A4l zpvE=3rQLaMO>JvFYqh2y<2wv|R}f@wK+Y(0JTG-!%InBDB%c4PaVTG8udRH(Tu<)E zHIoNR>%{vR{Kn38uFI)j#9mhF#*+G0ah>;N?`dWpDSsJ0i)+{u`RxC%qr^a&FlC`R zZ*gs79(xoTkasPqH+9CuZsIespe.legs.animationNumber & ~ANIM_TOGGLEBIT; - if ( anim != LEGS_LANDB && anim != LEGS_LAND ) { - return; - } -*/ -// END - cent->dustTrailTime += 40; if ( cent->dustTrailTime < cg.time ) { cent->dustTrailTime = cg.time; @@ -2055,6 +2046,51 @@ static void CG_DustTrail( centity_t *cent ) { #endif +/* +=============== +CG_SnowTrail +=============== +*/ +static void CG_SnowTrail( centity_t *cent ) { +// int anim; + vec3_t end, vel; + trace_t tr; + + if (!cg_enableSnow.integer) + return; + + if ( cent->snowTrailTime > cg.time ) { + return; + } + + cent->snowTrailTime += 40; + if ( cent->snowTrailTime < cg.time ) { + cent->snowTrailTime = cg.time; + } + + VectorCopy(cent->currentState.pos.trBase, end); + end[2] -= 64; + CG_Trace( &tr, cent->currentState.pos.trBase, NULL, NULL, end, cent->currentState.number, MASK_PLAYERSOLID ); + + if ( !(tr.surfaceFlags & SURF_SNOW) ) + return; + + VectorCopy( cent->currentState.pos.trBase, end ); + end[2] -= 16; + + VectorSet(vel, 0, 0, -30); + CG_SmokePuff( end, vel, + 24, + .8f, .8f, 0.7f, 0.33f, + 500, + cg.time, + 0, + 0, + cgs.media.snowPuffShader ); +} + +// #endif + /* =============== CG_TrailItem @@ -2891,6 +2927,10 @@ static void CG_SurfaceEffects( centity_t *cent, vec3_t curOrigin, vec3_t up, int shader = cgs.media.SMDirtShader; colorIndex = 1; } + else if (tr.surfaceFlags & SURF_SNOW){ + shader = cgs.media.SMDirtShader; + colorIndex = 1; + } else if (tr.surfaceFlags & SURF_DIRT) { shader = cgs.media.SMDirtShader; colorIndex = 1; @@ -2926,14 +2966,13 @@ static void CG_SurfaceEffects( centity_t *cent, vec3_t curOrigin, vec3_t up, int return; } -// trap_S_AddRealLoopingSound( cent->currentState.clientNum, origin, cent->currentState.pos.trDelta, trap_S_RegisterSound( "sound/rally/car/skid.wav", qfalse ) ); -/* + trap_S_AddRealLoopingSound( cent->currentState.clientNum, origin, cent->currentState.pos.trDelta, trap_S_RegisterSound( "sound/rally/car/skid.wav", qfalse ) ); + if( cent->skidSoundTime + 500 < cg.time ) { trap_S_StartSound( origin, cent->currentState.clientNum, CHAN_VOICE, trap_S_RegisterSound( "sound/rally/car/skid.wav", qfalse ) ); cent->skidSoundTime = cg.time; } -*/ VectorMA(curOrigin, 1/2.0F, delta, origin); VectorNormalize(delta); diff --git a/engine/code/game/bg_physics.h b/engine/code/game/bg_physics.h index db5fb336..74dfc057 100644 --- a/engine/code/game/bg_physics.h +++ b/engine/code/game/bg_physics.h @@ -98,10 +98,12 @@ extern float CP_GEAR_RATIOS[]; #define CP_DIRT_KCOF 0.8f #define CP_GRASS_SCOF 1.05f // short grass #define CP_GRASS_KCOF 0.7f -#define CP_GRAVEL_SCOF 1.22f // gravel -#define CP_GRAVEL_KCOF 0.85f -#define CP_SNOW_SCOF 0.7f // packed snow -#define CP_SNOW_KCOF 0.5f +#define CP_GRAVEL_SCOF 1.22f // gravel +#define CP_GRAVEL_KCOF 0.85f +#define CP_SNOW_SCOF 0.4f // packed snow +#define CP_SNOW_KCOF 0.27f +//#define CP_SNOW_SCOF 0.7f // packed snow +//#define CP_SNOW_KCOF 0.5f #define CP_OIL_SCOF 0.3f // oil #define CP_OIL_KCOF 0.2f diff --git a/engine/code/game/g_local.h b/engine/code/game/g_local.h index 2bbd41fb..27349504 100644 --- a/engine/code/game/g_local.h +++ b/engine/code/game/g_local.h @@ -956,6 +956,7 @@ extern vmCvar_t pmove_fixed; extern vmCvar_t pmove_msec; extern vmCvar_t g_rankings; extern vmCvar_t g_enableDust; +extern vmCvar_t g_enableSnow; extern vmCvar_t g_enableBreath; extern vmCvar_t g_singlePlayer; extern vmCvar_t g_proxMineTimeout; diff --git a/engine/code/game/g_main.c b/engine/code/game/g_main.c index 3bf82679..e52b2c8a 100644 --- a/engine/code/game/g_main.c +++ b/engine/code/game/g_main.c @@ -86,6 +86,7 @@ vmCvar_t pmove_msec; vmCvar_t g_rankings; vmCvar_t g_listEntity; vmCvar_t g_localTeamPref; +vmCvar_t g_enableSnow; #ifdef MISSIONPACK vmCvar_t g_obeliskHealth; vmCvar_t g_obeliskRegenPeriod; @@ -199,6 +200,7 @@ static cvarTable_t gameCvarTable[] = { { &g_allowVote, "g_allowVote", "1", CVAR_ARCHIVE, 0, qfalse }, { &g_listEntity, "g_listEntity", "0", 0, 0, qfalse }, + { &g_enableSnow, "g_enableSnow", "0", CVAR_SERVERINFO, 0, qtrue, qfalse }, #ifdef MISSIONPACK { &g_obeliskHealth, "g_obeliskHealth", "2500", 0, 0, qfalse }, diff --git a/engine/code/game/g_spawn.c b/engine/code/game/g_spawn.c index e1dfd6c6..3326898d 100644 --- a/engine/code/game/g_spawn.c +++ b/engine/code/game/g_spawn.c @@ -705,7 +705,10 @@ void SP_worldspawn( void ) { G_SpawnString( "enableDust", "0", &s ); trap_Cvar_Set( "g_enableDust", s ); - + + G_SpawnString( "enableSnow", "0", &s ); + trap_Cvar_Set( "g_enableSnow", s ); + G_SpawnString( "enableBreath", "0", &s ); trap_Cvar_Set( "g_enableBreath", s ); diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index e3ae2be6..2d586cb6 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.0.3.0_r339" +#define PRODUCT_VERSION "v0.0.3.0_r347" #endif diff --git a/engine/code/qcommon/surfaceflags.h b/engine/code/qcommon/surfaceflags.h index 12455bf4..6552faea 100644 --- a/engine/code/qcommon/surfaceflags.h +++ b/engine/code/qcommon/surfaceflags.h @@ -33,13 +33,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define CONTENTS_SLIME 16 #define CONTENTS_WATER 32 #define CONTENTS_FOG 64 - #define CONTENTS_NOTTEAM1 0x0080 #define CONTENTS_NOTTEAM2 0x0100 #define CONTENTS_NOBOTCLIP 0x0200 - #define CONTENTS_AREAPORTAL 0x8000 - #define CONTENTS_PLAYERCLIP 0x10000 #define CONTENTS_MONSTERCLIP 0x20000 //bot specific contents types @@ -49,9 +46,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define CONTENTS_DONOTENTER 0x200000 #define CONTENTS_BOTCLIP 0x400000 #define CONTENTS_MOVER 0x800000 - #define CONTENTS_ORIGIN 0x1000000 // removed before bsping an entity - #define CONTENTS_BODY 0x2000000 // should never be on a brush, only in game #define CONTENTS_CORPSE 0x4000000 #define CONTENTS_DETAIL 0x8000000 // brushes not used for the bsp @@ -79,8 +74,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define SURF_ALPHASHADOW 0x10000 // do per-pixel light shadow casting in q3map #define SURF_NODLIGHT 0x20000 // don't dlight even if solid (solid lava, skies) #define SURF_DUST 0x40000 // leave a dust trail when walking on this surface - -// STONELANCE #define SURF_GRASS 0x80000 #define SURF_ASPHALT 0x100000 #define SURF_WET 0x200000 @@ -89,5 +82,4 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define SURF_ICE 0x1000000 #define SURF_DIRT 0x2000000 #define SURF_METAL 0x4000000 -// END diff --git a/q3rallycode.ppr b/q3rallycode.ppr index e8f72cef..a359dfe7 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -95,7 +95,7 @@ q3rallycode engine\code\botlib\l_utils.h engine\code\botlib\lcc.mak engine\code\botlib\linux-i386.mak - -cgame + +cgame engine\code\cgame\cg_atmospheric.c engine\code\cgame\cg_consolecmds.c engine\code\cgame\cg_draw.c @@ -863,15 +863,21 @@ q3rallycode 2=engine\code\q3_ui\ui_rally_options.c 3=engine\code\cgame\cg_rally_hud.c 4=engine\code\cgame\cg_draw.c -5=engine\code\sdl\sdl_icon.h -6=engine\code\sdl\sdl_glimp.c -7=engine\code\game\bg_physics.c -8=engine\code\qcommon\surfaceflags.h +5=engine\code\game\bg_physics.c +6=engine\code\qcommon\surfaceflags.h +7=engine\code\cgame\cg_players.c +8=engine\code\cgame\cg_main.c +9=engine\code\game\g_local.h +10=engine\code\game\g_main.c +11=engine\code\game\g_spawn.c +12=engine\code\cgame\cg_event.c +13=engine\code\cgame\cg_rally_tools.c +14=engine\code\game\bg_physics.h [Selected Project Files] Main= -Selected=engine\code\qcommon\q_shared.h +Selected=engine\code\cgame\cg_main.c [engine\code\qcommon\q_shared.h] -TopLine=1073 +TopLine=52 Caret=39,70 [engine\code\q3_ui\ui_rally_controls.c] TopLine=333 @@ -885,15 +891,33 @@ Caret=108,806 [engine\code\cgame\cg_draw.c] TopLine=434 Caret=1,449 -[engine\code\sdl\sdl_icon.h] -TopLine=113 -Caret=28,137 -[engine\code\sdl\sdl_glimp.c] -TopLine=366 -Caret=38,390 [engine\code\game\bg_physics.c] -TopLine=632 -Caret=1,671 +TopLine=640 +Caret=29,655 [engine\code\qcommon\surfaceflags.h] -TopLine=13 -Caret=1,86 +TopLine=66 +Caret=1,80 +[engine\code\cgame\cg_players.c] +TopLine=2034 +Caret=1,2054 +[engine\code\cgame\cg_main.c] +TopLine=1132 +Caret=56,1147 +[engine\code\game\g_local.h] +TopLine=939 +Caret=34,959 +[engine\code\game\g_main.c] +TopLine=199 +Caret=79,203 +[engine\code\game\g_spawn.c] +TopLine=666 +Caret=39,707 +[engine\code\cgame\cg_event.c] +TopLine=830 +Caret=1,815 +[engine\code\cgame\cg_rally_tools.c] +TopLine=320 +Caret=1,324 +[engine\code\game\bg_physics.h] +TopLine=89 +Caret=27,104