#include <stdio.h>
#include <string.h>
+#include <osgViewer/Viewer>
#include <osgUtil/IntersectVisitor>
#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>
#include <simgear/scene/model/CheckSceneryVisitor.hxx>
+#include <Main/renderer.hxx>
#include <Main/fg_props.hxx>
#include "tilemgr.hxx"
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 = false;
std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
butNotFrom) != hit.getNodePath().end())
continue;
- SGVec3d point;
- point.osg() = hit.getWorldIntersectPoint();
- SGGeod geod = SGGeod::fromCart(point);
+
+ // 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;
hits = true;
- if (material) {
- *material = 0;
- const EffectGeode* eg
- = dynamic_cast<const EffectGeode*>(hit.getGeode());
- if (eg)
- *material = SGMaterialLib::findMaterial(eg->getEffect());
- }
+ if (material)
+ *material = SGMaterialLib::findMaterial(hit.getGeode());
}
}
}
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 = false;
std::find(hit.getNodePath().begin(), hit.getNodePath().end(),
butNotFrom) != hit.getNodePath().end())
continue;
- SGVec3d point;
- point.osg() = hit.getWorldIntersectPoint();
- double newdist = length(start - point);
+ // 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;
}
}
bool FGScenery::scenery_available(const SGGeod& position, double range_m)
{
- if(globals->get_tile_mgr()->scenery_available(position, range_m))
+ if(globals->get_tile_mgr()->schedule_scenery(position, range_m, 0.0))
{
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);
+ osg::FrameStamp* framestamp
+ = globals->get_renderer()->getViewer()->getFrameStamp();
+ simgear::CheckSceneryVisitor csnv(getPagerSingleton(), toOsg(p), range_m, framestamp);
// 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);
-