Commit Graph

2877 Commits

Author SHA1 Message Date
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
Alexander Bock f7502de92f Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 22:06:58 +02:00
Kalle Bladin dd70733c2a Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable. 2016-06-17 15:52:32 -04:00
Alexander Bock c3eda5e4e6 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 21:37:43 +02:00
Kalle Bladin 153d239790 Catch exceptions when not able to read a GDAL dataset. 2016-06-17 13:07:15 -04:00
Alexander Bock da0190ae1c Remove default-performance measurements from default scene 2016-06-17 18:31:51 +02:00
Alexander Bock 82f97943c5 Use correct histograms for ENLIL 2016-06-17 18:31:39 +02:00
Alexander Bock 8bf06cdff2 Set fieldlines scene to the correct time of January 1st, 2015 2016-06-17 18:30:56 +02:00
Alexander Bock 0cefde84d2 Fix shader compile error for inside volume raycasting 2016-06-17 18:30:39 +02:00
Alexander Bock c587b5cdb9 Fix tabs 2016-06-17 18:30:12 +02:00
Alexander Bock 190bd4726f Add performance measurements to ABufferRenderer 2016-06-17 18:30:01 +02:00
Alexander Bock a4b0d36048 Reenable up-vector definition in RenderableModelProjection 2016-06-17 17:00:45 +02:00
Alexander Bock 9282d7e66b Remove warnings from missing 'Atmosphere' definitions for Jupiter and its moons 2016-06-17 17:00:30 +02:00
Kalle Bladin 1f08bb413c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-17 10:52:58 -04:00
Kalle Bladin 101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Alexander Bock 4e240ddb19 Add 'atmosphereearth' scene node 2016-06-17 16:50:00 +02:00
Alexander Bock e1460575f5 Reenable up-vector definition in RenderablePlanetProjection 2016-06-17 16:49:04 +02:00
Alexander Bock e5662df36d Remove warnings from missing 'Atmosphere' definitions for Pluto moons 2016-06-17 16:48:34 +02:00
Alexander Bock 87bf04c1da Merge branch 'develop' into release/ips 2016-06-17 15:46:59 +02:00
Alexander Bock 5c8bd32ae5 Merge branch 'feature/globebrowsing' into release/ips 2016-06-17 15:46:46 +02:00
Alexander Bock 0a6bff628b Remove atmosphere from default earth for now 2016-06-17 15:46:38 +02:00
Alexander Bock c328feb663 Reset default.scene 2016-06-17 15:34:08 +02:00
Alexander Bock 86dce766ad Correctly align Earth trail relative to SSB instead of Earth barycenter 2016-06-17 15:23:46 +02:00