mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-23 12:52:46 +00:00
Whitespace.
This commit is contained in:
parent
707c4aa44b
commit
84b2070d17
6 changed files with 18 additions and 35 deletions
|
@ -126,6 +126,7 @@ cvar_t *scr_viewsize;
|
||||||
|
|
||||||
unsigned char lighthalf_v[3] = {255, 255, 255};
|
unsigned char lighthalf_v[3] = {255, 255, 255};
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
R_Init_Cvars (void)
|
R_Init_Cvars (void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,11 +41,8 @@ efrag_t *r_free_efrags;
|
||||||
// FIXME: put this on hunk?
|
// FIXME: put this on hunk?
|
||||||
efrag_t r_efrags[MAX_EFRAGS];
|
efrag_t r_efrags[MAX_EFRAGS];
|
||||||
|
|
||||||
|
|
||||||
//===========================================================================
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
ENTITY FRAGMENT FUNCTIONS
|
ENTITY FRAGMENT FUNCTIONS
|
||||||
*/
|
*/
|
||||||
|
|
||||||
efrag_t **lastlink;
|
efrag_t **lastlink;
|
||||||
|
@ -56,9 +53,9 @@ entity_t *r_addent;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
R_RemoveEfrags
|
R_RemoveEfrags
|
||||||
|
|
||||||
Call when removing an object from the world or moving it to another position
|
Call when removing an object from the world or moving it to another position
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
R_RemoveEfrags (entity_t *ent)
|
R_RemoveEfrags (entity_t *ent)
|
||||||
|
@ -91,9 +88,6 @@ R_RemoveEfrags (entity_t *ent)
|
||||||
ent->efrag = NULL;
|
ent->efrag = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
R_SplitEntityOnNode
|
|
||||||
*/
|
|
||||||
void
|
void
|
||||||
R_SplitEntityOnNode (mnode_t *node)
|
R_SplitEntityOnNode (mnode_t *node)
|
||||||
{
|
{
|
||||||
|
@ -105,15 +99,15 @@ R_SplitEntityOnNode (mnode_t *node)
|
||||||
if (node->contents == CONTENTS_SOLID) {
|
if (node->contents == CONTENTS_SOLID) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// add an efrag if the node is a leaf
|
|
||||||
|
|
||||||
|
// add an efrag if the node is a leaf
|
||||||
if (node->contents < 0) {
|
if (node->contents < 0) {
|
||||||
if (!r_pefragtopnode)
|
if (!r_pefragtopnode)
|
||||||
r_pefragtopnode = node;
|
r_pefragtopnode = node;
|
||||||
|
|
||||||
leaf = (mleaf_t *) node;
|
leaf = (mleaf_t *) node;
|
||||||
|
|
||||||
// grab an efrag off the free list
|
// grab an efrag off the free list
|
||||||
ef = r_free_efrags;
|
ef = r_free_efrags;
|
||||||
if (!ef) {
|
if (!ef) {
|
||||||
Con_Printf ("Too many efrags!\n");
|
Con_Printf ("Too many efrags!\n");
|
||||||
|
@ -123,20 +117,20 @@ R_SplitEntityOnNode (mnode_t *node)
|
||||||
|
|
||||||
ef->entity = r_addent;
|
ef->entity = r_addent;
|
||||||
|
|
||||||
// add the entity link
|
// add the entity link
|
||||||
*lastlink = ef;
|
*lastlink = ef;
|
||||||
lastlink = &ef->entnext;
|
lastlink = &ef->entnext;
|
||||||
ef->entnext = NULL;
|
ef->entnext = NULL;
|
||||||
|
|
||||||
// set the leaf links
|
// set the leaf links
|
||||||
ef->leaf = leaf;
|
ef->leaf = leaf;
|
||||||
ef->leafnext = leaf->efrags;
|
ef->leafnext = leaf->efrags;
|
||||||
leaf->efrags = ef;
|
leaf->efrags = ef;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// NODE_MIXED
|
|
||||||
|
|
||||||
|
// NODE_MIXED
|
||||||
splitplane = node->plane;
|
splitplane = node->plane;
|
||||||
sides = BOX_ON_PLANE_SIDE (r_emins, r_emaxs, splitplane);
|
sides = BOX_ON_PLANE_SIDE (r_emins, r_emaxs, splitplane);
|
||||||
|
|
||||||
|
@ -146,7 +140,7 @@ R_SplitEntityOnNode (mnode_t *node)
|
||||||
if (!r_pefragtopnode)
|
if (!r_pefragtopnode)
|
||||||
r_pefragtopnode = node;
|
r_pefragtopnode = node;
|
||||||
}
|
}
|
||||||
// recurse down the contacted sides
|
// recurse down the contacted sides
|
||||||
if (sides & 1)
|
if (sides & 1)
|
||||||
R_SplitEntityOnNode (node->children[0]);
|
R_SplitEntityOnNode (node->children[0]);
|
||||||
|
|
||||||
|
@ -154,10 +148,6 @@ R_SplitEntityOnNode (mnode_t *node)
|
||||||
R_SplitEntityOnNode (node->children[1]);
|
R_SplitEntityOnNode (node->children[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
R_SplitEntityOnNode2
|
|
||||||
*/
|
|
||||||
void
|
void
|
||||||
R_SplitEntityOnNode2 (mnode_t *node)
|
R_SplitEntityOnNode2 (mnode_t *node)
|
||||||
{
|
{
|
||||||
|
@ -182,17 +172,14 @@ R_SplitEntityOnNode2 (mnode_t *node)
|
||||||
r_pefragtopnode = node;
|
r_pefragtopnode = node;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// not split yet; recurse down the contacted side
|
|
||||||
|
// not split yet; recurse down the contacted side
|
||||||
if (sides & 1)
|
if (sides & 1)
|
||||||
R_SplitEntityOnNode2 (node->children[0]);
|
R_SplitEntityOnNode2 (node->children[0]);
|
||||||
else
|
else
|
||||||
R_SplitEntityOnNode2 (node->children[1]);
|
R_SplitEntityOnNode2 (node->children[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
R_AddEfrags
|
|
||||||
*/
|
|
||||||
void
|
void
|
||||||
R_AddEfrags (entity_t *ent)
|
R_AddEfrags (entity_t *ent)
|
||||||
{
|
{
|
||||||
|
@ -222,11 +209,10 @@ R_AddEfrags (entity_t *ent)
|
||||||
ent->topnode = r_pefragtopnode;
|
ent->topnode = r_pefragtopnode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
R_StoreEfrags
|
R_StoreEfrags
|
||||||
|
|
||||||
// FIXME: a lot of this goes away with edge-based
|
FIXME: a lot of this goes away with edge-based
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
R_StoreEfrags (efrag_t **ppefrag)
|
R_StoreEfrags (efrag_t **ppefrag)
|
||||||
|
|
|
@ -42,16 +42,17 @@
|
||||||
#include "QF/console.h"
|
#include "QF/console.h"
|
||||||
#include "QF/model.h"
|
#include "QF/model.h"
|
||||||
#include "QF/msg.h"
|
#include "QF/msg.h"
|
||||||
|
#include "QF/render.h"
|
||||||
#include "QF/sound.h"
|
#include "QF/sound.h"
|
||||||
#include "QF/sys.h"
|
#include "QF/sys.h"
|
||||||
|
|
||||||
#include "r_dynamic.h"
|
#include "r_dynamic.h"
|
||||||
#include "QF/render.h"
|
|
||||||
|
|
||||||
#define MAX_VISEDICTS 256
|
#define MAX_VISEDICTS 256
|
||||||
int r_numvisedicts;
|
int r_numvisedicts;
|
||||||
entity_t *r_visedicts[MAX_VISEDICTS];
|
entity_t *r_visedicts[MAX_VISEDICTS];
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
R_Ents_Init (void)
|
R_Ents_Init (void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
extern float mouse_x, mouse_y;
|
extern float mouse_x, mouse_y;
|
||||||
int graphval;
|
int graphval;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
R_TimeGraph
|
R_TimeGraph
|
||||||
|
|
||||||
|
@ -59,11 +60,9 @@ R_TimeGraph (void)
|
||||||
|
|
||||||
r_time2 = Sys_DoubleTime ();
|
r_time2 = Sys_DoubleTime ();
|
||||||
|
|
||||||
// a = (r_time2 - r_time1) / 0.01;
|
|
||||||
a = graphval;
|
a = graphval;
|
||||||
|
|
||||||
r_timings[timex] = a;
|
r_timings[timex] = a;
|
||||||
// a = timex;
|
|
||||||
|
|
||||||
l = MAX_TIMINGS;
|
l = MAX_TIMINGS;
|
||||||
if (l > r_refdef.vrect.width)
|
if (l > r_refdef.vrect.width)
|
||||||
|
|
|
@ -31,6 +31,7 @@ float r_time1;
|
||||||
|
|
||||||
fire_t r_fires[MAX_FIRES];
|
fire_t r_fires[MAX_FIRES];
|
||||||
|
|
||||||
|
|
||||||
dlight_t *
|
dlight_t *
|
||||||
R_AllocDlight (int key)
|
R_AllocDlight (int key)
|
||||||
{
|
{
|
||||||
|
@ -66,7 +67,6 @@ R_AllocDlight (int key)
|
||||||
return dl;
|
return dl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
R_DecayLights (double frametime)
|
R_DecayLights (double frametime)
|
||||||
{
|
{
|
||||||
|
@ -84,7 +84,6 @@ R_DecayLights (double frametime)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
R_ClearDlights (void)
|
R_ClearDlights (void)
|
||||||
{
|
{
|
||||||
|
@ -129,7 +128,6 @@ R_AddFire (vec3_t start, vec3_t end, entity_t *ent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
R_AllocFire
|
R_AllocFire
|
||||||
|
|
||||||
|
|
|
@ -32,10 +32,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "QF/qargs.h"
|
#include "QF/qargs.h"
|
||||||
#include "compat.h"
|
|
||||||
#include "QF/console.h"
|
#include "QF/console.h"
|
||||||
#include "QF/render.h"
|
#include "QF/render.h"
|
||||||
|
|
||||||
|
#include "compat.h"
|
||||||
#include "r_local.h"
|
#include "r_local.h"
|
||||||
|
|
||||||
particle_t *active_particles, *free_particles;
|
particle_t *active_particles, *free_particles;
|
||||||
|
@ -88,7 +88,6 @@ R_DarkFieldParticles (entity_t *ent)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#define NUMVERTEXNORMALS 162
|
#define NUMVERTEXNORMALS 162
|
||||||
extern float r_avertexnormals[NUMVERTEXNORMALS][3];
|
extern float r_avertexnormals[NUMVERTEXNORMALS][3];
|
||||||
static vec3_t avelocities[NUMVERTEXNORMALS];
|
static vec3_t avelocities[NUMVERTEXNORMALS];
|
||||||
|
@ -113,7 +112,6 @@ R_EntityParticles (entity_t *ent)
|
||||||
avelocities[0][i] = (rand () & 255) * 0.01;
|
avelocities[0][i] = (rand () & 255) * 0.01;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
for (i = 0; i < NUMVERTEXNORMALS; i++) {
|
for (i = 0; i < NUMVERTEXNORMALS; i++) {
|
||||||
angle = r_realtime * avelocities[i][0];
|
angle = r_realtime * avelocities[i][0];
|
||||||
sy = sin (angle);
|
sy = sin (angle);
|
||||||
|
|
Loading…
Reference in a new issue