FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'next' of git://gitorious.org/fg/simgear into next

Browse Source
This commit is contained in:
Erik Hofman 2011-11-20 19:08:04 +01:00
commit 0a08ee836c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/structure/subsystem_mgr.hxx
View File

@ -353,9 +353,10 @@ public:
enum GroupType { enum GroupType {
INIT = 0, INIT = 0,
GENERAL, GENERAL,
FDM, ///< flight model, autopilot, instruments that run coupled FDM, ///< flight model, autopilot, instruments that run coupled
POST_FDM, ///< certain subsystems depend on FDM data POST_FDM, ///< certain subsystems depend on FDM data
DISPLAY, ///< view, camera, rendering updates DISPLAY, ///< view, camera, rendering updates
SOUND/*I want to be last!*/, ///< needs to run AFTER display, to allow concurrent GPU/sound processing
MAX_GROUPS MAX_GROUPS
}; };
@ -392,7 +393,6 @@ public:
void setReportTimingCb(void* userData,SGSubsystemTimingCb cb) {reportTimingCb = cb;reportTimingUserData = userData;} void setReportTimingCb(void* userData,SGSubsystemTimingCb cb) {reportTimingCb = cb;reportTimingUserData = userData;}
private: private:
SGSubsystemGroup* _groups[MAX_GROUPS]; SGSubsystemGroup* _groups[MAX_GROUPS];
typedef std::map<std::string, SGSubsystem*> SubsystemDict; typedef std::map<std::string, SGSubsystem*> SubsystemDict;