d39b9e91e2
Compile fix in InteractionHandler
2016-07-18 00:40:40 +02:00
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
5c95c34752
Move the Gui rendering into a postdraw call so that it works for non-standard rendering techniques (like fisheye)
...
Closing #119
2016-07-16 16:47:00 +02:00
dc32dfe075
Added functionality to print all keybindings to file when a scene is loaded
2016-07-14 00:28:09 -04:00
b9237cb787
Fix immediate crash if a new scene would be loaded through the Lua interface
2016-07-14 00:27:36 -04:00
94a46813fe
Add to_string methods to Key, KeyModifier, and KeyWithModifier
2016-07-14 00:27:03 -04:00
3e20c6edd3
Correctly load and pop scripts
2016-07-08 10:49:18 +02:00
5a41f7fa78
Fix Io trail
...
Do not crash coordinate system change if some nodes are not loaded
2016-07-08 10:49:05 +02:00
cc5e520be5
Rollback to Alex's original changes to _synchronizationBuffer
...
Allocated _synchronizationBuffer in SyncBuffer initialization instead to fix.
2016-07-07 12:00:49 -06:00
e3a1b775fd
Correctly rollback the previous rollback
2016-07-07 13:49:57 +02:00
6e9d299dda
Update Ghoul repository
...
Adapt to Ghoul changes in function names
2016-07-07 13:49:36 +02:00
da203364ba
Rollback pointer changes to _synchronizationBuffer.
...
Was causing segfault on mutex locks during launch.
2016-07-06 12:02:01 -06:00
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
20d0fb8474
Fix error in Dictionary construction for ScreenSpaceRenderable
...
Do not access the std::future for cases where a download is not necessary
2016-07-03 14:34:17 +02:00
e40d393824
Make the DownloadManager not a singleton (closing #43 )
2016-06-30 00:43:03 +02:00
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
2f9b873f1c
Group properties in the Gui based on the group identifier
2016-06-29 19:45:45 +02:00
a56ce8d3f5
Clang compile fixes
2016-06-29 16:40:20 +02:00
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
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
90d9f09909
Make PerformanceManager not crash if performance measurements are requested multiple times
2016-06-27 15:02:40 +02:00
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
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
41ef7c1b55
Add methods to check for KeyActions and KeyModifiers
2016-06-27 01:12:00 +02:00
8886eeec9d
Compile fix for when globebrowsing is not available
2016-06-26 03:38:42 +02:00
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
5cc5f52abd
Merge branch 'develop' into release/ips
...
# Conflicts:
# ext/ghoul
2016-06-22 10:01:48 +02:00
342ed2f161
Let Downloadmanager use new thread methods
2016-06-22 08:27:24 +02:00
c587b5cdb9
Fix tabs
2016-06-17 18:30:12 +02:00
190bd4726f
Add performance measurements to ABufferRenderer
2016-06-17 18:30:01 +02:00
f2347a5f56
Merge remote-tracking branch 'origin/feature/iSWA' into release/ips
2016-06-17 11:31:33 +02:00
cbb7a3e1db
Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips
2016-06-17 11:31:17 +02:00
3d4e1ec19c
Merge branch 'develop' into release/ips
...
Conflicts:
tests/main.cpp
2016-06-17 11:31:11 +02:00
96d7a1dd44
Solve synching bug in time class.
2016-06-16 17:50:19 -04:00
db4a35fd05
Merge branch 'develop' into feature/globebrowsing
2016-06-16 12:21:24 -04:00
7189f85390
Removed LDEBUG logging per writeLog call
2016-06-16 17:22:24 +02:00
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
78f3b42c3b
Started cleanup of ScreenSpaceImage
2016-06-16 01:22:30 +02:00
77c8ecf6df
Rename screnspace* to screenspace shaders
2016-06-16 01:02:13 +02:00
ad1893fd6f
Cleanup of ScreenSpaceRenderable
...
Add missing includes to other files
2016-06-16 01:00:10 +02:00
5cc278c97f
Add ModelMatrix retrieval to WindowWrapper
2016-06-16 00:57:31 +02:00
9c83dc1135
Make TransformationManager work without Kameleon module
2016-06-15 22:59:16 +02:00
fe28c9b0aa
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-06-15 10:33:08 -04:00
78b827d9d6
Histogram with standard score normalization
2016-06-15 10:32:59 -04:00
2eab8aee28
Fixed bug in global settings implementation
2016-06-15 15:38:16 +02:00
d5ddaf84b8
Working on global settings integrated in gui but no functionality yet
2016-06-15 14:46:19 +02:00
76a2f78676
Perform a glFinish at the beginning and the end of the performance measurement frame to capture all OpenGL timings
2016-06-15 09:30:22 +02:00
896d9bd1db
Merge remote-tracking branch 'origin/feature/iSWA' into release/ips
2016-06-14 22:52:30 +02:00
8e6bdf5f06
Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips
2016-06-14 22:52:15 +02:00
573ebd34a7
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-06-14 14:02:05 -04:00
Alexander Bock