StelProjector.hpp   StelProjector.hpp 
skipping to change at line 109 skipping to change at line 109
, gravityLabels(false) , gravityLabels(false)
, defaultAngleForGravityText(0.f) , defaultAngleForGravityText(0.f)
, maskType(MaskNone) , maskType(MaskNone)
, zNear(0.f) , zNear(0.f)
, zFar(0.f) , zFar(0.f)
, viewportCenter(128.f, 128.f) , viewportCenter(128.f, 128.f)
, viewportCenterOffset(0.f, 0.f) , viewportCenterOffset(0.f, 0.f)
, viewportFovDiameter(0.f) , viewportFovDiameter(0.f)
, flipHorz(false) , flipHorz(false)
, flipVert(false) , flipVert(false)
, devicePixelsPerPixel(1.f) {;} , devicePixelsPerPixel(1.f)
, widthStretch(1.f) {;}
Vector4<int> viewportXywh; //! posX, posY, width, heig ht Vector4<int> viewportXywh; //! posX, posY, width, heig ht
float fov; //! FOV in degrees float fov; //! FOV in degrees
bool gravityLabels; //! the flag to use gravity labels or not bool gravityLabels; //! the flag to use gravity labels or not
float defaultAngleForGravityText;//! a rotation angle to app ly to gravity text (only if gravityLabels is set to false) float defaultAngleForGravityText;//! a rotation angle to app ly to gravity text (only if gravityLabels is set to false)
StelProjectorMaskType maskType; //! The current projector m ask StelProjectorMaskType maskType; //! The current projector m ask
float zNear, zFar; //! Near and far clipping p lanes float zNear, zFar; //! Near and far clipping p lanes
Vec2f viewportCenter; //! Viewport center in scre en pixel Vec2f viewportCenter; //! Viewport center in scre en pixel
Vec2f viewportCenterOffset; //! Viewport center's offse t in fractions of screen width/height. Usable e.g. in cylindrical projectio n to move horizon down. Vec2f viewportCenterOffset; //! Viewport center's offse t in fractions of screen width/height. Usable e.g. in cylindrical projectio n to move horizon down.
//! Currently only Y shift is fully implemented, X shift likely not too meaningful. //! Currently only Y shift is fully implemented, X shift likely not too meaningful.
float viewportFovDiameter; //! diameter of the FOV dis k in pixel float viewportFovDiameter; //! diameter of the FOV dis k in pixel
bool flipHorz, flipVert; //! Whether to flip in hori zontal or vertical directions bool flipHorz, flipVert; //! Whether to flip in hori zontal or vertical directions
float devicePixelsPerPixel; //! The number of device pi xel per "Device Independent Pixels" (value is usually 1, but 2 for mac reti na screens) float devicePixelsPerPixel; //! The number of device pi xel per "Device Independent Pixels" (value is usually 1, but 2 for mac reti na screens)
float widthStretch; //! A factor to adapt to sp ecial installation setups, e.g. multi-projector with edge blending. Allow t o stretch/squeeze projected content. Larger than 1 means the image is stret ched wider.
}; };
//! Destructor //! Destructor
virtual ~StelProjector() {} virtual ~StelProjector() {}
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods which must be reimplemented by all instance of StelProjec tor // Methods which must be reimplemented by all instance of StelProjec tor
//! Get a human-readable name for this projection type //! Get a human-readable name for this projection type
virtual QString getNameI18() const = 0; virtual QString getNameI18() const = 0;
//! Get a human-readable short description for this projection type //! Get a human-readable short description for this projection type
skipping to change at line 299 skipping to change at line 301
: modelViewTransform(amodelViewTransform), : modelViewTransform(amodelViewTransform),
flipHorz(0.f), flipHorz(0.f),
flipVert(0.f), flipVert(0.f),
pixelPerRad(0.f), pixelPerRad(0.f),
maskType(MaskNone), maskType(MaskNone),
zNear(0.f), zNear(0.f),
oneOverZNearMinusZFar(0.f), oneOverZNearMinusZFar(0.f),
viewportFovDiameter(0.f), viewportFovDiameter(0.f),
gravityLabels(true), gravityLabels(true),
defaultAngleForGravityText(0.f), defaultAngleForGravityText(0.f),
devicePixelsPerPixel(1.f) {;} devicePixelsPerPixel(1.f),
widthStretch(1.0f) {;}
//! Return whether the projection presents discontinuities. Used for optimization. //! Return whether the projection presents discontinuities. Used for optimization.
virtual bool hasDiscontinuity() const =0; virtual bool hasDiscontinuity() const =0;
//! Determine whether a great circle connection p1 and p2 intersects with a projection discontinuity. //! Determine whether a great circle connection p1 and p2 intersects with a projection discontinuity.
//! For many projections without discontinuity, this should return a lways false, but for other like //! For many projections without discontinuity, this should return a lways false, but for other like
//! cylindrical projection it will return true if the line cuts the wrap-around line (i.e. at lon=180 if the observer look at lon=0). //! cylindrical projection it will return true if the line cuts the wrap-around line (i.e. at lon=180 if the observer look at lon=0).
virtual bool intersectViewportDiscontinuityInternal(const Vec3d& p1, const Vec3d& p2) const = 0; virtual bool intersectViewportDiscontinuityInternal(const Vec3d& p1, const Vec3d& p2) const = 0;
//! Determine whether a cap intersects with a projection discontinui ty. //! Determine whether a cap intersects with a projection discontinui ty.
virtual bool intersectViewportDiscontinuityInternal(const Vec3d& cap N, double capD) const = 0; virtual bool intersectViewportDiscontinuityInternal(const Vec3d& cap N, double capD) const = 0;
skipping to change at line 329 skipping to change at line 332
float zNear, oneOverZNearMinusZFar; // Near and far clipping planes float zNear, oneOverZNearMinusZFar; // Near and far clipping planes
Vec4i viewportXywh; // Viewport parameters Vec4i viewportXywh; // Viewport parameters
Vec2f viewportCenter; // Viewport center in screen pix el Vec2f viewportCenter; // Viewport center in screen pix el
Vec2f viewportCenterOffset; // Viewport center's offset in f ractions of screen width/height. Usable e.g. in cylindrical projection to m ove horizon down. Vec2f viewportCenterOffset; // Viewport center's offset in f ractions of screen width/height. Usable e.g. in cylindrical projection to m ove horizon down.
// Currently only Y shift is ful ly implemented, X shift likely not too meaningful. // Currently only Y shift is ful ly implemented, X shift likely not too meaningful.
float viewportFovDiameter; // diameter of the FOV disk in p ixel float viewportFovDiameter; // diameter of the FOV disk in p ixel
bool gravityLabels; // should label text align with the horizon? bool gravityLabels; // should label text align with the horizon?
float defaultAngleForGravityText; // a rotation angle to apply to gravity text (only if gravityLabels is set to false) float defaultAngleForGravityText; // a rotation angle to apply to gravity text (only if gravityLabels is set to false)
SphericalCap boundingCap; // Bounding cap of the whole vie wport SphericalCap boundingCap; // Bounding cap of the whole vie wport
float devicePixelsPerPixel; // The number of device pixel pe r "Device Independent Pixels" (value is usually 1, but 2 for mac retina scr eens) float devicePixelsPerPixel; // The number of device pixel pe r "Device Independent Pixels" (value is usually 1, but 2 for mac retina scr eens)
float widthStretch; // A factor to adapt to special installation setups, e.g. multi-projector with edge blending. Allow to stre tch/squeeze projected content. Larger than 1 means the image is stretched w ider.
private: private:
//! Initialise the StelProjector from a param instance. //! Initialise the StelProjector from a param instance.
void init(const StelProjectorParams& param); void init(const StelProjectorParams& param);
}; };
#endif // _STELPROJECTOR_HPP_ #endif // _STELPROJECTOR_HPP_
 End of changes. 4 change blocks. 
3 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/