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

Use BB radius rather than range for STG entries

Browse Source 
Also remove excess logging from TREE_LIST
This commit is contained in:
Stuart Buchanan 2020-11-17 21:34:57 +00:00
parent 25d922cf6b
commit 1852e3c7fc
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
simgear/scene/tgdb/ReaderWriterSTG.cxx
View File

@ -114,7 +114,7 @@ struct ReaderWriterSTG::_ModelBin {
osg::ref_ptr<SGReaderWriterOptions> _options; osg::ref_ptr<SGReaderWriterOptions> _options;
}; };
struct _ObjectStatic { struct _ObjectStatic {
_ObjectStatic() : _agl(false), _proxy(false), _lon(0), _lat(0), _elev(0), _hdg(0), _pitch(0), _roll(0), _range(0) { } _ObjectStatic() : _agl(false), _proxy(false), _lon(0), _lat(0), _elev(0), _hdg(0), _pitch(0), _roll(0), _range(SG_OBJECT_RANGE_ROUGH), _radius(10) { }
SGPath _errorLocation; SGPath _errorLocation;
std::string _token; std::string _token;
std::string _name; std::string _name;
@ -122,7 +122,7 @@ struct ReaderWriterSTG::_ModelBin {
bool _proxy; bool _proxy;
double _lon, _lat, _elev; double _lon, _lat, _elev;
double _hdg, _pitch, _roll; double _hdg, _pitch, _roll;
double _range; double _range, _radius;
osg::ref_ptr<SGReaderWriterOptions> _options; osg::ref_ptr<SGReaderWriterOptions> _options;
}; };
struct _Sign { struct _Sign {
@ -170,7 +170,7 @@ struct ReaderWriterSTG::_ModelBin {
// Give the node some values so the Quadtree builder has // Give the node some values so the Quadtree builder has
// a BoundingBox to work with prior to the model being loaded. // a BoundingBox to work with prior to the model being loaded.
proxy->setCenter(osg::Vec3f(0.0f,0.0f,0.0f)); proxy->setCenter(osg::Vec3f(0.0f,0.0f,0.0f));
proxy->setRadius(10); proxy->setRadius(o._radius);
proxy->setCenterMode(osg::ProxyNode::UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED); proxy->setCenterMode(osg::ProxyNode::UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED);
node = proxy; node = proxy;
} else { } else {
@ -290,7 +290,6 @@ struct ReaderWriterSTG::_ModelBin {
SGTreeBinList treeList; SGTreeBinList treeList;
treeList.push_back(treeBin); treeList.push_back(treeBin);
SG_LOG(SG_TERRAIN, SG_ALERT, "Making trees " << b._material_name);
osg::MatrixTransform* matrixTransform; osg::MatrixTransform* matrixTransform;
matrixTransform = new osg::MatrixTransform(makeZUpFrame(SGGeod::fromDegM(b._lon, b._lat, b._elev))); matrixTransform = new osg::MatrixTransform(makeZUpFrame(SGGeod::fromDegM(b._lon, b._lat, b._elev)));
@ -518,8 +517,8 @@ struct ReaderWriterSTG::_ModelBin {
obj._name = name; obj._name = name;
obj._agl = (token == "OBJECT_STATIC_AGL"); obj._agl = (token == "OBJECT_STATIC_AGL");
obj._proxy = true; obj._proxy = true;
in >> obj._lon >> obj._lat >> obj._elev >> obj._hdg >> obj._pitch >> obj._roll >> obj._range; in >> obj._lon >> obj._lat >> obj._elev >> obj._hdg >> obj._pitch >> obj._roll >> obj._radius;
obj._range += range; obj._range = range;
obj._options = opt; obj._options = opt;
checkInsideBucket(absoluteFileName, obj._lon, obj._lat); checkInsideBucket(absoluteFileName, obj._lon, obj._lat);
_objectStaticList.push_back(obj); _objectStaticList.push_back(obj);
@ -536,8 +535,8 @@ struct ReaderWriterSTG::_ModelBin {
obj._name = name; obj._name = name;
obj._agl = (token == "OBJECT_SHARED_AGL"); obj._agl = (token == "OBJECT_SHARED_AGL");
obj._proxy = false; obj._proxy = false;
in >> obj._lon >> obj._lat >> obj._elev >> obj._hdg >> obj._pitch >> obj._roll >> obj._range; in >> obj._lon >> obj._lat >> obj._elev >> obj._hdg >> obj._pitch >> obj._roll >> obj._radius;
obj._range += range; obj._range = range;
obj._options = opt; obj._options = opt;
checkInsideBucket(absoluteFileName, obj._lon, obj._lat); checkInsideBucket(absoluteFileName, obj._lon, obj._lat);
_objectStaticList.push_back(obj); _objectStaticList.push_back(obj);
@ -579,7 +578,7 @@ struct ReaderWriterSTG::_ModelBin {
obj._name = name; obj._name = name;
obj._agl = false; obj._agl = false;
obj._proxy = true; obj._proxy = true;
in >> obj._lon >> obj._lat >> obj._elev >> obj._hdg >> obj._pitch >> obj._roll >> obj._range; in >> obj._lon >> obj._lat >> obj._elev >> obj._hdg >> obj._pitch >> obj._roll >> obj._radius;
opt->setLocation(obj._lon, obj._lat); opt->setLocation(obj._lon, obj._lat);
if (token == BUILDING_DETAILED || token == ROAD_DETAILED || token == RAILWAY_DETAILED ) { if (token == BUILDING_DETAILED || token == ROAD_DETAILED || token == RAILWAY_DETAILED ) {
@ -590,9 +589,7 @@ struct ReaderWriterSTG::_ModelBin {
else if (lrand < 0.4) range = range * 1.5; else if (lrand < 0.4) range = range * 1.5;
} }
obj._range += range; obj._range = range;
SG_LOG(SG_TERRAIN, SG_ALERT, "Building list: " << name << " " << obj._range);
obj._options = opt; obj._options = opt;
checkInsideBucket(absoluteFileName, obj._lon, obj._lat); checkInsideBucket(absoluteFileName, obj._lon, obj._lat);

2
simgear/scene/tgdb/TreeBin.cxx
View File

@ -500,8 +500,6 @@ TreeBin(mat)
SGVec3f loc = SGVec3f(x,y,z); SGVec3f loc = SGVec3f(x,y,z);
SGVec3f norm = SGVec3f(a,b,c); SGVec3f norm = SGVec3f(a,b,c);
SG_LOG(SG_TERRAIN, SG_ALERT, "Adding tree " << x << " " << y << " " << z);
insert(Tree(loc, norm)); insert(Tree(loc, norm));
} }