StelApp.hpp   StelApp.hpp 
skipping to change at line 25 skipping to change at line 25
* 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 _STELAPP_HPP_ #ifndef _STELAPP_HPP_
#define _STELAPP_HPP_ #define _STELAPP_HPP_
#include <QString> #include <QString>
#include <QObject> #include <QObject>
#include "StelModule.hpp"
// Predeclaration of some classes // Predeclaration of some classes
class StelCore; class StelCore;
class StelTextureMgr; class StelTextureMgr;
class StelObjectMgr; class StelObjectMgr;
class StelLocaleMgr; class StelLocaleMgr;
class StelModuleMgr; class StelModuleMgr;
class StelSkyCultureMgr; class StelSkyCultureMgr;
class StelViewportEffect; class StelViewportEffect;
class QOpenGLFramebufferObject; class QOpenGLFramebufferObject;
skipping to change at line 50 skipping to change at line 51
class StelSkyLayerMgr; class StelSkyLayerMgr;
class StelAudioMgr; class StelAudioMgr;
class StelVideoMgr; class StelVideoMgr;
class StelGuiBase; class StelGuiBase;
class StelMainScriptAPIProxy; class StelMainScriptAPIProxy;
class StelScriptMgr; class StelScriptMgr;
class StelActionMgr; class StelActionMgr;
class StelPropertyMgr; class StelPropertyMgr;
class StelProgressController; class StelProgressController;
#ifdef ENABLE_SPOUT
class SpoutSender;
#endif
//! @class StelApp //! @class StelApp
//! Singleton main Stellarium application class. //! Singleton main Stellarium application class.
//! This is the central class of Stellarium. Only one singleton instance o f //! This is the central class of Stellarium. Only one singleton instance o f
//! this class is created and can be accessed from anywhere else. This cla ss //! this class is created and can be accessed from anywhere else. This cla ss
//! is the access point to several "Manager" class which provide applicatio n-wide //! is the access point to several "Manager" class which provide applicatio n-wide
//! services for managment of font, textures, localization, sky culture, an d in //! services for managment of font, textures, localization, sky culture, an d in
//! theory all other services used by the other part of the program. //! theory all other services used by the other part of the program.
//! //!
//! The StelApp class is also the one managing the StelModule in a generic manner //! The StelApp class is also the one managing the StelModule in a generic manner
//! by calling their update, drawing and other methods when needed. //! by calling their update, drawing and other methods when needed.
skipping to change at line 178 skipping to change at line 183
//! computer screen with 96 pixel per inch (reference for tuning siz es). //! computer screen with 96 pixel per inch (reference for tuning siz es).
float getGlobalScalingRatio() const {return globalScalingRatio;} float getGlobalScalingRatio() const {return globalScalingRatio;}
void setGlobalScalingRatio(float r) {globalScalingRatio=r;} void setGlobalScalingRatio(float r) {globalScalingRatio=r;}
//! Get the size of font //! Get the size of font
int getBaseFontSize() const { return baseFontSize; } int getBaseFontSize() const { return baseFontSize; }
void setBaseFontSize(int s) { baseFontSize=s; } void setBaseFontSize(int s) { baseFontSize=s; }
//! Get the GUI instance implementing the abstract GUI interface. //! Get the GUI instance implementing the abstract GUI interface.
StelGuiBase* getGui() const {return stelGui;} StelGuiBase* getGui() const {return stelGui;}
//! Tell the StelApp instance which GUI si currently being used. //! Tell the StelApp instance which GUI is currently being used.
//! The caller is responsible for destroying the GUI. //! The caller is responsible for destroying the GUI.
void setGui(StelGuiBase* b) {stelGui=b;} void setGui(StelGuiBase* b) {stelGui=b;}
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
//! Get the script API proxy (for signal handling) //! Get the script API proxy (for signal handling)
StelMainScriptAPIProxy* getMainScriptAPIProxy() {return scriptAPIPro xy;} StelMainScriptAPIProxy* getMainScriptAPIProxy() {return scriptAPIPro xy;}
//! Get the script manager //! Get the script manager
StelScriptMgr& getScriptMgr() {return *scriptMgr;} StelScriptMgr& getScriptMgr() {return *scriptMgr;}
#endif #endif
skipping to change at line 204 skipping to change at line 209
//! The StelApp instance remains the owner of the controller. //! The StelApp instance remains the owner of the controller.
StelProgressController* addProgressBar(); StelProgressController* addProgressBar();
void removeProgressBar(StelProgressController* p); void removeProgressBar(StelProgressController* p);
//! Define the type of viewport effect to use //! Define the type of viewport effect to use
//! @param effectName must be one of 'none', 'framebufferOnly', 'sph ericMirrorDistorter' //! @param effectName must be one of 'none', 'framebufferOnly', 'sph ericMirrorDistorter'
void setViewportEffect(const QString& effectName); void setViewportEffect(const QString& effectName);
//! Get the type of viewport effect currently used //! Get the type of viewport effect currently used
QString getViewportEffect() const; QString getViewportEffect() const;
//! Dump diagnostics about action call priorities
void dumpModuleActionPriorities(StelModule::StelModuleActionName act
ionName);
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Scriptable methods // Scriptable methods
public slots: public slots:
//! Set flag for activating night vision mode. //! Set flag for activating night vision mode.
void setVisionModeNight(bool); void setVisionModeNight(bool);
//! Get flag for activating night vision mode. //! Get flag for activating night vision mode.
bool getVisionModeNight() const {return flagNightVision;} bool getVisionModeNight() const {return flagNightVision;}
//! Set flag for showing decimal degree in various places. //! Set flag for showing decimal degree in various places.
skipping to change at line 271 skipping to change at line 279
void handleClick(class QMouseEvent* event); void handleClick(class QMouseEvent* event);
//! Handle mouse wheel. //! Handle mouse wheel.
void handleWheel(class QWheelEvent* event); void handleWheel(class QWheelEvent* event);
//! Handle mouse move. //! Handle mouse move.
void handleMove(float x, float y, Qt::MouseButtons b); void handleMove(float x, float y, Qt::MouseButtons b);
//! Handle key press and release. //! Handle key press and release.
void handleKeys(class QKeyEvent* event); void handleKeys(class QKeyEvent* event);
//! Handle pinch on multi touch devices. //! Handle pinch on multi touch devices.
void handlePinch(qreal scale, bool started); void handlePinch(qreal scale, bool started);
//! Used internally to set the viewport effects.
void prepareRenderBuffer(); void prepareRenderBuffer();
void applyRenderBuffer(); //! Used internally to set the viewport effects.
//! @param drawFbo the OpenGL fbo we need to render into.
void applyRenderBuffer(int drawFbo=0);
// The StelApp singleton // The StelApp singleton
static StelApp* singleton; static StelApp* singleton;
// The associated StelCore instance // The associated StelCore instance
StelCore* core; StelCore* core;
// Module manager for the application // Module manager for the application
StelModuleMgr* moduleMgr; StelModuleMgr* moduleMgr;
skipping to change at line 383 skipping to change at line 394
int baseFontSize; int baseFontSize;
// Framebuffer object used for viewport effects. // Framebuffer object used for viewport effects.
QOpenGLFramebufferObject* renderBuffer; QOpenGLFramebufferObject* renderBuffer;
StelViewportEffect* viewportEffect; StelViewportEffect* viewportEffect;
bool flagShowDecimalDegrees; bool flagShowDecimalDegrees;
// flag to indicate we want calculate azimuth from south towards wes t (as in old astronomical literature) // flag to indicate we want calculate azimuth from south towards wes t (as in old astronomical literature)
bool flagUseAzimuthFromSouth; bool flagUseAzimuthFromSouth;
#ifdef ENABLE_SPOUT
SpoutSender* spoutSender;
#endif
}; };
#endif // _STELAPP_HPP_ #endif // _STELAPP_HPP_
 End of changes. 7 change blocks. 
2 lines changed or deleted 17 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/