#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/scene/tgdb/userdata.hxx>
-#include <simgear/scene/material/Effect.hxx>
-#include <simgear/scene/material/EffectGeode.hxx>
-#include <simgear/scene/material/Technique.hxx>
#include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/util/SGNodeMasks.hxx>
#include <simgear/scene/util/SGSceneUserData.hxx>
bool
FGScenery::get_cart_elevation_m(const SGVec3d& pos, double max_altoff,
- double& alt, const SGMaterial** material)
+ double& alt, const SGMaterial** material,
+ const osg::Node* butNotFrom)
{
SGGeod geod = SGGeod::fromCart(pos);
geod.setElevationM(geod.getElevationM() + max_altoff);
- return get_elevation_m(geod, alt, material);
+ return get_elevation_m(geod, alt, material, butNotFrom);
}
bool
FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
- const SGMaterial** material)
+ const SGMaterial** material,
+ const osg::Node* butNotFrom)
{
SGVec3d start = SGVec3d::fromGeod(geod);
osgUtil::IntersectVisitor intersectVisitor;
intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
osg::ref_ptr<osg::LineSegment> lineSegment;
- lineSegment = new osg::LineSegment(start.osg(), end.osg());
+ lineSegment = new osg::LineSegment(toOsg(start), toOsg(end));
intersectVisitor.addLineSegment(lineSegment.get());
get_scene_graph()->accept(intersectVisitor);
- bool hits = intersectVisitor.hits();
- if (hits) {
+ bool hits = false;
+ if (intersectVisitor.hits()) {
int nHits = intersectVisitor.getNumHits(lineSegment.get());
alt = -SGLimitsd::max();
for (int i = 0; i < nHits; ++i) {
const osgUtil::Hit& hit
= intersectVisitor.getHitList(lineSegment.get())[i];
- SGVec3d point;
- point.osg() = hit.getWorldIntersectPoint();
- SGGeod geod = SGGeod::fromCart(point);
+ if (butNotFrom &&
+ std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
+ butNotFrom) != hit.getNodePath().end())
+ continue;
+
+ // We might need the double variant of the intersection point.
+ // Thus we cannot use the float variant delivered by
+ // hit.getWorldIntersectPoint() but we have to redo that with osg::Vec3d.
+ osg::Vec3d point = hit.getLocalIntersectPoint();
+ if (hit.getMatrix())
+ point = point*(*hit.getMatrix());
+ SGGeod geod = SGGeod::fromCart(toSG(point));
double elevation = geod.getElevationM();
if (alt < elevation) {
alt = elevation;
- if (material) {
- *material = 0;
- const EffectGeode* eg
- = dynamic_cast<const EffectGeode*>(hit.getGeode());
- if (eg)
- *material = SGMaterialLib::findMaterial(eg->getEffect());
- }
+ hits = true;
+ if (material)
+ *material = SGMaterialLib::findMaterial(hit.getGeode());
}
}
}
bool
FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
- SGVec3d& nearestHit)
+ SGVec3d& nearestHit,
+ const osg::Node* butNotFrom)
{
// We assume that starting positions in the center of the earth are invalid
if ( norm1(pos) < 1 )
osgUtil::IntersectVisitor intersectVisitor;
intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
osg::ref_ptr<osg::LineSegment> lineSegment;
- lineSegment = new osg::LineSegment(start.osg(), end.osg());
+ lineSegment = new osg::LineSegment(toOsg(start), toOsg(end));
intersectVisitor.addLineSegment(lineSegment.get());
get_scene_graph()->accept(intersectVisitor);
- bool hits = intersectVisitor.hits();
- if (hits) {
+ bool hits = false;
+ if (intersectVisitor.hits()) {
int nHits = intersectVisitor.getNumHits(lineSegment.get());
double dist = SGLimitsd::max();
for (int i = 0; i < nHits; ++i) {
const osgUtil::Hit& hit
= intersectVisitor.getHitList(lineSegment.get())[i];
- SGVec3d point;
- point.osg() = hit.getWorldIntersectPoint();
- double newdist = length(start - point);
+ if (butNotFrom &&
+ std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
+ butNotFrom) != hit.getNodePath().end())
+ continue;
+ // We might need the double variant of the intersection point.
+ // Thus we cannot use the float variant delivered by
+ // hit.getWorldIntersectPoint() but we have to redo that with osg::Vec3d.
+ osg::Vec3d point = hit.getLocalIntersectPoint();
+ if (hit.getMatrix())
+ point = point*(*hit.getMatrix());
+ double newdist = length(start - toSG(point));
if (newdist < dist) {
dist = newdist;
- nearestHit = point;
+ nearestHit = toSG(point);
+ hits = true;
}
}
}
if(globals->get_tile_mgr()->scenery_available(position, range_m))
{
double elev;
- get_elevation_m(SGGeod::fromGeodM(position, SG_MAX_ELEVATION_M), elev, 0);
+ if (!get_elevation_m(SGGeod::fromGeodM(position, SG_MAX_ELEVATION_M), elev, 0, 0))
+ return false;
SGVec3f p = SGVec3f::fromGeod(SGGeod::fromGeodM(position, elev));
- simgear::CheckSceneryVisitor csnv(getPagerSingleton(), p.osg(), range_m);
+ simgear::CheckSceneryVisitor csnv(getPagerSingleton(), toOsg(p), range_m);
// currently the PagedLODs will not be loaded by the DatabasePager
// while the splashscreen is there, so CheckSceneryVisitor force-loads
// missing objects in the main thread
return pager.get();
}
-// Effect initialization stuff
-
-class PropertyExpression : public SGExpression<bool>
-{
-public:
- PropertyExpression(SGPropertyNode* pnode) : _pnode(pnode) {}
-
- void eval(bool& value, const expression::Binding*) const
- {
- value = _pnode->getValue<bool>();
- }
-protected:
- SGPropertyNode_ptr _pnode;
-};
-
-class EffectPropertyListener : public SGPropertyChangeListener
-{
-public:
- EffectPropertyListener(Technique* tniq) : _tniq(tniq) {}
-
- void valueChanged(SGPropertyNode* node)
- {
- _tniq->refreshValidity();
- }
-protected:
- osg::ref_ptr<Technique> _tniq;
-};
-
-Expression* propertyExpressionParser(const SGPropertyNode* exp,
- expression::Parser* parser)
-{
- SGPropertyNode_ptr pnode = fgGetNode(exp->getStringValue(), true);
- PropertyExpression* pexp = new PropertyExpression(pnode);
- TechniquePredParser* predParser
- = dynamic_cast<TechniquePredParser*>(parser);
- if (predParser)
- pnode->addChangeListener(new EffectPropertyListener(predParser
- ->getTechnique()));
- return pexp;
-}
-
-expression::ExpParserRegistrar propertyRegistrar("property",
- propertyExpressionParser);
-
projects / flightgear.git / blobdiff