FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spt: Use SGBox to build up the bounding spheres for the tiles.

Browse Source
This commit is contained in:
Mathias Froehlich 2013-01-20 15:33:25 +01:00
parent 08351e0df2
commit 55610bae70
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
simgear/scene/tgdb/BucketBox.hxx
View File

@ -1,6 +1,6 @@
// BucketBox.cxx -- Helper for on demand database paging. // BucketBox.cxx -- Helper for on demand database paging.
// //
// Copyright (C) 2010 - 2011 Mathias Froehlich // Copyright (C) 2010 - 2013 Mathias Froehlich
// //
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as // modify it under the terms of the GNU General Public License as
@ -208,18 +208,30 @@ public:
SGSpheref getBoundingSphere() const SGSpheref getBoundingSphere() const
{ {
SGSpheref sphere; SGBoxf box;
unsigned incx = 10*8; for (unsigned i = 0, incx = 10*8; incx != 0; i += incx) {
for (unsigned i = 0; incx != 0; i += incx) { for (unsigned j = 0, incy = 10*8; incy != 0; j += incy) {
unsigned incy = 10*8; box.expandBy(SGVec3f::fromGeod(_offsetToGeod(_offset[0] + i, _offset[1] + j, -1000)));
for (unsigned j = 0; incy != 0; j += incy) { box.expandBy(SGVec3f::fromGeod(_offsetToGeod(_offset[0] + i, _offset[1] + j, 10000)));
sphere.expandBy(SGVec3f::fromGeod(_offsetToGeod(_offset[0] + i, _offset[1] + j, -1000)));
sphere.expandBy(SGVec3f::fromGeod(_offsetToGeod(_offset[0] + i, _offset[1] + j, 10000)));
incy = std::min(incy, _size[1] - j); incy = std::min(incy, _size[1] - j);
} }
incx = std::min(incx, _size[0] - i); incx = std::min(incx, _size[0] - i);
} }
return SGSpheref(sphere.getCenter(), sphere.getRadius() + 5000); SGSpheref sphere(box.getCenter(), 0);
for (unsigned i = 0, incx = 10*8; incx != 0; i += incx) {
for (unsigned j = 0, incy = 10*8; incy != 0; j += incy) {
float r2;
r2 = distSqr(sphere.getCenter(), SGVec3f::fromGeod(_offsetToGeod(_offset[0] + i, _offset[1] + j, -1000)));
if (sphere.getRadius2() < r2)
sphere.setRadius(sqrt(r2));
r2 = distSqr(sphere.getCenter(), SGVec3f::fromGeod(_offsetToGeod(_offset[0] + i, _offset[1] + j, 10000)));
if (sphere.getRadius2() < r2)
sphere.setRadius(sqrt(r2));
incy = std::min(incy, _size[1] - j);
}
incx = std::min(incx, _size[0] - i);
}
return sphere;
} }
// Split the current box into up to two boxes that do not cross the 360 deg border. // Split the current box into up to two boxes that do not cross the 360 deg border.