StelProjector.hpp   StelProjector.hpp 
skipping to change at line 100 skipping to change at line 100
}; };
//! @struct StelProjectorParams //! @struct StelProjectorParams
//! Contains all the param needed to initialize a StelProjector //! Contains all the param needed to initialize a StelProjector
struct StelProjectorParams struct StelProjectorParams
{ {
StelProjectorParams() StelProjectorParams()
: viewportXywh(0, 0, 256, 256) : viewportXywh(0, 0, 256, 256)
, fov(60.f) , fov(60.f)
, gravityLabels(false) , gravityLabels(false)
, defautAngleForGravityText(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)
, viewportFovDiameter(0.f) , viewportFovDiameter(0.f)
, flipHorz(false) , flipHorz(false)
, flipVert(false) , flipVert(false)
, devicePixelsPerPixel(1.f) {;} , devicePixelsPerPixel(1.f) {;}
Vector4<int> viewportXywh; //! posX, posY, width, heigh Vector4<int> viewportXywh; //! posX, posY, width, heig
t ht
float fov; //! FOV in degrees float fov; //! FOV in degrees
bool gravityLabels; //! the flag to use gravity bool gravityLabels; //! the flag to use gravity
labels or not labels or not
float defautAngleForGravityText;//! a rotation angle to appl float defaultAngleForGravityText;//! a rotation angle to app
y to gravity text (only if gravityLabels is set to false) ly to gravity text (only if gravityLabels is set to false)
StelProjectorMaskType maskType; //! The current projector ma StelProjectorMaskType maskType; //! The current projector m
sk ask
float zNear, zFar; //! Near and far clipping pl float zNear, zFar; //! Near and far clipping p
anes lanes
Vec2f viewportCenter; //! Viewport center in scree Vec2f viewportCenter; //! Viewport center in scre
n pixel en pixel
float viewportFovDiameter; //! diameter of the FOV disk Vec2f viewportCenterOffset; //! Viewport center's offse
in pixel t in fractions of screen width/height. Usable e.g. in cylindrical projectio
bool flipHorz, flipVert; //! Whether to flip in horiz n to move horizon down.
ontal or vertical directions //! Currently only Y shift
float devicePixelsPerPixel; //! The number of device pix is fully implemented, X shift likely not too meaningful.
el per "Device Independent Pixels" (value is usually 1, but 2 for mac retin float viewportFovDiameter; //! diameter of the FOV dis
a screens) k in pixel
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)
}; };
//! 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 318 skipping to change at line 321
virtual void computeBoundingCap(); virtual void computeBoundingCap();
ModelViewTranformP modelViewTransform; // Operator to apply (if not NULL) before the modelview projection step ModelViewTranformP modelViewTransform; // Operator to apply (if not NULL) before the modelview projection step
float flipHorz,flipVert; // Whether to flip in horizontal or vertical directions float flipHorz,flipVert; // Whether to flip in horizontal or vertical directions
float pixelPerRad; // pixel per rad at the center o f the viewport disk float pixelPerRad; // pixel per rad at the center o f the viewport disk
StelProjectorMaskType maskType; // The current projector mask StelProjectorMaskType maskType; // The current projector mask
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.
// 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)
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);
}; };
 End of changes. 4 change blocks. 
21 lines changed or deleted 32 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/