Commit Graph

4950 Commits

Author SHA1 Message Date
Emil Axelsson d16efef3d9 Automatically initialize assets 2017-12-05 16:01:59 +01:00
Emil Axelsson fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01:00
Alexander Bock 38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock 8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
Alexander Bock 026f51735b Show distance from current focus object
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
Alexander Bock f0d5b313b0 Add scene for Voyager 1 and Voyager 2 missions 2017-11-25 16:09:59 -05:00
Alexander Bock 07a8cb8bac Simplify specification of properties 2017-11-25 15:56:07 -05:00
Alexander Bock 182694422e Per default set the length of Uranus to a shorter value to allow for earlier time jumps with exceeding the spice kernel range
Set correct min/max values for static rotations
Enable rendering of matrix properties in ImGUI
2017-11-24 15:31:19 -05:00
Alexander Bock 8380b8f421 Provide more information in case of Lua table to dictionary conversion error 2017-11-24 13:27:37 -05:00
Alexander Bock 55afc617f3 Let performance measurement consume mouse events 2017-11-24 12:13:39 -05:00
Emil Axelsson 13aebb78b2 Do not assume that string propeties are file paths. Fix proper escaping in lua script generation. (#422) 2017-11-24 11:01:19 -05:00
Alexander Bock 0c18263de7 Issue/417 (#421)
Added support for multiple windows in ImGui
2017-11-24 11:00:53 -05:00
Emil Axelsson 99e097b441 Volume rendeirng fixes: Premultiply alpha in transfer function.Update transfer function on propery change. More reasonable opacity multiplier range. 2017-11-22 19:04:19 +01:00
Alexander Bock aa490a97c6 Adding MOLA HRSC dataset 2017-11-20 11:42:20 -05:00
Alexander Bock f597b119ed Set more reasonable follow focus node rotation distance value for OrbitalNavigator 2017-11-17 13:58:31 -05:00
Alexander Bock 719130b6b7 Jenkinswarnings (#419)
* Remove more warnings

* Removing more warnings

* More warning fixes

* More warnings

* More warnings

* Update ghoul
2017-11-16 21:19:28 -05:00
Emil Axelsson f3aeecaf23 Callbacks for asset state changes 2017-11-17 00:15:54 +01:00
Alexander Bock 669078201a Add check for usage of ghoul_assert instead of plain old assert
Update Ghoul
2017-11-16 16:12:54 -05:00
Emil Axelsson 436062381e Asset loading and synchronization 2017-11-16 19:29:45 +01:00
Emil Axelsson 7c80384d12 Decentralize asset synchronization 2017-11-16 15:09:55 +01:00
Alexander Bock 0ff9c93512 Enable the disabling of Tooltips in ImGUI 2017-11-16 09:06:17 -05:00
Emil Axelsson 816de9b29a Asset compile fix 2017-11-16 14:11:22 +01:00
Emil Axelsson c52ce23156 Asset management 2017-11-15 22:53:04 +01:00
Emil Axelsson 27823e9af6 Asset syncing 2017-11-15 13:12:10 +01:00
Emil Axelsson 6b182bdfad Start with Gui for assets 2017-11-15 09:40:37 +01:00
Emil Axelsson 95e6592f68 Asset synchronization 2017-11-15 09:38:42 +01:00
Emil Axelsson 62f58a9749 Start on asset gui 2017-11-14 20:46:03 +01:00
Emil Axelsson ce9b75117e More work on assets (not compiling) 2017-11-14 17:23:58 +01:00
Emil Axelsson 6a4f938bac Thread safety in http requests 2017-11-14 13:47:22 +01:00
Emil Axelsson c032e4a66e Add missing constructors 2017-11-14 11:26:23 +01:00
Emil Axelsson 81f45aed71 Work on http synchronization 2017-11-13 23:01:22 +01:00
Alexander Bock 3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -05:00
Emil Axelsson c171e6ae86 Work on http download interface 2017-11-13 19:03:58 +01:00
Emil Axelsson 27f36209fa Improve implementation and interface of http downloads 2017-11-13 14:59:39 +01:00
Emil Axelsson 62c5506250 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-13 11:18:00 +01:00
Alexander Bock 3f6e5e6ace Merge pull request #415 from OpenSpace/feature/loadingscreen-refactor
Feature/loadingscreen refactor
2017-11-12 13:24:48 -06:00
Emil Axelsson 2fa42859cd Decentralize resource synchronization. Remove notion of SynchronizationJob. 2017-11-12 19:09:16 +01:00
Alexander Bock fb5057ba36 Jenkins compile fix 2017-11-12 12:37:55 -05:00
Alexander Bock b6d841c677 Correctly use group identifier name in property rendering
Fix indexing in Dropbox of OptionProperty
Finishing touches on FixedRotation (closes #137)
2017-11-12 12:33:10 -05:00
Alexander Bock 5080cc13b3 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-12 11:17:48 -05:00
Alexander Bock bbd019e8dd Jenkins build hotfix 2017-11-12 10:52:26 -05:00
Alexander Bock 907ea891cf Address PR comment 2017-11-12 10:50:24 -05:00
Alexander Bock f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
Alexander Bock 76b26c0128 Change to different libTorrent version 2017-11-11 16:06:02 -05:00
Alexander Bock 6911a0cade Revert libtorrent back to an RC version 2017-11-11 15:41:57 -05:00
Emil Axelsson 19812af629 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-11 19:10:42 +01:00
Emil Axelsson a73f2e0d00 Work on asset synchronization 2017-11-11 18:48:07 +01:00
Alexander Bock 758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock f29b15a37f Add a rotation method that follows a fixed scene graph node
Add missing file for ImGui
2017-11-10 17:15:00 -05:00
Alexander Bock 28e1298be6 Only include touchbar file if on Apple 2017-11-10 13:38:47 -05:00