mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-01 09:08:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source
This commit is contained in:
Alexander Bock
2017-11-09 22:49:07 -06:00
committed by GitHub
parent 0015cbb6f6 afa1d6d33e
commit 7e4bb0b2c6
246 changed files with 4256 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/openspace/engine/wrapper/windowwrapper.h
View File

@@ -125,7 +125,7 @@ public:
* is <code>1</code> if mouse button <code>i</code> is pressed down;
* <code>false</code> otherwise. On default, this method returns that none of the
* buttons is pressed.
* \param maxNumber The maximum number of mouse buttons that should be queried
* \param maxNumber The maximum number of mouse buttons that should be queried
* \return A bitmask showing the status of all mouse buttons (up to \p maxNumber)
*/
virtual uint32_t mouseButtons(int maxNumber = 8) const;
@@ -201,8 +201,9 @@ public:
virtual bool isUsingSwapGroups() const;
/**
* Returns <code>true</code> if the current rendering window is master of the swap its group.
*/
* Returns <code>true</code> if the current rendering window is master of the swap its
* group.
*/
virtual bool isSwapGroupMaster() const;
/**