ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2024-11-13 00:24:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Forgot to comit those changes

Browse source 
They are for the new rpgxEF version
This commit is contained in:
Walter Julius Hennecke 2012-01-24 09:26:54 +01:00
parent 03e1822a02
commit 5732476c65
7 changed files with 8 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
cgame/cg_draw.c
View file

@ -4947,79 +4947,6 @@ static void CG_Draw2D( void ) {
}
#ifdef XTRA
void CG_MotionBlur(void) {
//motionblurDot_t *dot;
//vec3_t pos, axis[3];
//int i;
/*if ( !cg.snap->ps.powerups[PW_BOOST] && cg.snap->ps.timers[tmZanzoken] < 1 && !cg.snap->ps.timers[tmTransform]) {
cg.refdef.rdflags &= ~RDF_MOTIONBLUR;
//for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) {
// cg_motionblurDots[i].active = qfalse;
//}
return;
}*/
cg.refdef.rdflags |= RDF_MOTIONBLUR;
/*
// Destroy dots over lifetime
for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) {
dot = &cg_motionblurDots[i];
if ( dot->lifeTime + dot->startTime < cg.time ) {
dot->active = qfalse;
}
}
// Create new dots
for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) {
dot = &cg_motionblurDots[i];
if ( dot->active )
continue;
VectorCopy( cg.predictedPlayerEntity.lerpOrigin, pos );
VectorNormalize2( cg.predictedPlayerState.velocity, axis[0] );
VectorMA( pos, 300, axis[0], pos );
RotateAroundDirection( axis, crandom() * 360 );
VectorMA( pos, 120, axis[2], pos );
memset( &(dot->refEnt), 0, sizeof(refEntity_t));
dot->refEnt.reType = RT_SPRITE;
dot->refEnt.radius = 2;
dot->refEnt.customShader = cgs.media.whiteShader;
dot->refEnt.shaderRGBA[0] = 255;
dot->refEnt.shaderRGBA[1] = 255;
dot->refEnt.shaderRGBA[2] = 255;
dot->refEnt.shaderRGBA[3] = 128;
VectorCopy( pos, dot->refEnt.origin );
dot->lifeTime = 250 + crandom() * 100;
dot->startTime = cg.time + crandom() * 150;
dot->active = qtrue;
}
// Render dots
for ( i = 0; i < MAX_MOTIONBLURDOTS; i++ ) {
dot = &cg_motionblurDots[i];
if ( dot->startTime > cg.time )
continue;
trap_R_AddRefEntityToScene( &(dot->refEnt));
}
*/
}
#endif //XTRA
/*
=====================
CG_DrawActive
@ -5078,10 +5005,6 @@ void CG_DrawActive( stereoFrame_t stereoView ) {
VectorMA( cg.refdef.vieworg, -separation, cg.refdef.viewaxis[1], cg.refdef.vieworg );
}
#ifdef XTRA
CG_MotionBlur();
#endif// XTRA
// draw 3D view
trap_R_RenderScene( &cg.refdef );

14
cgame/cg_local.h
View file

@ -1153,12 +1153,6 @@ typedef struct {
qhandle_t photonRay;
qhandle_t fireParticle;
#ifdef XTRA
//RPG-X | GSIO01 | 08/03/2010:
qhandle_t snowShader;
qhandle_t waterShader;
#endif
qhandle_t explosionModel;
qhandle_t nukeModel;
//qhandle_t electricalExplosionFastShader;// These are used to have a bit of variation in the explosions
@ -1974,10 +1968,6 @@ extern int sortedTeamPlayers[TEAM_MAXOVERLAY];
extern int numSortedTeamPlayers;
extern int drawTeamOverlayModificationCount;
#ifdef XTRA
void CG_MotionBlur( void );
#endif
void CG_AddLagometerFrameInfo( void );
void CG_AddLagometerSnapshotInfo( snapshot_t *snap );
void CG_CenterPrint( const char *str, int y, int charWidth );
@ -2405,10 +2395,6 @@ void trap_R_ModelBounds( clipHandle_t model, vec3_t mins, vec3_t maxs );
void trap_R_LerpTag( orientation_t *tag, clipHandle_t mod, int startFrame, int endFrame,
float frac, const char *tagName );
#ifdef XTRA
void trap_R_AddPolysToScene( qhandle_t hShader , int numVerts, const polyVert_t *verts, int numPolys );
#endif
// The glconfig_t will not change during the life of a cgame.
// If it needs to change, the entire cgame will be restarted, because
// all the qhandle_t are then invalid.

1
cgame/cg_public.h
View file

@ -129,7 +129,6 @@ typedef enum {
#ifdef XTRA
CG_R_REMAP_SHADER = 200,
CG_R_ADDPOLYSTOSCENE
#endif
} cgameImport_t;
//these must match up with cg_syscalls.asm

11
cgame/tr_types.h
View file

@ -6,7 +6,12 @@
#define MAX_DLIGHTS 32 // can't be increased, because bit flags are used on surfaces
#define MAX_ENTITIES 2047
#ifndef XTRA
#define ENTITYNUM_BITS 10 // can't be increased without changing drawsurf bit packing
#else
#define ENTITYNUM_BITS 11 // can't be increased without changing drawsurf bit packing
#endif
#define MAX_ENTITIES ((1<<ENTITYNUM_BITS) - 1)
// renderfx flags
#define RF_LOWLIGHT 0x0001 // subtract ambient to keep it in the dark
@ -31,10 +36,6 @@
#define RDF_NOWORLDMODEL 1 // used for player configuration screen
#define RDF_HYPERSPACE 4 // teleportation effect
#ifdef XTRA
#define RDF_MOTIONBLUR 8
#endif
typedef struct {
vec3_t xyz;
float st[2];

2
game/bg_public.h
View file

@ -10,7 +10,7 @@
// because games can change separately from the main system version, we need a
// second version that must match between game and cgame
#define RPGX_VERSION "RPG-X v2.2 wc171211a"
#define RPGX_VERSION "RPG-X v2.2 wc21012012"
#define RPGX_COMPILEDATE "20/05/11"
#define RPGX_COMPILEDBY "GSIO01"
//const char GAME_VERSION[] = strcat("RPG-X v",RPGX_VERSION);

2
qcommon/stv_version.h
View file

@ -1,5 +1,5 @@
// Current version of holomatch game
#define Q3_VERSION "RPG-X v2.2 wc171211a"
#define Q3_VERSION "RPG-X v2.2 wc21012012"
// end

BIN
stefgame.suo
View file

Binary file not shown.