tenebrae/tenebrae2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some boxlight fixes

Browse source
This commit is contained in:
cholleme 2003-06-25 09:41:54 +00:00
parent 7151bf4adf
commit a79d857eea
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gl_rsurf.c
View file

@ -940,6 +940,8 @@ void R_RecursiveWorldNode (mnode_t *node)
if (mesh->visframe == r_framecount) continue;
mesh->visframe = r_framecount;
if (R_CullBox(mesh->mins, mesh->maxs)) continue;
mesh->next = mesh->shader->meshchain;
mesh->shader->meshchain = mesh;
//Con_Printf("AddCurve\n");

15
gl_screenrect.c
View file

@ -244,27 +244,28 @@ qboolean intersectsMinsMaxs(aabox_t *b1, vec3_t mins, vec3_t maxs) {
return true;
}
void vmax(vec3_t i1, vec3_t i2, vec3_t r) {
/*
void VectorMax(vec3_t i1, vec3_t i2, vec3_t r) {
r[0] = max(i1[0],i2[0]);
r[1] = max(i1[1],i2[1]);
r[2] = max(i1[2],i2[2]);
}
void vmin(vec3_t i1, vec3_t i2, vec3_t r) {
void VectorMin(vec3_t i1, vec3_t i2, vec3_t r) {
r[0] = min(i1[0],i2[0]);
r[1] = min(i1[1],i2[1]);
r[2] = min(i1[2],i2[2]);
}
*/
aabox_t intersectBoxes(aabox_t *b1, aabox_t *b2) {
aabox_t result;
float temp;
int i;
vmax(b1->mins,b2->mins,result.mins);
vmin(b1->maxs,b2->maxs,result.maxs);
VectorMax(b1->mins,b2->mins,result.mins);
VectorMin(b1->maxs,b2->maxs,result.maxs);
for (i=0;i<3;i++) {
if (result.mins[i]>result.maxs[i]) {
@ -282,8 +283,8 @@ aabox_t intersectBoxes(aabox_t *b1, aabox_t *b2) {
aabox_t addBoxes(aabox_t *b1, aabox_t *b2) {
aabox_t result;
vmin(b1->mins,b2->mins,result.mins);
vmax(b1->maxs,b2->maxs,result.maxs);
VectorMin(b1->mins,b2->mins,result.mins);
VectorMax(b1->maxs,b2->maxs,result.maxs);
return result;
}