X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScenery%2Fscenery.hxx;h=bd976ba231ce82121a8ce1895528aa7fe8821bf6;hb=674a295896a1e56d605f39874262d6f146a586a3;hp=9ee3ae482acc88838db9b8378f27d4021e12e6b7;hpb=2f8beb56eafb97c0e38c04b192068a1578c79344;p=flightgear.git diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx index 9ee3ae482..bd976ba23 100644 --- a/src/Scenery/scenery.hxx +++ b/src/Scenery/scenery.hxx @@ -29,45 +29,26 @@ # error This library requires C++ #endif -#include - #include #include #include +#include #include -#include -#include -#include -SG_USING_STD(list); +#include "SceneryPager.hxx" class SGMaterial; - // Define a structure containing global scenery parameters class FGScenery : public SGSubsystem { - // center of current scenery chunk - SGVec3d center; - - // FIXME this should be a views property - // angle of sun relative to current local horizontal - double sun_angle; // scene graph osg::ref_ptr scene_graph; osg::ref_ptr terrain_branch; - osg::ref_ptr gnd_lights_root; - osg::ref_ptr vasi_lights_root; - osg::ref_ptr rwy_lights_root; - osg::ref_ptr taxi_lights_root; osg::ref_ptr models_branch; osg::ref_ptr aircraft_branch; - // list of all placement transform, used to move the scenery center on the fly. - typedef list > placement_list_type; - placement_list_type _placement_list; - public: FGScenery(); @@ -89,9 +70,9 @@ public: /// lat/lon pair. If there is no scenery for that point, the altitude /// value is undefined. /// All values are meant to be in meters or degrees. - bool get_elevation_m(double lat, double lon, double max_alt, - double& alt, const SGMaterial** material, - bool exact = false); + bool get_elevation_m(const SGGeod& geod, double& alt, + const SGMaterial** material, + const osg::Node* butNotFrom = 0); /// Compute the elevation of the scenery beow the cartesian point pos. /// you the returned scenery altitude is not higher than the position @@ -105,8 +86,8 @@ public: /// value is undefined. /// All values are meant to be in meters. bool get_cart_elevation_m(const SGVec3d& pos, double max_altoff, - double& radius, const SGMaterial** material, - bool exact = false); + double& elevation, const SGMaterial** material, + const osg::Node* butNotFrom = 0); /// Compute the nearest intersection point of the line starting from /// start going in direction dir with the terrain. @@ -114,61 +95,22 @@ public: /// usual earth centered wgs84 coordiante system. Units are meters. /// On success, true is returned. bool get_cart_ground_intersection(const SGVec3d& start, const SGVec3d& dir, - SGVec3d& nearestHit, bool exact = false); - - const SGVec3d& get_center() const { return center; } - void set_center( const SGVec3d& p ); + SGVec3d& nearestHit, + const osg::Node* butNotFrom = 0); osg::Group *get_scene_graph () const { return scene_graph.get(); } - inline void set_scene_graph (osg::Group * s) { scene_graph = s; } - osg::Group *get_terrain_branch () const { return terrain_branch.get(); } - inline void set_terrain_branch (osg::Group * t) { terrain_branch = t; } - - inline osg::Group *get_gnd_lights_root () const { - return gnd_lights_root.get(); - } - inline void set_gnd_lights_root (osg::Group *r) { - gnd_lights_root = r; - } - - inline osg::Group *get_vasi_lights_root () const { - return vasi_lights_root.get(); - } - inline void set_vasi_lights_root (osg::Group *r) { - vasi_lights_root = r; - } - - inline osg::Group *get_rwy_lights_root () const { - return rwy_lights_root.get(); - } - inline void set_rwy_lights_root (osg::Group *r) { - rwy_lights_root = r; - } - - inline osg::Group *get_taxi_lights_root () const { - return taxi_lights_root.get(); - } - inline void set_taxi_lights_root (osg::Group *r) { - taxi_lights_root = r; - } - - inline osg::Group *get_models_branch () const { - return models_branch.get(); - } - inline void set_models_branch (osg::Group *t) { - models_branch = t; - } - - inline osg::Group *get_aircraft_branch () const { - return aircraft_branch.get(); - } - inline void set_aircraft_branch (osg::Group *t) { - aircraft_branch = t; - } - - void register_placement_transform(SGPlacementTransform *trans); - void unregister_placement_transform(SGPlacementTransform *trans); + osg::Group *get_models_branch () const { return models_branch.get(); } + osg::Group *get_aircraft_branch () const { return aircraft_branch.get(); } + + /// Returns true if scenery is avaliable for the given lat, lon position + /// within a range of range_m. + /// lat and lon are expected to be in degrees. + bool scenery_available(const SGGeod& position, double range_m); + + // Static because access to the pager is needed before the rest of + // the scenery is initialized. + static flightgear::SceneryPager* getPagerSingleton(); };