StelProjector.hpp   StelProjector.hpp 
skipping to change at line 48 skipping to change at line 48
{ {
public: public:
friend class StelPainter; friend class StelPainter;
friend class StelCore; friend class StelCore;
class ModelViewTranform; class ModelViewTranform;
//! @typedef ModelViewTranformP //! @typedef ModelViewTranformP
//! Shared pointer on a ModelViewTranform instance (implement refere nce counting) //! Shared pointer on a ModelViewTranform instance (implement refere nce counting)
typedef QSharedPointer<ModelViewTranform> ModelViewTranformP; typedef QSharedPointer<ModelViewTranform> ModelViewTranformP;
//! @class PreModelViewFunc //! @class ModelViewTranform
//! Allows to define non linear operations in addition to the standa rd linear (Matrix 4d) ModelView transformation. //! Allows to define non linear operations in addition to the standa rd linear (Matrix 4d) ModelView transformation.
class ModelViewTranform class ModelViewTranform
{ {
public: public:
ModelViewTranform() {;} ModelViewTranform() {;}
virtual ~ModelViewTranform() {;} virtual ~ModelViewTranform() {;}
virtual void forward(Vec3d&) const =0; virtual void forward(Vec3d&) const =0;
virtual void backward(Vec3d&) const =0; virtual void backward(Vec3d&) const =0;
virtual void forward(Vec3f&) const =0; virtual void forward(Vec3f&) const =0;
virtual void backward(Vec3f&) const =0; virtual void backward(Vec3f&) const =0;
skipping to change at line 294 skipping to change at line 294
StelProjector(ModelViewTranformP amodelViewTransform) StelProjector(ModelViewTranformP amodelViewTransform)
: 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),
defautAngleForGravityText(0.f), defaultAngleForGravityText(0.f),
devicePixelsPerPixel(1.f) {;} devicePixelsPerPixel(1.f) {;}
//! 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.
skipping to change at line 320 skipping to change at line 320
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
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) 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);
}; };
#endif // _STELPROJECTOR_HPP_ #endif // _STELPROJECTOR_HPP_
 End of changes. 3 change blocks. 
3 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/