zdoom/zdbsp
0
0
Fork 0
mirror of https://github.com/ZDoom/zdbsp.git synced 2025-02-14 08:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: The scoring of splitters too close to the end of a seg used the wrong anti-weight

Browse source 
for penalizing them. They can no longer produce negative scores, either.



SVN r2088 (trunk)
This commit is contained in:
Randy Heit 2010-01-02 22:05:33 +00:00
parent 050be5fe76
commit 635603e210
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nodebuild.cpp
View file

@ -32,7 +32,7 @@
#define Printf printf #define Printf printf
#define STACK_ARGS #define STACK_ARGS
#if 0 #if 1
#define D(x) x #define D(x) x
#else #else
#define D(x) do{}while(0) #define D(x) do{}while(0)
@ -499,7 +499,8 @@ int FNodeBuilder::SelectSplitter (DWORD set, node_t &node, DWORD &splitseg, int
int FNodeBuilder::Heuristic (node_t &node, DWORD set, bool honorNoSplit) int FNodeBuilder::Heuristic (node_t &node, DWORD set, bool honorNoSplit)
{ {
int score = 0; // Set the initial score above 0 so that near vertex anti-weighting does not automatically disqualify the vertex.
int score = 100000000;
int segsInSet = 0; int segsInSet = 0;
int counts[2] = { 0, 0 }; int counts[2] = { 0, 0 };
int realSegs[2] = { 0, 0 }; int realSegs[2] = { 0, 0 };
@ -604,9 +605,17 @@ int FNodeBuilder::Heuristic (node_t &node, DWORD set, bool honorNoSplit)
// Splitters that are too close to a vertex are bad. // Splitters that are too close to a vertex are bad.
frac = InterceptVector (node, *test); frac = InterceptVector (node, *test);
if (frac < 0.001 || frac > 0.999) if (frac < 0.001)
{ {
score -= int(1 / frac); int penalty = int(1 / frac);
score = MAX(score - penalty, 1);
D(Printf ("Penalized splitter by %d for being too close to start vertex of seg %d.\n", penalty, i));
}
else if (frac > 0.999)
{
int penalty = int(1 / (1 - frac));
score = MAX(score - penalty, 1);
D(Printf ("Penalized splitter by %d for being too close to end vertex of seg %d.\n", penalty, i));
} }
counts[0]++; counts[0]++;