Commit Graph

877 Commits

Author SHA1 Message Date
Alexander Bock
6d8a16f19e Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119)
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120)
 - ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
 - The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Alexander Bock
dc32dfe075 Added functionality to print all keybindings to file when a scene is loaded 2016-07-14 00:28:09 -04:00
Alexander Bock
94a46813fe Add to_string methods to Key, KeyModifier, and KeyWithModifier 2016-07-14 00:27:03 -04:00
Alexander Bock
e3a1b775fd Correctly rollback the previous rollback 2016-07-07 13:49:57 +02:00
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
Alexander Bock
e40d393824 Make the DownloadManager not a singleton (closing #43) 2016-06-30 00:43:03 +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
a56ce8d3f5 Clang compile fixes 2016-06-29 16:40:20 +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
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
41ef7c1b55 Add methods to check for KeyActions and KeyModifiers 2016-06-27 01:12:00 +02:00
Alexander Bock
8886eeec9d Compile fix for when globebrowsing is not available 2016-06-26 03:38:42 +02:00
Alexander Bock
f2347a5f56 Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-17 11:31:33 +02:00
Alexander Bock
3d4e1ec19c Merge branch 'develop' into release/ips
Conflicts:
	tests/main.cpp
2016-06-17 11:31:11 +02:00
Alexander Bock
b416f9fba2 Fix linking error in ScalarProperty with wchar_t 2016-06-17 11:28:32 +02:00
Matthew Territo
5925bd9c63 Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp 2016-06-16 17:03:48 +02:00
Alexander Bock
ad1893fd6f Cleanup of ScreenSpaceRenderable
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Alexander Bock
5cc278c97f Add ModelMatrix retrieval to WindowWrapper 2016-06-16 00:57:31 +02:00
Gene Payne
d5ddaf84b8 Working on global settings integrated in gui but no functionality yet 2016-06-15 14:46:19 +02:00
Alexander Bock
896d9bd1db Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-14 22:52:30 +02:00
Sebastian Piwell
c0b0d45470 Linux compile fix 2016-06-13 13:50:38 -04:00
Sebastian Piwell
65bacf3119 Merge with develop 2016-06-13 13:30:26 -04:00
Sebastian Piwell
157ca752b2 Find highest value over multiple bins in histogram 2016-06-10 15:36:36 -04:00
Kalle Bladin
562e249dc9 Merge branch 'develop' into feature/globebrowsing 2016-06-08 12:32:31 -04:00
Emil Axelsson
73ceaafd13 merge 2016-06-08 15:02:10 +02:00
Emil Axelsson
8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Kalle Bladin
bc21643f06 Add the ability to change the interaction mode dynamically and via lua script. 2016-06-07 17:25:00 -04:00
Kalle Bladin
012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Alexander Bock
146b71e129 Make performance widget graphs fill from right to left instead of circular 2016-06-07 11:16:27 +02:00
Sebastian Piwell
9e7c420719 KameleonTransformationMatrix() in Transformation manager 2016-06-06 10:20:53 -04:00
Alexander Bock
55456ae272 Add button to reset performance measurements
Clang compile fix
2016-06-06 10:23:28 +02:00
Alexander Bock
5a81b1089a Rename PerformanceHelper to PerformanceMeasurement
Add performance measurements to FramebufferRenderer
2016-06-06 08:48:44 +02:00
Alexander Bock
6af96c4ef3 Add macro for easy generation of PerformanceHelper 2016-06-06 07:09:54 +02:00
Alexander Bock
55bd1341e6 More work on PerformanceHelper
Getting first version to run and produce output
2016-06-06 07:00:36 +02:00
Alexander Bock
ff0b916b90 Started implementing PerformanceHelper class 2016-06-06 03:53:42 +02:00
Alexander Bock
1430f6b9c2 Clang compile fix 2016-06-06 03:34:56 +02:00
Alexander Bock
14ee3af94d Make PerformanceManager available
Add empty PerformanceHelper file
2016-06-06 03:30:10 +02:00
Kalle Bladin
f51f282dbb Merge branch 'feature/interaction' into feature/globebrowsing 2016-06-05 21:28:12 -04:00
Kalle Bladin
45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -04:00
Kalle Bladin
187ddb8049 Solve merge conflict 2016-06-05 21:26:04 -04:00
Alexander Bock
53c35c7531 Moving performance-related collection code from RenderEngine into new PerformanceManager code 2016-06-06 03:21:25 +02:00
Kalle Bladin
d7278bfcc8 Update camera class. 2016-06-05 21:07:36 -04:00
Alexander Bock
55d484205a Rename performance file 2016-06-06 02:14:42 +02:00
Alexander Bock
f8f89e6fd1 Moving more code into performance files 2016-06-06 02:12:46 +02:00
Alexander Bock
2c8e3fd7b9 Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent 2016-06-06 01:54:41 +02:00
Erik Broberg
5156071361 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 18:43:01 -04:00