Commit Graph

105 Commits

Author SHA1 Message Date
Alexander Bock
50dd45fbb1 Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node 2016-08-01 16:20:23 +02:00
Alexander Bock
7e98922bdd Enable rendering of IVecX properties in the GuiPropertyComponent 2016-07-31 21:24:12 +02:00
Matthew Territo
2abd1951fa Add display option to OptionProperty
For displaying as Radio or Dropdown
2016-07-22 19:07:32 -06: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
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock
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
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
443a0121b1 Merge branch 'feature/gui-cleanup' of https://github.com/OpenSpace/OpenSpace-Development into feature/gui-cleanup 2016-06-29 17:47:13 +02:00
Alexander Bock
a56ce8d3f5 Clang compile fixes 2016-06-29 16:40:20 +02:00
Alexander Bock
9652e64fd3 Minor cleanup 2016-06-29 14:37:19 +02:00
Alexander Bock
cfd16dd35d Represent SelectionProperty by Tree instead of collapsible header 2016-06-29 13:51:53 +02:00
Alexander Bock
14caa033ce Do not show empty PropertyOwners in PropertyList 2016-06-29 13:49:40 +02:00
Alexander Bock
c998a856ea Show tooltips with fully qualified ids in Gui 2016-06-29 13:47:48 +02:00
Alexander Bock
9201cd027b Organize Property%s by PropertyOwner 2016-06-29 13:44:19 +02:00
Alexander Bock
9cd751ada1 Fix min/max values for int, float, and vector properties 2016-06-29 13:23:20 +02:00
Alexander Bock
3a0a1b97d1 Update color for headers 2016-06-29 00:40:13 +02:00
Alexander Bock
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
Alexander Bock
3417f45805 Making different Property windows not appear in the same ImGui window 2016-06-28 15:10:45 +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
d15f8f3ba8 Do not show collapsing header if only one owner is present 2016-06-27 01:26:32 +02:00
Alexander Bock
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
Alexander Bock
2550346835 Move GUI Lua functions into their own file 2016-06-26 16:35:48 +02:00
Alexander Bock
4ce4321847 More cleanup of Gui code
Setting a new color layout
2016-06-26 16:35:29 +02:00
Alexander Bock
f457eb6cc2 Merge branch 'master' into feature/gui-cleanup 2016-06-25 18:26:18 +02:00
wundahlful
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
Alexander Bock
bf8d365017 Started cleanup of OnScreenGui code 2016-06-22 16:55:44 +02:00
Alexander Bock
3fe802ae1f Merge branch 'develop' into release/ips 2016-06-16 13:51:34 +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
65bacf3119 Merge with develop 2016-06-13 13:30:26 -04:00
Sebastian Piwell
661dd00129 Faster processing in DataProcessorText 2016-06-13 13:20:00 -04:00
Michael Nilsson
9800ca72be change demo server cygnet ids 2016-06-10 11:53:05 -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
Michael Nilsson
c4ae0084ae changed demo server ids 2016-06-06 10:24:02 -04:00
Alexander Bock
55456ae272 Add button to reset performance measurements
Clang compile fix
2016-06-06 10:23:28 +02:00
Alexander Bock
742bfcfe86 Remove static min/max values and compute scaling factors directly from data 2016-06-06 09:52:47 +02:00
Alexander Bock
16559231bd Move Performance ImGui components into separate windows 2016-06-06 09:01:15 +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
53c35c7531 Moving performance-related collection code from RenderEngine into new PerformanceManager code 2016-06-06 03:21:25 +02:00
Alexander Bock
2c8e3fd7b9 Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent 2016-06-06 01:54:41 +02:00
Alexander Bock
e85144b4eb Performance optimization of ImageSequencer::instrumentActive 2016-06-06 00:45:40 +02:00
Alexander Bock
6a2624dbb2 Enable the sorting of performance measurement values 2016-06-05 23:27:24 +02:00
Alexander Bock
4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop
Conflicts:
	data/scene/default.scene
2016-06-04 19:06:54 +02:00
Sebastian Piwell
8e8d949107 Summer school release 2016-06-03 13:42:50 -04:00
Sebastian Piwell
d788e31334 Change resolution and cdf file in KameleonPlane 2016-06-02 16:25:11 -04:00
Alexander Bock
4c679c15ea Allow the disabling of ISWA components 2016-06-02 13:25:05 +02:00
Alexander Bock
1e8d329e3d Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95) 2016-06-02 13:12:28 +02:00
Erik Broberg
1097db4b5f Increase value range of delta time in GUI 2016-06-01 20:53:51 -04:00