Michael Nilsson
a3f9a84160
solve large merge conflict
2016-06-30 16:03:52 -04:00
Michael Nilsson
5eec1a7f21
solve merge conflicts with globebrowsing
2016-06-30 15:03:28 -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
Michael Nilsson
583663db22
solve merge conflict
2016-06-29 16:52:48 -04:00
Michael Nilsson
eb4e2bb08a
actually fix thread blocking issue + changeRange fix in Histogram + unused function cleanup
2016-06-29 16:52:04 -04: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
Sebastian Piwell
de7ba80f83
Correct time for keybinding
2016-06-29 10:16:56 -04:00
Michael Nilsson
25b341cc6a
fix for blocking call to fetchFile in DownloadManager
2016-06-29 10:15:00 -04: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
Michael Nilsson
8afefd77d3
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-06-28 18:08:03 -04:00
Michael Nilsson
e8bbb9e0c5
fix for generation of equalizer in histogram
2016-06-28 17:57:29 -04:00
Sebastian Piwell
e78da43c6e
Moved stop function from header
2016-06-28 15:08:57 -04:00
Sebastian Piwell
d2fccb6d1b
Save and Load camera position
2016-06-28 15:03:00 -04:00
Sebastian Piwell
a9ac7ab65b
Linux and rotation fix
2016-06-28 14:19:19 -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
Michael Nilsson
5d8e21267f
solve merge conflict and linux fix
2016-06-27 17:37:58 -04: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
Sebastian Piwell
320b7efa43
Linux compile fix
2016-06-23 15:38:58 -04:00
Sebastian Piwell
11cbfcf949
Merge branch 'develop' into feature/iSWA
2016-06-23 11:22:39 -04: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
Sebastian Piwell
10839285ab
Solved merge conflict
2016-06-22 15:17:33 -04:00
Sebastian Piwell
a14cfe2018
Normalize based on entropy
2016-06-22 15:11:45 -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
Michael Nilsson
122f44384b
windows fix
2016-06-21 11:21:37 -04:00
Michael Nilsson
294a29d99a
merge conflict + update ghoul ref
2016-06-20 13:46:38 -04:00
Sebastian Piwell
16bdc88633
Correctly unnormalize standardscroe normalization
2016-06-20 12:01:21 -04:00
Sebastian Piwell
8468742d6b
Better auto contrast
2016-06-17 14:20:06 -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
