StelCore.hpp   StelCore.hpp 
skipping to change at line 53 skipping to change at line 53
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(ProjectionType); Q_ENUMS(ProjectionType);
public: public:
//! @enum FrameType //! @enum FrameType
//! Supported reference frame types //! Supported reference frame types
enum FrameType enum FrameType
{ {
FrameAltAz, //!< Altazimuthal reference fr ame centered on observer. FrameAltAz, //!< Altazimuthal reference fr ame centered on observer.
FrameHeliocentricEcliptic, //!< Ecliptic reference frame centered on the Sun FrameHeliocentricEcliptic, //!< Ecliptic reference frame centered on the Sun
FrameObservercentricEcliptic, //!< Ecliptic reference frame centered on the Observer FrameObservercentricEcliptic, //!< Ecliptic reference frame centered on the Observer
FrameEquinoxEqu, //!< Equatorial reference fram FrameEquinoxEqu, //!< Equatorial reference fram
e at the current equinox centered on the observer. The north pole follow th e at the current equinox centered on the observer.
e precession of the planet on which the observer is located. //
FrameJ2000 //!< Equatorial reference fram ! The north pole follows the precession of the planet on which the observer
e at the J2000 equinox centered on the observer. This is also the ICRS refe is located.
rence frame. FrameJ2000, //!< Equatorial reference fram
e at the J2000 equinox centered on the observer.
//
! This is also the ICRS reference frame.
FrameGalactic //! Galactic reference frame c
entered on observer.
}; };
//! Available projection types. A value of 1000 indicate the default projection //! Available projection types. A value of 1000 indicate the default projection
enum ProjectionType enum ProjectionType
{ {
ProjectionPerspective, //!< Perspective projection ProjectionPerspective, //!< Perspective projection
ProjectionEqualArea, //!< Equal Area projection ProjectionEqualArea, //!< Equal Area projection
ProjectionStereographic, //!< Stereograhic projection ProjectionStereographic, //!< Stereograhic projection
ProjectionFisheye, //!< Fisheye projection ProjectionFisheye, //!< Fisheye projection
ProjectionHammer, //!< Hammer-Aitoff projection ProjectionHammer, //!< Hammer-Aitoff projection
ProjectionCylinder, //!< Cylinder projection ProjectionCylinder, //!< Cylinder projection
ProjectionMercator, //!< Mercator projection ProjectionMercator, //!< Mercator projection
ProjectionOrthographic //!< Orthographic projection ProjectionOrthographic //!< Orthographic projection
}; };
StelCore(); StelCore();
virtual ~StelCore(); virtual ~StelCore();
//! Init and load all main core components. //! Init and load all main core components.
void init(); void init();
//! Update all the objects with respect to the time. //! Update all the objects with respect to the time.
//! @param deltaTime the time increment in sec. //! @param deltaTime the time increment in sec.
void update(double deltaTime); void update(double deltaTime);
//! Handle the resizing of the window //! Handle the resizing of the window
void windowHasBeenResized(int width,int height); void windowHasBeenResized(float x, float y, float width, float heigh t);
//! Update core state before drawing modules. //! Update core state before drawing modules.
void preDraw(); void preDraw();
//! Update core state after drawing modules. //! Update core state after drawing modules.
void postDraw(); void postDraw();
//! Get a new instance of a simple 2d projection. This projection ca nnot be used to project or unproject but //! Get a new instance of a simple 2d projection. This projection ca nnot be used to project or unproject but
//! only for 2d painting //! only for 2d painting
const StelProjectorP getProjection2d() const; StelProjectorP getProjection2d() const;
//! Get a new instance of projector using the current display parame ters from Navigation, StelMovementMgr, etc... //! Get a new instance of projector using the current display parame ters from Navigation, StelMovementMgr, etc...
//! If not specified the projection type is the default one set in t he core. //! If not specified the projection type is the default one set in t he core.
//! This is a smart pointer, you don't need to delete it. //! This is a smart pointer, you don't need to delete it.
const StelProjectorP getProjection(FrameType frameType, ProjectionTy pe projType=(ProjectionType)1000) const; StelProjectorP getProjection(FrameType frameType, ProjectionType pro jType=(ProjectionType)1000) const;
//! Get an instance of projector using the current display parameter s from Navigation, StelMovementMgr //! Get an instance of projector using the current display parameter s from Navigation, StelMovementMgr
//! and using the given modelview matrix. //! and using the given modelview matrix.
//! If not specified default the projection type is the default one set in the core. //! If not specified default the projection type is the default one set in the core.
const StelProjectorP getProjection(const Mat4d& modelViewMat, Projec tionType projType=(ProjectionType)1000) const; StelProjectorP getProjection(const Mat4d& modelViewMat, ProjectionTy pe projType=(ProjectionType)1000) const;
//! Get the current navigation (manages frame transformation) used i n the core. //! Get the current navigation (manages frame transformation) used i n the core.
StelNavigator* getNavigator() {return navigation;} StelNavigator* getNavigator() {return navigation;}
//! Get the current navigation (manages frame transformation) used i n the core. //! Get the current navigation (manages frame transformation) used i n the core.
const StelNavigator* getNavigator() const {return navigation;} const StelNavigator* getNavigator() const {return navigation;}
//! Get the current tone reproducer used in the core. //! Get the current tone reproducer used in the core.
StelToneReproducer* getToneReproducer() {return toneConverter;} StelToneReproducer* getToneReproducer() {return toneConverter;}
//! Get the current tone reproducer used in the core. //! Get the current tone reproducer used in the core.
const StelToneReproducer* getToneReproducer() const {return toneConv erter;} const StelToneReproducer* getToneReproducer() const {return toneConv erter;}
skipping to change at line 147 skipping to change at line 150
QString projectionNameI18nToTypeKey(const QString& nameI18n) const; QString projectionNameI18nToTypeKey(const QString& nameI18n) const;
//! Get the current set of parameters to use when creating a new Ste lProjector. //! Get the current set of parameters to use when creating a new Ste lProjector.
StelProjector::StelProjectorParams getCurrentStelProjectorParams() c onst {return currentProjectorParams;} StelProjector::StelProjectorParams getCurrentStelProjectorParams() c onst {return currentProjectorParams;}
//! Set the set of parameters to use when creating a new StelProject or. //! Set the set of parameters to use when creating a new StelProject or.
void setCurrentStelProjectorParams(const StelProjector::StelProjecto rParams& newParams) {currentProjectorParams=newParams;} void setCurrentStelProjectorParams(const StelProjector::StelProjecto rParams& newParams) {currentProjectorParams=newParams;}
public slots: public slots:
//! Set the current ProjectionType to use //! Set the current ProjectionType to use
void setCurrentProjectionType(ProjectionType type) {currentProjectio nType=type;} void setCurrentProjectionType(ProjectionType type) {currentProjectio nType=type;}
ProjectionType getCurrentProjectionType() const {return currentProje ctionType;}
//! Get the current Mapping used by the Projection //! Get the current Mapping used by the Projection
QString getCurrentProjectionTypeKey(void) const; QString getCurrentProjectionTypeKey(void) const;
//! Set the current ProjectionType to use from its key //! Set the current ProjectionType to use from its key
void setCurrentProjectionTypeKey(QString type); void setCurrentProjectionTypeKey(QString type);
//! Get the list of all the available projections //! Get the list of all the available projections
QStringList getAllProjectionTypeKeys() const; QStringList getAllProjectionTypeKeys() const;
//! Set the mask type. //! Set the mask type.
 End of changes. 8 change blocks. 
12 lines changed or deleted 18 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/