Commit Graph

4767 Commits

Author SHA1 Message Date
Alexander Bock 1990a50757 Remove dependency on glm swizzle 2017-11-06 15:36:19 -06:00
Alexander Bock bc4e0e4af0 Refactor item overlap and add standoff distance 2017-11-06 11:02:58 -06: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
Alexander Bock 3afd2bf514 OSX compile fix 2017-11-04 20:54:55 -04: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
Alexander Bock 735d6378d9 More work on loading screen
Multithreaded SceneGraphNode initialization
2017-11-03 14:06:51 -04:00
Alexander Bock 9577f2dd49 Start adding loading screen code 2017-11-02 16:56:49 -04:00
Alexander Bock 78e3320cde Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Alexander Bock ca69408366 Enable minimum picking distance in NDC 2017-11-02 12:05:09 -04:00
Alexander Bock 4a449f3668 Update starlabels.data file 2017-11-02 12:05:04 -04:00
Alexander Bock 3ea8f0e129 Add constellation files to GitIgnore
Add spherical mirror configuration file
Add the Spout output configration file
2017-10-31 08:12:27 -04:00
Alexander Bock 0f8adec9aa Show on-screen information about friction status 2017-10-30 14:28:03 -04:00
Alexander Bock a2e7614112 Update Ghoul
Fix AssImp CMake warnings
2017-10-30 09:49:10 -04:00
Alexander Bock fc78360374 Update Ghoul to fix Assimp to run in OSX with a native Assimp library 2017-10-26 14:03:24 -04:00
Alexander Bock a599516f2c Merge pull request #408 from OpenSpace/feature/various-fixes
Feature/various fixes
  * Remove runTime from OpenSpaceEngine and place in WindowWrapper instead
  * Add the ability to remove Tags
  * Add display for current time and ability to return to today to the sp…  …
  * Clean up RenderEngine
  * Remove unused shaders
  * Add Lua method to check whether a scenegraphnode is present in the scene  …
  * Make use of the function to guard mark_interesting_nodes against a nonexisting scenegraph node
2017-10-24 10:33:39 -07:00
Alexander Bock a1b2695765 Add Lua method to check whether a scenegraphnode is present in the scene
Make use of the function to guard mark_interesting_nodes against a nonexisting scenegraph node
2017-10-24 03:41:02 -07:00
Alexander Bock 1c2622248c Remove unused shaders 2017-10-24 03:35:41 -07:00
Alexander Bock 9b6028028a Clean up RenderEngine 2017-10-24 03:16:29 -07:00
Alexander Bock 10bcd9a3d3 Add display for current time and ability to return to today to the space/time component 2017-10-24 02:53:51 -07:00
Alexander Bock 5a9ebe552b Add the ability to remove Tags 2017-10-24 01:47:14 -07:00
Alexander Bock 269dda8aff Remove runTime from OpenSpaceEngine and place in WindowWrapper instead 2017-10-24 01:33:53 -07:00
Alexander Bock c2724ad228 Merge pull request #407 from OpenSpace/feature/newlicense
Add SceneLicense information to the Scene
2017-10-23 21:24:43 -04:00
Alexander Bock eaca6c7487 Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
Alexander Bock 35d87402b7 Merge branch 'feature/rapidprototyping'
# Conflicts:
#	support/cmake/handle_applications.cmake
2017-10-23 14:44:46 -07:00
Alexander Bock 97445f4f9f Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts 2017-10-23 14:43:25 -07:00
Alexander Bock 9fe27ba0d9 Fix CMake configuration regarding application settings 2017-10-23 13:01:45 -07:00
Alexander Bock 2200692e39 Fix CMake configuration regarding application settings 2017-10-23 12:58:27 -07:00
Alexander Bock c204a1e9f0 Make RenderableConstellationBounds not crash if the file is missing 2017-10-21 10:27:14 -04:00
Alexander Bock e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Alexander Bock 008896bdd7 Only add color layers and height layers through info files if they exist 2017-10-20 17:01:44 -04:00
Alexander Bock fc4ff258b0 Make log file links work again (thank Emil) (closes #378) 2017-10-20 11:47:48 -04:00
Alexander Bock ca968f805c Fix Bennu mod file 2017-10-20 10:33:18 -04:00
Alexander Bock 28cb52e900 Fix Osiris-Rex scene file 2017-10-20 10:20:51 -04:00
Alexander Bock 2bfbf82403 Fix Tully download
Guard against stray .data files
2017-10-19 23:56:16 -04:00
Alexander Bock ae51be09fd Fix download links for Digital Universe 2017-10-19 23:22:54 -04:00
Alexander Bock b26db7548b Allow setting the default enabled state for renderables 2017-10-19 23:20:43 -04:00
Alexander Bock 4dacba868b Fix featured property display
Set correct blend mode for Themis on Mars
2017-10-19 22:52:25 -04:00
Alexander Bock 78aa164ccf Reset moon.mod 2017-10-19 15:14:04 -04:00
Alexander Bock cbb6a6f095 Merge pull request #404 from OpenSpace/feature/libtorrent-as-submodule
Feature/libtorrent as submodule
2017-10-18 19:32:26 -04:00
Alexander Bock 2e7da84dbf Some minor ImGUI color changes 2017-10-18 19:30:32 -04:00
Alexander Bock 5a3bec253f Merge branch 'master' into feature/DU 2017-10-18 18:51:51 -04:00
Alexander Bock 4fc6f82e40 Add data files for digitaluniverse
Add files to gitignore file
2017-10-18 18:11:15 -04:00
Emil Axelsson 3307b3f3bc Update logo in Launcher 2017-10-18 17:12:30 +02:00
Emil Axelsson 7eb65c54be Guard against concurrent downloads of the same file 2017-10-18 16:57:38 +02:00
Alexander Bock b3baf72f49 Correctly align shutdown information 2017-10-18 10:18:03 -04:00
Alexander Bock 40f52c54b0 Turn DU into a default module 2017-10-18 10:00:41 -04:00
Alexander Bock 1c61f56043 Various Mac related fixes 2017-10-18 09:58:12 -04:00
Emil Axelsson 1862b804a9 Use libtorrent as a git submodule. Support base library functions in Lua execution of the Launcher. 2017-10-18 14:47:01 +02:00