Commit Graph

5025 Commits

Author SHA1 Message Date
Alexander Bock
4b65e20570 Support loading of .asset and .scene files
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
2017-12-23 08:08:12 +01:00
Emil Axelsson
ca6263ed1e Add support for absolute asset paths and explicit specification of .asset suffix. 2017-12-22 17:06:42 +01:00
Emil Axelsson
2baa0cbb6d Fix bug with assets changing state prematurely, while loading 2017-12-22 00:15:23 +01:00
Emil Axelsson
abb22b4aaa Small fix to fix state inconsistency bug 2017-12-21 10:10:55 +01:00
Emil Axelsson
c763b7c30c Fix state inconsistency bug in asset system 2017-12-20 12:13:18 +01:00
Emil Axelsson
0584f42e64 Remove old scene helper 2017-12-19 13:09:36 +01:00
Emil Axelsson
a90050de8f Remove old milkyway asset 2017-12-19 13:06:02 +01:00
Emil Axelsson
d40d2abc9a Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-19 12:56:12 +01:00
Emil Axelsson
f5b650948e Add missing files 2017-12-19 12:08:32 +01:00
Emil Axelsson
d328db7f4b Code cleanup 2017-12-19 12:05:28 +01:00
Emil Axelsson
7e6660716b Remove old scene files 2017-12-19 12:05:14 +01:00
Emil Axelsson
09182c9274 Cleanup code 2017-12-19 11:48:30 +01:00
Emil Axelsson
f7dc598f60 Small code cleanup 2017-12-19 11:17:56 +01:00
Alexander Bock
966df322cf Added additional absPath where necessary 2017-12-18 14:47:58 -05:00
Emil Axelsson
ab52504ec8 Restructure asset files 2017-12-18 18:55:12 +01:00
Alexander Bock
0b0ad54028 Reenable digital universe on default
Fix refresh rate setting in configuration_helper
2017-12-18 11:58:22 -05:00
Alexander Bock
d26cc999e9 Update Ghoul repository
Update SGCT repository
2017-12-18 11:54:41 -05:00
Emil Axelsson
8230e8d1e5 Add preprocessor flag 2017-12-18 17:50:07 +01:00
Emil Axelsson
ef2633980b Allow sync module to be compiled without libtorrent 2017-12-18 17:36:52 +01: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
fd550fc372 Fix compilation issues and bugs on windows 2017-12-18 10:22:42 +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
7cc05ba2e0 More code cleanup 2017-12-16 15:37:46 +01:00
Emil Axelsson
84dfbe7b80 Clean up asset related code 2017-12-16 12:51:46 +01:00
Emil Axelsson
814de72bc2 Fix bugs in asset management 2017-12-15 18:51:22 +01:00
Emil Axelsson
603078af53 Add sync task 2017-12-15 13:28:24 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Alexander Bock
255f187052 Update Ghoul repository 2017-12-14 00:22:08 -05: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
Alexander Bock
a08c678bb0 Remove erraneous enabled OpenGL checking code
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Emil Axelsson
2f2bba5094 Clear lua refs when unloading asset 2017-12-12 18:55:44 +01:00
Emil Axelsson
1926b59f91 Thread safety in torrentclient. Add syncfile to torrentsync. 2017-12-12 18:36:09 +01:00
Emil Axelsson
a774b7b5b2 Start implementing support for removing assets 2017-12-12 17:48:33 +01:00
Emil Axelsson
d1305bee6b Cleanup 2017-12-12 15:21:17 +01:00
Emil Axelsson
1417db5ed7 Let assets control their own lifecycle 2017-12-12 14:55:30 +01:00
Alexander Bock
0f0fb78a63 Cherry pick 0d83df09bf 2017-12-12 00:30:38 -05:00
Alexander Bock
c321d76b3e Add try/catch blocks around the rendering to detect excess of texture units (closes #427) 2017-12-11 23:48:56 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock
6c742b7e30 Add WMS server for Utah based Mars Color dataset
Remove dependency on old direct download
2017-12-11 15:27:54 -05:00
Alexander Bock
7dfa3374fc Update version number
Correctly layout tooltips in space/time widget
Fall back on old Digital Universe stars
Move settings of tooltip delay into each GuiComponent
2017-12-11 11:22:22 -05:00
Emil Axelsson
e0504980ad Initialize requested assets when they are ready 2017-12-11 11:12:39 +01:00
Alexander Bock
3578f52868 Make use of correct file path in TransferFunction (closes #402) 2017-12-08 16:24:53 -05:00
Alexander Bock
966b3b5ff4 Add ESRI World Imagery WMS file and reference in Earth.mod 2017-12-08 16:18:35 -05:00
Alexander Bock
d0f66dc754 Add customization.lua to the gitignore list 2017-12-08 15:31:48 -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