fly/flightgear
1
0
Fork 0
Code Activity

Give up on the idea of using a singleton dummy bounding sphere;

Browse source 
instead, use a separate dummy bounding sphere for each triangle and
each tile, with the actual bounds, to make sure that objects are
always added when they should be in sight.
This commit is contained in:
david 2002-07-26 19:06:29 +00:00
parent c33c58476e
commit 8244b210fa
1 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/Objects/obj.cxx
View file

@ -525,7 +525,7 @@ tri_out_of_range_callback (ssgEntity * entity, int mask)
/** /**
* Singleton ssgEntity with a dummy bounding sphere, to fool culling. * ssgEntity with a dummy bounding sphere, to fool culling.
* *
* This forces the in-range and out-of-range branches to be visited * This forces the in-range and out-of-range branches to be visited
* when appropriate, even if they have no children. It's ugly, but * when appropriate, even if they have no children. It's ugly, but
@ -535,42 +535,22 @@ tri_out_of_range_callback (ssgEntity * entity, int mask)
class DummyBSphereEntity : public ssgEntity class DummyBSphereEntity : public ssgEntity
{ {
public: public:
DummyBSphereEntity (float radius)
{
bsphere.setCenter(0, 0, 0);
bsphere.setRadius(radius);
}
virtual ~DummyBSphereEntity () {} virtual ~DummyBSphereEntity () {}
virtual void recalcBSphere () { bsphere_is_invalid = false; } virtual void recalcBSphere () { bsphere_is_invalid = false; }
virtual void cull (sgFrustum *f, sgMat4 m, int test_needed) {} virtual void cull (sgFrustum *f, sgMat4 m, int test_needed) {}
virtual void isect (sgSphere *s, sgMat4 m, int test_needed) {} virtual void isect (sgSphere *s, sgMat4 m, int test_needed) {}
virtual void hot (sgVec3 s, sgMat4 m, int test_needed) {} virtual void hot (sgVec3 s, sgMat4 m, int test_needed) {}
virtual void los (sgVec3 s, sgMat4 m, int test_needed) {} virtual void los (sgVec3 s, sgMat4 m, int test_needed) {}
static ssgEntity * get_entity (); static ssgEntity * get_tri_entity ();
private: static ssgEntity * get_tile_entity ();
DummyBSphereEntity ()
{
bsphere.setCenter(0, 0, 0);
bsphere.setRadius(1000);
}
static DummyBSphereEntity * entity;
}; };
DummyBSphereEntity * DummyBSphereEntity::entity = 0;
/**
* Ensure that only one copy of the dummy entity exists.
*
* @return The singleton copy of the DummyBSphereEntity.
*/
ssgEntity *
DummyBSphereEntity::get_entity ()
{
if (entity == 0) {
entity = new DummyBSphereEntity;
entity->ref();
}
return entity;
}
/** /**
* Calculate the bounding radius of a triangle from its center. * Calculate the bounding radius of a triangle from its center.
* *
@ -672,7 +652,7 @@ setup_triangle (float * p1, float * p2, float * p3,
out_of_range->setUserData(data); out_of_range->setUserData(data);
out_of_range->setTravCallback(SSG_CALLBACK_PRETRAV, out_of_range->setTravCallback(SSG_CALLBACK_PRETRAV,
tri_out_of_range_callback); tri_out_of_range_callback);
out_of_range->addKid(DummyBSphereEntity::get_entity()); out_of_range->addKid(new DummyBSphereEntity(bounding_radius));
lod->addKid(out_of_range); lod->addKid(out_of_range);
} }
} }
@ -831,7 +811,8 @@ gen_random_surface_objects (ssgLeaf *leaf,
out_of_range->setUserData(data); out_of_range->setUserData(data);
out_of_range->setTravCallback(SSG_CALLBACK_PRETRAV, out_of_range->setTravCallback(SSG_CALLBACK_PRETRAV,
tile_out_of_range_callback); tile_out_of_range_callback);
out_of_range->addKid(DummyBSphereEntity::get_entity()); out_of_range
->addKid(new DummyBSphereEntity(leaf->getBSphere()->getRadius()));
} }