StelSkyImageTile.hpp   StelSkyImageTile.hpp 
skipping to change at line 22 skipping to change at line 22
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _STELSKYIMAGETILE_HPP_ #ifndef _STELSKYIMAGETILE_HPP_
#define _STELSKYIMAGETILE_HPP_ #define _STELSKYIMAGETILE_HPP_
#include <QTimeLine>
#include "MultiLevelJsonBase.hpp" #include "MultiLevelJsonBase.hpp"
#include "StelSphereGeometry.hpp" #include "StelSphereGeometry.hpp"
#include "StelTextureTypes.hpp"
#include <QTimeLine>
//#define DEBUG_STELSKYIMAGE_TILE 1 //#define DEBUG_STELSKYIMAGE_TILE 1
class QIODevice; class QIODevice;
class StelCore; class StelCore;
class StelPainter;
//! Contain all the credits for a given server hosting the data //! Contain all the credits for a given server hosting the data
class ServerCredits class ServerCredits
{ {
public: public:
//! Very short credit to display in the loading bar //! Very short credit to display in the loading bar
QString shortCredits; QString shortCredits;
//! Full credits //! Full credits
QString fullCredits; QString fullCredits;
skipping to change at line 80 skipping to change at line 82
//! Constructor //! Constructor
StelSkyImageTile(const QString& url, StelSkyImageTile* parent=NULL); StelSkyImageTile(const QString& url, StelSkyImageTile* parent=NULL);
//! Constructor //! Constructor
StelSkyImageTile(const QVariantMap& map, StelSkyImageTile* parent); StelSkyImageTile(const QVariantMap& map, StelSkyImageTile* parent);
//! Destructor //! Destructor
~StelSkyImageTile(); ~StelSkyImageTile();
//! Draw the image on the screen. //! Draw the image on the screen.
void draw(StelCore* core, class StelRenderer* renderer, StelProjecto rP projector, float opacity=1.); void draw(StelCore* core, StelPainter& sPainter, float opacity=1.);
//! Return the dataset credits to use in the progress bar //! Return the dataset credits to use in the progress bar
DataSetCredits getDataSetCredits() const {return dataSetCredits;} DataSetCredits getDataSetCredits() const {return dataSetCredits;}
//! Return the server credits to use in the progress bar //! Return the server credits to use in the progress bar
ServerCredits getServerCredits() const {return serverCredits;} ServerCredits getServerCredits() const {return serverCredits;}
//! Return true if the tile is fully loaded and can be displayed //! Return true if the tile is fully loaded and can be displayed
bool isReadyToDisplay() const; bool isReadyToDisplay() const;
skipping to change at line 128 skipping to change at line 130
//! Whether the texture must be blended //! Whether the texture must be blended
bool alphaBlend; bool alphaBlend;
//! True if the tile is just a list of other tiles without texture f or itself //! True if the tile is just a list of other tiles without texture f or itself
bool noTexture; bool noTexture;
//! list of all the polygons. //! list of all the polygons.
QList<SphericalRegionP> skyConvexPolygons; QList<SphericalRegionP> skyConvexPolygons;
//! The texture of the tile //! The texture of the tile
class StelTextureNew* tex; StelTextureSP tex;
//! Minimum resolution of the data of the texture in degree/pixel //! Minimum resolution of the data of the texture in degree/pixel
float minResolution; float minResolution;
private: private:
//! init the StelSkyImageTile //! init the StelSkyImageTile
void initCtor(); void initCtor();
//! Return the list of tiles which should be drawn. //! Return the list of tiles which should be drawn.
//! @param result a map containing resolution, pointer to the tiles //! @param result a map containing resolution, pointer to the tiles
void getTilesToDraw(QMultiMap<double, StelSkyImageTile*>& result, void getTilesToDraw(QMultiMap<double, StelSkyImageTile*>& result, St
StelCore* core, elCore* core, const SphericalRegionP& viewPortPoly, float limitLuminance, b
StelRenderer* renderer, ool recheckIntersect=true);
const SphericalRegionP& viewPortPoly,
float limitLuminance,
bool recheckIntersect=true);
//! Draw the image on the screen. //! Draw the image on the screen.
//! @return true if the tile was actually displayed //! @return true if the tile was actually displayed
bool drawTile(StelCore* core, StelRenderer* renderer, StelProjectorP projector); bool drawTile(StelCore* core, StelPainter& sPainter);
//! Return the minimum resolution //! Return the minimum resolution
double getMinResolution() const {return minResolution;} double getMinResolution() const {return minResolution;}
//! The list of all the subTiles URL or already loaded JSON map for this tile //! The list of all the subTiles URL or already loaded JSON map for this tile
QVariantList subTilesUrls; QVariantList subTilesUrls;
// Used for smooth fade in // Used for smooth fade in
QTimeLine* texFader; QTimeLine* texFader;
 End of changes. 7 change blocks. 
11 lines changed or deleted 10 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/