fly/flightgear
1
0
Fork 0
Code Activity

Fix random seeds to avoid coincident objects but still ensure

Browse source 
consistency.
This commit is contained in:
david 2002-07-25 20:30:51 +00:00
parent 9bf3c10743
commit d86a513997
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Objects/obj.cxx
View file

@ -417,6 +417,7 @@ public:
ssgBranch * branch; ssgBranch * branch;
double lon_deg; double lon_deg;
double lat_deg; double lat_deg;
unsigned int seed;
}; };
@ -438,10 +439,10 @@ public:
static void static void
fill_in_triangle (float * p1, float * p2, float * p3, fill_in_triangle (float * p1, float * p2, float * p3,
FGNewMat::ObjectGroup * object_group, ssgBranch * branch, FGNewMat::ObjectGroup * object_group, ssgBranch * branch,
double lon_deg, double lat_deg) double lon_deg, double lat_deg, unsigned int seed)
{ {
// generate a repeatable random seed // generate a repeatable random seed
sg_srandom((unsigned int)(p1[0])); sg_srandom(seed);
int nObjects = object_group->get_object_count(); int nObjects = object_group->get_object_count();
for (int i = 0; i < nObjects; i++) { for (int i = 0; i < nObjects; i++) {
@ -491,7 +492,8 @@ tri_in_range_callback (ssgEntity * entity, int mask)
TriUserData * data = (TriUserData *)entity->getUserData(); TriUserData * data = (TriUserData *)entity->getUserData();
if (!data->is_filled_in) { if (!data->is_filled_in) {
fill_in_triangle(data->p1, data->p2, data->p3, data->object_group, fill_in_triangle(data->p1, data->p2, data->p3, data->object_group,
data->branch, data->lon_deg, data->lat_deg); data->branch, data->lon_deg, data->lat_deg,
data->seed);
data->is_filled_in = true; data->is_filled_in = true;
} }
return 1; return 1;
@ -658,6 +660,7 @@ setup_triangle (float * p1, float * p2, float * p3,
data->branch = in_range; data->branch = in_range;
data->lon_deg = lon_deg; data->lon_deg = lon_deg;
data->lat_deg = lat_deg; data->lat_deg = lat_deg;
data->seed = (unsigned int)(p1[0] * i);
// Set up the in-range node. // Set up the in-range node.
in_range->setUserData(data); in_range->setUserData(data);