efrags: sw and gl can now share common implementation

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2012-10-21 17:35:24 +10:30
parent 53077c2c54
commit 37b142f506
2 changed files with 2 additions and 276 deletions

View File

@ -410,14 +410,11 @@ NQ_COMMON_C_OBJS = \
pr_cmds.o \
pr_edict.o \
pr_exec.o \
r_efrag.o \
r_part.o \
\
rb_tree.o \
\
sbar.o \
\
shell.o \
\
snd_dma.o \
snd_mem.o \
snd_mix.o \
@ -481,7 +478,6 @@ NQ_SW_C_OBJS = \
r_bsp.o \
r_draw.o \
r_edge.o \
r_efrag.o \
r_light.o \
r_main.o \
r_misc.o \
@ -528,7 +524,6 @@ NQ_GL_C_OBJS = \
gl_draw.o \
gl_mesh.o \
gl_model.o \
gl_refrag.o \
gl_rlight.o \
gl_rmain.o \
gl_rmisc.o \
@ -668,6 +663,7 @@ QW_COMMON_C_OBJS = \
console.o \
keys.o \
menu.o \
r_efrag.o \
r_part.o \
sbar.o \
skin.o \
@ -724,7 +720,6 @@ QW_SW_C_OBJS = \
r_bsp.o \
r_draw.o \
r_edge.o \
r_efrag.o \
r_light.o \
r_main.o \
r_misc.o \
@ -767,7 +762,6 @@ QW_GL_C_OBJS = \
gl_mesh.o \
gl_model.o \
gl_ngraph.o \
gl_refrag.o \
gl_rlight.o \
gl_rmain.o \
gl_rmisc.o \

View File

@ -1,268 +0,0 @@
/*
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// r_efrag.c
#include "console.h"
#include "quakedef.h"
#include "sys.h"
#ifdef GLQUAKE
#include "glquake.h"
#include "gl_model.h"
#else
#include "r_local.h"
#endif
mnode_t *r_pefragtopnode;
//===========================================================================
/*
===============================================================================
ENTITY FRAGMENT FUNCTIONS
===============================================================================
*/
static efrag_t **lastlink;
static entity_t *r_addent;
vec3_t r_emins, r_emaxs;
/*
================
R_RemoveEfrags
Call when removing an object from the world or moving it to another position
================
*/
void
R_RemoveEfrags(entity_t *ent)
{
efrag_t *ef, *old, *walk, **prev;
ef = ent->efrag;
while (ef) {
prev = &ef->leaf->efrags;
while (1) {
walk = *prev;
if (!walk)
break;
if (walk == ef) { // remove this fragment
*prev = ef->leafnext;
break;
} else
prev = &walk->leafnext;
}
old = ef;
ef = ef->entnext;
// put it on the free list
old->entnext = cl.free_efrags;
cl.free_efrags = old;
}
ent->efrag = NULL;
}
/*
===================
R_SplitEntityOnNode
===================
*/
void
R_SplitEntityOnNode(mnode_t *node)
{
efrag_t *ef;
mplane_t *splitplane;
mleaf_t *leaf;
int sides;
if (node->contents == CONTENTS_SOLID) {
return;
}
// add an efrag if the node is a leaf
if (node->contents < 0) {
if (!r_pefragtopnode)
r_pefragtopnode = node;
leaf = (mleaf_t *)node;
// grab an efrag off the free list
ef = cl.free_efrags;
if (!ef) {
Con_Printf("Too many efrags!\n");
return; // no free fragments...
}
cl.free_efrags = cl.free_efrags->entnext;
ef->entity = r_addent;
// add the entity link
*lastlink = ef;
lastlink = &ef->entnext;
ef->entnext = NULL;
// set the leaf links
ef->leaf = leaf;
ef->leafnext = leaf->efrags;
leaf->efrags = ef;
return;
}
// NODE_MIXED
splitplane = node->plane;
sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane);
if (sides == 3) {
// split on this plane
// if this is the first splitter of this bmodel, remember it
if (!r_pefragtopnode)
r_pefragtopnode = node;
}
// recurse down the contacted sides
if (sides & 1)
R_SplitEntityOnNode(node->children[0]);
if (sides & 2)
R_SplitEntityOnNode(node->children[1]);
}
#ifndef GLQUAKE
/*
===================
R_SplitEntityOnNode2
===================
*/
void
R_SplitEntityOnNode2(mnode_t *node)
{
mplane_t *splitplane;
int sides;
if (node->visframe != r_visframecount)
return;
if (node->contents < 0) {
if (node->contents != CONTENTS_SOLID)
r_pefragtopnode = node; // we've reached a non-solid leaf, so it's
// visible and not BSP clipped
return;
}
splitplane = node->plane;
sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane);
if (sides == 3) {
// remember first splitter
r_pefragtopnode = node;
return;
}
// not split yet; recurse down the contacted side
if (sides & 1)
R_SplitEntityOnNode2(node->children[0]);
else
R_SplitEntityOnNode2(node->children[1]);
}
#endif
/*
===========
R_AddEfrags
===========
*/
void
R_AddEfrags(entity_t *ent)
{
model_t *entmodel;
int i;
if (!ent->model)
return;
#ifdef NQ_HACK
if (ent == cl_entities)
return; // never add the world
#endif
#ifdef QW_HACK
if (ent == &r_worldentity)
return; // never add the world
#endif
r_addent = ent;
lastlink = &ent->efrag;
r_pefragtopnode = NULL;
entmodel = ent->model;
for (i = 0; i < 3; i++) {
r_emins[i] = ent->origin[i] + entmodel->mins[i];
r_emaxs[i] = ent->origin[i] + entmodel->maxs[i];
}
R_SplitEntityOnNode(cl.worldmodel->nodes);
ent->topnode = r_pefragtopnode;
}
/*
================
R_StoreEfrags
// FIXME: a lot of this goes away with edge-based
================
*/
void
R_StoreEfrags(efrag_t **ppefrag)
{
entity_t *pent;
model_t *clmodel;
efrag_t *pefrag;
while ((pefrag = *ppefrag) != NULL) {
pent = pefrag->entity;
clmodel = pent->model;
switch (clmodel->type) {
case mod_alias:
case mod_brush:
case mod_sprite:
if ((pent->visframe != r_framecount) &&
(cl_numvisedicts < MAX_VISEDICTS)) {
/* mark that we've recorded this entity for this frame */
pent->visframe = r_framecount;
cl_visedicts[cl_numvisedicts++] = *pent;
}
ppefrag = &pefrag->leafnext;
break;
default:
Sys_Error("%s: Bad entity type %d", __func__, clmodel->type);
}
}
}