Erik Broberg
b44e761eba
Merge branch 'develop' into feature/globebrowsing
2016-07-21 13:29:33 -04:00
Alexander Bock
65ddeba70c
Add SGCT as submodule
...
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
Alexander Bock
bc137ab377
Updated Spice library. Compile fix for Syncbuffer and Unittestson Linux
2016-07-20 10:41:06 +02:00
Kalle Bladin
541fbba322
Merge with develop and solve conflicts.
2016-07-18 17:26:30 -04:00
Alexander Bock
a244defdbc
Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers
...
- Making the GUI use the new function setPropertyValueSingle to not incur the overhead of compiling the regex
- The default setPropertyValue Lua function uses a wildcard, which replaces a * with the correct regex (.*) for ease of use
- The setPropertyValueRegex Lua function allows a full regular expression to be used
Closing #108
2016-07-18 20:12:24 +02:00
Alexander Bock
a2db1bed99
Include fixes for performance measurements
2016-07-18 16:25:55 +02:00
Alexander Bock
9df88a6a79
Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117 )
2016-07-18 14:54:36 +02:00
Alexander Bock
1b7ede6d5c
Add Lua functions to load and unload SpiceKernels
2016-07-18 14:41:27 +02:00
Alexander Bock
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00
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
Kalle
8fcaaf2799
Merge remote-tracking branch 'origin/develop' into feature/globebrowsing
2016-07-13 12:09:02 -04:00
Kalle
7e7a1cb720
Change friction to bool properties
2016-07-13 11:29:29 -04:00
Kalle
916916f82b
Fix bug that caused change in camera direction when switching between interaction mode.
2016-07-12 14:52:00 -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
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
