Emil Axelsson
09182c9274
Cleanup code
2017-12-19 11:48:30 +01:00
Alexander Bock
966df322cf
Added additional absPath where necessary
2017-12-18 14:47:58 -05:00
Emil Axelsson
90243cf388
Improve loading screen
2017-12-18 15:00:57 +01:00
Emil Axelsson
ff317d4b2f
Show loading screen when loading assets
2017-12-18 11:55:14 +01:00
Emil Axelsson
570a499a59
Fix bugs from merge
2017-12-17 18:58:24 +01:00
Emil Axelsson
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
Emil Axelsson
df259f6d02
Multithreaded scene initialization
2017-12-17 17:34:46 +01:00
Emil Axelsson
814de72bc2
Fix bugs in asset management
2017-12-15 18:51:22 +01:00
Emil Axelsson
75cf6dcf71
Asset work in progress
2017-12-15 13:21:10 +01:00
Alexander Bock
23a446cb2c
Update Ghoul repository
...
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
Alexander Bock
167222c814
Feature/dashboard ( #431 )
...
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable
* Add Onscreen Dashboard
* Add Dashboard class
* Add DashboardItem classes and subclasses
* Added font and fontsize customization to dashboarditems
* Add default dashboard specifications to all scenes
* Add tests.scene to test dashboard items
* Add configuration options to DashboardItemDistance
* Fix distance conversion to correctly use singular or plural values
* Make DashboardItems unique when adding them to a dashboard
* Correctly position test with different font sizes
* Add Dashboard Item that enables spacing between other items
* Add performance measurement to dashboard rendering
* Add method to DashboardItemDistance that computes distance to surface
* Add DashboardItemAngle that computes and prints the angle between three objects
* Add DashboardItemInstruments that shows the instruments on New Horizons
* Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
* Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
Alexander Bock
7e2d6bf3ab
Coding style adherence
2017-12-12 17:08:24 -05:00
Emil Axelsson
1417db5ed7
Let assets control their own lifecycle
2017-12-12 14:55:30 +01:00
Alexander Bock
a631b7e0a3
Making most logger categories constexpr
2017-12-11 23:46:34 -05:00
Alexander Bock
c9aedb084b
Add Lua functions to query keyboard bindings and remove individual keybinds
...
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
2017-12-08 14:58:18 -05:00
Emil Axelsson
f33b24d551
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-07 11:44:14 +01:00
Emil Axelsson
175d21de9a
Remove experimental code
2017-12-06 15:16:52 +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
87b4ec03eb
Display error message on loading screen in case of catastrophic scene loading ( closes #423 )
2017-11-30 21:49:39 -05:00
Alexander Bock
12ddfae337
Compile fix in TimeConversion
...
Reenable display of shutdown timer
Add prompt informing the user of ability to abort
2017-11-30 21:20:16 -05:00
Alexander Bock
38338725b9
Strict coding style adherence
2017-11-26 14:57:26 -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
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
Emil Axelsson
62f58a9749
Start on asset gui
2017-11-14 20:46:03 +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
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
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
Emil Axelsson
19812af629
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-11 19:10:42 +01:00
Alexander Bock
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
Alexander Bock
28e1298be6
Only include touchbar file if on Apple
2017-11-10 13:38:47 -05:00
Alexander Bock
f183b9536f
Implement GUI button and featured elements on touchbar
2017-11-10 13:19:46 -05:00
Emil Axelsson
c479cb5079
Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:10:41 +01:00
Emil Axelsson
cb07af4a2b
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:07:58 +01:00
Alexander Bock
7e4bb0b2c6
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock
aa20c677dd
Move onscreen rendering into SGCT's render2D function ( closes #181 )
...
Same fix makes GUI windows work again (closes #412 )
2017-11-09 18:12:13 -05:00
Alexander Bock
0015cbb6f6
Finalize the loadingscreen before initializing GL part of the scene
...
Correctly use screen aspect ratio to render the loading screen box
2017-11-09 12:47:28 -05:00
Alexander Bock
5f391de33c
Fix crash when adding layers through globebrowsing interface due to missing initialization
...
Fix crash that would happen if the resetting of the tile layer would throw an exception
2017-11-09 12:01:35 -05:00
Alexander Bock
acdfefe46d
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/base/rendering/renderabletrailorbit.h
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# modules/digitaluniverse/rendering/renderablepoints.cpp
# modules/galaxy/rendering/renderablegalaxy.cpp
# modules/galaxy/rendering/renderablegalaxy.h
# modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
# modules/kameleonvolume/rendering/renderablekameleonvolume.h
# modules/spacecraftinstruments/rendering/renderablefov.h
# modules/spacecraftinstruments/rendering/renderableplaneprojection.h
# modules/toyvolume/rendering/renderabletoyvolume.cpp
# modules/toyvolume/rendering/renderabletoyvolume.h
# modules/volume/rendering/renderabletimevaryingvolume.cpp
# modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Emil Axelsson
e201dec907
Start work on TorrentSynchronization
2017-11-06 19:07:52 +01:00
Emil Axelsson
1f33359697
Cleanup and better configuration of resource syncs
2017-11-05 23:17:51 +01:00
Alexander Bock
dc9831b6a6
Add progress bar to the loading screen
...
Add configuration options to customize the loading screen
2017-11-05 14:49:46 -05:00
Emil Axelsson
43664d34b7
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-05 20:04:47 +01:00
Alexander Bock
4465c4b322
Set time-to-live for loading messages
2017-11-04 12:08:35 -04:00
Alexander Bock
6ecb180ac0
Some more work on rendering loading screen information
2017-11-04 11:12:22 -04:00
Alexander Bock
b886925616
Move OpenGL in globebrowsing from constructors into initialization functions
...
Place entire scene loading into separate thread
2017-11-03 16:25:06 -04:00
