qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite the intersection tests.

Browse source 
The early bailout proved to be difficult to get right, so don't bother.
This commit is contained in:
Bill Currie 2012-12-07 22:16:51 +09:00
parent 98c9e4f8c0
commit 56956fc370
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
libs/util/set.c
View file

@ -341,17 +341,20 @@ static int
set_test_intersect_n_n (const set_t *s1, const set_t *s2)
{
unsigned i, end;
unsigned intersection = 0;
set_test_e rval = set_equiv;
end = min (s1->size, s2->size) / BITS;
for (i = 0; i < end; i++) {
if (s1->map[i] != s2->map[i]) {
if (s1->map[i] & s2->map[i])
return set_intersecting;
else
rval = set_disjoint;
}
unsigned m1 = s1->map[i];
unsigned m2 = s2->map[i];
intersection |= m1 & m2;
if (m1 != m2)
rval = set_intersecting;
}
if (rval == set_intersecting && !intersection)
rval = set_disjoint;
return rval;
}
@ -359,17 +362,20 @@ static int
set_test_intersect_n_i (const set_t *s1, const set_t *s2)
{
unsigned i, end;
unsigned intersection = 0;
set_test_e rval = set_equiv;
end = min (s1->size, s2->size) / BITS;
for (i = 0; i < end; i++) {
if (s1->map[i] != ~s2->map[i]) {
if (s1->map[i] & ~s2->map[i])
return set_intersecting;
else
rval = set_disjoint;
}
unsigned m1 = s1->map[i];
unsigned m2 = ~s2->map[i];
intersection |= m1 & m2;
if (m1 != m2)
rval = set_intersecting;
}
if (rval == set_intersecting && !intersection)
rval = set_disjoint;
return rval;
}
@ -377,17 +383,20 @@ static int
set_test_intersect_i_n (const set_t *s1, const set_t *s2)
{
unsigned i, end;
unsigned intersection = 0;
set_test_e rval = set_equiv;
end = min (s1->size, s2->size) / BITS;
for (i = 0; i < end; i++) {
if (~s1->map[i] != s2->map[i]) {
if (~s1->map[i] & s2->map[i])
return set_intersecting;
else
rval = set_disjoint;
}
unsigned m1 = ~s1->map[i];
unsigned m2 = s2->map[i];
intersection |= m1 & m2;
if (m1 != m2)
rval = set_intersecting;
}
if (rval == set_intersecting && !intersection)
rval = set_disjoint;
return rval;
}
@ -395,17 +404,20 @@ static int
set_test_intersect_i_i (const set_t *s1, const set_t *s2)
{
unsigned i, end;
unsigned intersection = 0;
set_test_e rval = set_equiv;
end = min (s1->size, s2->size) / BITS;
for (i = 0; i < end; i++) {
if (~s1->map[i] != ~s2->map[i]) {
if (~s1->map[i] & ~s2->map[i])
return set_intersecting;
else
rval = set_disjoint;
}
unsigned m1 = ~s1->map[i];
unsigned m2 = ~s2->map[i];
intersection |= m1 & m2;
if (m1 != m2)
rval = set_intersecting;
}
if (rval == set_intersecting && !intersection)
rval = set_disjoint;
return rval;
}