Commit Graph

1055 Commits

Author SHA1 Message Date
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
Alexander Bock
74ff3eddbd Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-06-24 10:56:57 +02:00
Alexander Bock
9705c33c16 Disable default module setting for galaxy, globebrowsing, and multiresvolume
Update Ghoul repository
2016-06-24 10:55:49 +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
37e18441dc Support GDAL on non-Windows platforms
Fix compile fix with TileProviderManager
Fix projection error on PlanetProjection
2016-06-22 08:51:58 +02:00
Alexander Bock
e671a59ede Merge branch 'develop' into release/ips 2016-06-21 14:24:53 +02:00
Alexander Bock
3775bbe6b1 Always write values to the projected texture even when normal-test fails (closing #103) 2016-06-21 14:24:23 +02:00
Alexander Bock
f7502de92f Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 22:06:58 +02:00
Kalle Bladin
dd70733c2a Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable. 2016-06-17 15:52:32 -04:00
Alexander Bock
c3eda5e4e6 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 21:37:43 +02:00
Kalle Bladin
153d239790 Catch exceptions when not able to read a GDAL dataset. 2016-06-17 13:07:15 -04:00
Alexander Bock
a4b0d36048 Reenable up-vector definition in RenderableModelProjection 2016-06-17 17:00:45 +02:00
Kalle Bladin
101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Alexander Bock
e1460575f5 Reenable up-vector definition in RenderablePlanetProjection 2016-06-17 16:49:04 +02:00
Alexander Bock
f2347a5f56 Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-17 11:31:33 +02:00
Alexander Bock
cbb7a3e1db Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 11:31:17 +02:00
Alexander Bock
3d4e1ec19c Merge branch 'develop' into release/ips
Conflicts:
	tests/main.cpp
2016-06-17 11:31:11 +02:00
Michael Nilsson
f9411385d6 remove unnecessary includes from dataprocessor 2016-06-16 16:56:30 -04:00
Michael Nilsson
35c3d3ce8b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-16 14:40:39 -04:00
Michael Nilsson
268ca0ea75 change method for adding data values in dataprocessortext 2016-06-16 14:40:26 -04:00
Erik Broberg
5dcddfe5e9 Separate tile selection from tile provision 2016-06-16 00:08:13 -04:00
Erik Broberg
5451951146 Add decrement operators in ChunkIndex for calculation of parent index 2016-06-16 00:03:25 -04:00
Alexander Bock
78f3b42c3b Started cleanup of ScreenSpaceImage 2016-06-16 01:22:30 +02:00
Alexander Bock
77c8ecf6df Rename screnspace* to screenspace shaders 2016-06-16 01:02:13 +02:00
Alexander Bock
ad1893fd6f Cleanup of ScreenSpaceRenderable
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Alexander Bock
4fc838cbaf Compile fix for missing Boost 2016-06-16 00:58:31 +02:00
Alexander Bock
7548b5654b Make iSWA module dependent on Kameleon 2016-06-16 00:24:03 +02:00
Alexander Bock
d03d484f40 Actually spell textureplane correctly 2016-06-16 00:12:22 +02:00
Alexander Bock
1fb0b40563 Rename cygnetplane to textureplane in CMakeLists 2016-06-16 00:08:47 +02:00
Erik Broberg
faec017cef Make Chunk bounding polyhedron fully, but still not tightly, encapsulate the chunk 2016-06-15 14:27:14 -04:00
Erik Broberg
fa3671eb4a Improve GeodeticPatch interface by allowing getting min/max lat/lon 2016-06-15 14:25:32 -04:00
Sebastian Piwell
db375d310e Update kameleonlpane when sliding 2016-06-15 13:42:26 -04:00
Sebastian Piwell
389d094b8e Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-15 11:49:50 -04:00
Sebastian Piwell
1ef3c035e3 Renormalize values in the histogram correctly 2016-06-15 11:49:36 -04:00
Michael Nilsson
4401a21677 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-15 11:07:30 -04:00
Michael Nilsson
6573a6dfce add heroku baseurl and key bindings 2016-06-15 11:07:20 -04:00
Sebastian Piwell
78b827d9d6 Histogram with standard score normalization 2016-06-15 10:32:59 -04:00
Gene Payne
d5ddaf84b8 Working on global settings integrated in gui but no functionality yet 2016-06-15 14:46:19 +02:00
Erik Broberg
bfd2441eaa Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 23:19:45 -04:00
Erik Broberg
abbede263f Enabling toggling rendering of bounding Chunk volumes from GUI 2016-06-14 23:19:28 -04:00
Erik Broberg
5e3ff9077b Bugfix. Make box faces face outwards in DebugRenderer 2016-06-14 23:16:40 -04:00
Erik Broberg
d635b852a7 Remove old debugrenderer 2016-06-14 23:12:29 -04:00