Commit Graph

887 Commits

Author SHA1 Message Date
Kalle
dd7abd355a GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels 2016-07-01 17:42:49 -04:00
Kalle
fc53905131 Store interaction modes in interaction handler in a std::map 2016-07-01 13:13:31 -04:00
Kalle
3c7d1e22fc Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
Kalle
031461307c Solve problem with unsynched world position between interaction handler and renderer. 2016-06-30 22:43:27 -04:00
kbladin
a89f474502 Solve merge conflict and add properties for friction and interaction parameters. 2016-06-30 14:07:51 -04:00
Kalle Bladin
161d722623 Enable setting of friction, sensitivity and followscalefactor in interaction handler. 2016-06-29 21:13:04 -04: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
Kalle Bladin
35a095c448 Change camera dictionary state representation to consider position, rotation and focus node. 2016-06-29 15:23:37 -04:00
Alexander Bock
2f9b873f1c Group properties in the Gui based on the group identifier 2016-06-29 19:45:45 +02:00
Kalle Bladin
6cb82f691a Save and restore camera state as lua tables. 2016-06-29 13:04:41 -04:00
Kalle Bladin
5807919ac7 Start changing camera write and restore functions. 2016-06-29 10:45:26 -04:00
Alexander Bock
a56ce8d3f5 Clang compile fixes 2016-06-29 16:40:20 +02:00
Kalle Bladin
e5ccf185cd Remove rotation state variables from interaction mode and enable more freely local rotation. 2016-06-28 22:28:56 -04: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
Erik Broberg
745c51c4e4 Add unimplemented initialize to InteractionModes 2016-06-22 18:22:46 -04:00
Erik Broberg
7c0e80b866 Enable basic saving and restoring camera position between runs 2016-06-22 17:37:55 -04:00
Erik Broberg
60da53c00e Divide InteractionHandler and Interaction modes into different files 2016-06-22 14:42:24 -04:00
Erik Broberg
6e5796107c Remove Camera pointer from all InteractionModes. Pass it into update() instead 2016-06-22 12:32:11 -04:00
Erik Broberg
16564a69e3 Remove InputState pointer from all InteractionModes. Pass it in in update() instead 2016-06-22 12:12:48 -04:00
Kalle Bladin
69aef205af Interaction mode inertia is no longer dependent on the framerate. 2016-06-21 13:42:56 -04: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