Commit Graph

2899 Commits

Author SHA1 Message Date
Matthew Territo da203364ba Rollback pointer changes to _synchronizationBuffer.
Was causing segfault on mutex locks during launch.
2016-07-06 12:02:01 -06:00
Alexander Bock c9ac04d3cd Remove sgct inclusion from SyncBuffer header and move to the source file
Fix serialization of MatrixProperty
2016-07-06 17:52:16 +02:00
Matthew Territo fb39949daf _downloadManager.reset() on deconstructor, not .release()
Whoops. That's that I meant to do. Ah, brain: you are soooooo reliable.
2016-07-05 16:42:50 -06:00
Matthew Territo b96b1d8a84 Updated Launcher sync widget to work with newly un-singleton-ed DownloadManager.
Created new member "_downloadManager" to take old "DlManager's" place.
2016-07-05 16:36:06 -06:00
Alexander Bock 2434972ca8 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-07-03 14:35:31 +02:00
Alexander Bock 20d0fb8474 Fix error in Dictionary construction for ScreenSpaceRenderable
Do not access the std::future for cases where a download is not necessary
2016-07-03 14:34:17 +02:00
Alexander Bock 5502c52b9a Adapt Rosetta and New Horizons keybindings to restructuring of ProjectionComponent 2016-07-01 15:22:21 +02:00
Alexander Bock e40d393824 Make the DownloadManager not a singleton (closing #43) 2016-06-30 00:43:03 +02:00
Alexander Bock 5de58e2d31 Remove the square image plane from Rosetta 2016-06-30 00:29:04 +02:00
Alexander Bock 7267aacea2 Do not retroactively project images when time passes with disable projections 2016-06-30 00:20:39 +02:00
Alexander Bock 6f05ed3b98 Make ProjectionComponent an actual component rather than using inheritance 2016-06-29 23:27:01 +02:00
Alexander Bock 5a5ffd76bb Add InteractionHandler to global property gui
Add property to interactionhandler to enable/disable rotational and zoom friction
2016-06-29 22:42:12 +02:00
Alexander Bock 2f9b873f1c Group properties in the Gui based on the group identifier 2016-06-29 19:45:45 +02:00
Alexander Bock 443a0121b1 Merge branch 'feature/gui-cleanup' of https://github.com/OpenSpace/OpenSpace-Development into feature/gui-cleanup 2016-06-29 17:47:13 +02:00
Alexander Bock a56ce8d3f5 Clang compile fixes 2016-06-29 16:40:20 +02:00
Alexander Bock 9652e64fd3 Minor cleanup 2016-06-29 14:37:19 +02:00
Alexander Bock cfd16dd35d Represent SelectionProperty by Tree instead of collapsible header 2016-06-29 13:51:53 +02:00
Alexander Bock 14caa033ce Do not show empty PropertyOwners in PropertyList 2016-06-29 13:49:40 +02:00
Alexander Bock c998a856ea Show tooltips with fully qualified ids in Gui 2016-06-29 13:47:48 +02:00
Alexander Bock 9201cd027b Organize Property%s by PropertyOwner 2016-06-29 13:44:19 +02:00
Alexander Bock 9cd751ada1 Fix min/max values for int, float, and vector properties 2016-06-29 13:23:20 +02:00
Alexander Bock 3a0a1b97d1 Update color for headers 2016-06-29 00:40:13 +02:00
Alexander Bock cf80788067 More cleanup of Gui code
Added IswaGroup properties to the iSWA properties list
Enable sorting the performance measurements by total time
2016-06-28 19:22:50 +02:00
Alexander Bock 3417f45805 Making different Property windows not appear in the same ImGui window 2016-06-28 15:10:45 +02:00
Alexander Bock 9fb7814145 Add visibility toggle to Property base class
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock 90d9f09909 Make PerformanceManager not crash if performance measurements are requested multiple times 2016-06-27 15:02:40 +02:00
Alexander Bock 824da2199f Include file cleanup 2016-06-27 15:02:21 +02:00
Alexander Bock a25eb0f690 Clean up single.xml
Update Ghoul repository
2016-06-27 15:01:43 +02:00
Alexander Bock 438e34b272 Enable feature to limit the GUI, console, and Log output to a single window in a multi-window setup 2016-06-27 02:11:49 +02:00
Alexander Bock d15f8f3ba8 Do not show collapsing header if only one owner is present 2016-06-27 01:26:32 +02:00
Alexander Bock a7f556a9c4 Add new font for the OnScreen GUI
Cleanup of GUI shader code
Make copy/paste work in Onscreen GUI
2016-06-27 01:13:28 +02:00
Alexander Bock 41ef7c1b55 Add methods to check for KeyActions and KeyModifiers 2016-06-27 01:12:00 +02:00
Alexander Bock 2550346835 Move GUI Lua functions into their own file 2016-06-26 16:35:48 +02:00
Alexander Bock 4ce4321847 More cleanup of Gui code
Setting a new color layout
2016-06-26 16:35:29 +02:00
Alexander Bock 5b2c484da9 Merge branch 'master' into feature/gui-cleanup 2016-06-26 11:15:55 +02:00
Alexander Bock 8886eeec9d Compile fix for when globebrowsing is not available 2016-06-26 03:38:42 +02:00
Alexander Bock f457eb6cc2 Merge branch 'master' into feature/gui-cleanup 2016-06-25 18:26:18 +02:00
Alexander Bock 74ff3eddbd Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-06-24 10:56:57 +02:00
Alexander Bock 9705c33c16 Disable default module setting for galaxy, globebrowsing, and multiresvolume
Update Ghoul repository
2016-06-24 10:55:49 +02:00
wundahlful b32262390c Updated Ghoul version for cppformat changes 2016-06-23 16:00:26 -06:00
wundahlful 4954dda561 Updating deprecated cppformat/format.h to fmt/format.h
The warning in cppformat's version throws a fatal error in the VS compiler
2016-06-23 15:32:10 -06:00
Alexander Bock bf8d365017 Started cleanup of OnScreenGui code 2016-06-22 16:55:44 +02:00
Alexander Bock debe475647 Updating to newest Ghoul version
Reenabling default.scene as the default scene
releases/v0.3.4
2016-06-22 15:30:16 +02:00
Alexander Bock 5cc5f52abd Merge branch 'develop' into release/ips
# Conflicts:
#	ext/ghoul
2016-06-22 10:01:48 +02:00
Alexander Bock c913979d6f Add Resolution tag to the single file, enforcing a smaller framebuffer resolution on Mac systems 2016-06-22 10:00:27 +02:00
Alexander Bock 37e18441dc Support GDAL on non-Windows platforms
Fix compile fix with TileProviderManager
Fix projection error on PlanetProjection
2016-06-22 08:51:58 +02:00
Alexander Bock c3b3e1107e Updated Ghoul version 2016-06-22 08:28:01 +02:00
Alexander Bock 342ed2f161 Let Downloadmanager use new thread methods 2016-06-22 08:27:24 +02:00
Alexander Bock e671a59ede Merge branch 'develop' into release/ips 2016-06-21 14:24:53 +02:00
Alexander Bock 3775bbe6b1 Always write values to the projected texture even when normal-test fails (closing #103) 2016-06-21 14:24:23 +02:00