StelProjector.hpp   StelProjector.hpp 
skipping to change at line 52 skipping to change at line 52
enum StelProjectorMaskType enum StelProjectorMaskType
{ {
MaskNone, //!< Regular - no mask. MaskNone, //!< Regular - no mask.
MaskDisk //!< For disk viewport mode (circular mask t o seem like bins/telescope) MaskDisk //!< For disk viewport mode (circular mask t o seem like bins/telescope)
}; };
//! @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() : viewportXywh(0, 0, 256, 256), fov(60 .f), gravityLabels(false), maskType(MaskNone), viewportCenter(128.f, 128.f) , flipHorz(false), flipVert(false) {;} StelProjectorParams() : viewportXywh(0, 0, 256, 256), fov(60 .f), gravityLabels(false), defautAngleForGravityText(0.f), maskType(MaskNon e), viewportCenter(128.f, 128.f), flipHorz(false), flipVert(false) {;}
Vector4<int> viewportXywh; //! posX, posY, width, heigh t Vector4<int> viewportXywh; //! posX, posY, width, heigh t
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 defautAngleForGravityText;//! a rotation angle to appl y to gravity text (only if gravityLabels is set to false)
StelProjectorMaskType maskType; //! The current projector ma sk StelProjectorMaskType maskType; //! The current projector ma sk
float zNear, zFar; //! Near and far clipping pl anes float zNear, zFar; //! Near and far clipping pl anes
Vec2f viewportCenter; //! Viewport center in scree n pixel Vec2f viewportCenter; //! Viewport center in scree n pixel
float viewportFovDiameter; //! diameter of the FOV disk in pixel float viewportFovDiameter; //! diameter of the FOV disk in pixel
bool flipHorz, flipVert; //! Whether to flip in horiz ontal or vertical directions bool flipHorz, flipVert; //! Whether to flip in horiz ontal or vertical directions
}; };
//! Destructor //! Destructor
virtual ~StelProjector() {;} virtual ~StelProjector() {;}
skipping to change at line 340 skipping to change at line 341
Mat4d modelViewMatrix; // openGL MODELVIEW Matr ix Mat4d modelViewMatrix; // openGL MODELVIEW Matr ix
Mat4f modelViewMatrixf; // openGL MODELVIEW Matrix Mat4f modelViewMatrixf; // openGL MODELVIEW Matrix
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
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 defautAngleForGravityText; // 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
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. 3 change blocks. 
1 lines changed or deleted 3 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/