Commit Graph

3884 Commits

Author SHA1 Message Date
Alexander Bock 777e6c628f Change tabs to spaces 2016-12-03 01:21:54 +01:00
Alexander Bock afd60683a3 Windows compile fixes 2016-12-03 01:20:53 +01:00
Alexander Bock 694cc4d6cd Merge branch 'feature/globebrowsing' of https://github.com/OpenSpace/OpenSpace into feature/globebrowsing 2016-11-30 14:00:46 +01:00
kalbl ddd101e1b6 Add ability to read local temporal datasets. 2016-11-30 01:01:59 +01:00
Erik Broberg 058f1460e3 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-29 13:35:30 +01:00
Erik Broberg 322c87e499 Add ability to limit num parents in chunktile seletion 2016-11-29 13:32:55 +01:00
kalbl 0df09d23ad Add possibility to switch geographic position 2016-11-29 13:29:02 +01:00
Alexander Bock 3a12713ecc Add lodglobes texture folders to the gitignore 2016-11-29 09:24:22 +01:00
Erik Broberg 0f4ab18876 Add TileProviderByIndex and use test for Earth 2016-11-29 01:06:45 +01:00
Erik Broberg 3eedf20eba Add ghoul dictionary constructor to TileIndex 2016-11-29 01:05:13 +01:00
Erik Broberg f7957255f8 Add and use TileIndex positionRelativeParent 2016-11-28 18:19:04 +01:00
Erik Broberg e6d758a418 Move ChunkTile selection to TileProvider interface 2016-11-28 18:09:26 +01:00
Erik Broberg fa1407f2ac Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-28 17:40:55 +01:00
Erik Broberg 14f9126df2 Add TileProviderByLevel and use for Earth 2016-11-28 17:40:47 +01:00
Alexander Bock 328f57fb20 Fix error with pow being undefined when newValue becomes negative
Add wms.itn.liu.se as main server for CTX and Mola for Mars
2016-11-24 21:07:19 +01:00
Erik Broberg 2646e2dcbb Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-23 13:37:09 +01:00
kalbl 54367cc341 Update renderable trails to updated renderable 2016-11-23 13:36:24 +01:00
kalbl a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Erik Broberg edfd4c6693 Fix missing includes 2016-11-23 13:10:05 +01:00
kalbl 5a6b076507 Solve compilation error 2016-11-23 13:01:44 +01:00
kalbl 2f0e10454c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-23 12:53:08 +01:00
Erik Broberg 88fd08ef96 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-23 12:26:15 +01:00
Erik Broberg 36e3f62508 Add enabling of stats collection for ChunkedLODGlobe in GUI 2016-11-23 12:23:38 +01:00
Alexander Bock 683fc8ee53 Pr/trails (#170)
* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
2016-11-23 10:35:46 +01:00
Alexander Bock db923209c3 Show PerformanceMeasurements independently of the Gui visibility
Replace settings in performance measurements with properties
2016-11-22 10:16:17 +01:00
Alexander Bock f711e192fb Replace explicit Lua commands to toggle onscreen gui with a global property 2016-11-22 09:49:22 +01:00
Alexander Bock ceac5db8c5 Updated Ghoul repository 2016-11-21 17:29:35 +01:00
Alexander Bock 8ed9d762dd Cleanup RenderableStars 2016-11-16 22:06:20 +01:00
Alexander Bock cd9f8b30e0 Removing Spice dependency from RenderableModel (closing #33) 2016-11-16 22:05:56 +01:00
Alexander Bock 789f931979 Change 'addImage' to add the image when enter is pressed
Automatically show performance window when performance is measured
Cleanup of GUI module
2016-11-15 21:56:38 +01:00
Alexander Bock 3831e406cf Convert native path tokens to Lua supported tokens for adding a screenspace image (closing #168) 2016-11-14 18:52:57 +01:00
Alexander Bock e2305654bc Correctly deinitialize default FontRenderer
Use std::accumulate in property JSON generation
2016-11-14 17:28:59 +01:00
Alexander Bock cea6edd7ae Update Ghoul reference 2016-11-14 16:15:22 +01:00
Alexander Bock e543163612 Updating Ghoul reference
Adapt to the API changes
2016-11-14 14:45:26 +01:00
Alexander Bock 5f0623e964 Compile fix for new Ghoul version
Make FactoryDocumentation optional
2016-11-13 19:54:55 +01:00
Alexander Bock 92676c107f Remove wrong type of whitespace
Remove circular header dependency
Increase the time setting of the GUI
2016-11-12 11:16:15 +01:00
Jonathas Costa 3932826a1a Removed unused atmosphere shaders from base module. 2016-11-11 11:10:44 -05:00
Rickard Lindstedt 6f126dea7d Update ghoul repository 2016-11-09 16:23:00 +01:00
kalbl aa1d3cb5cd Merge branch 'develop' into feature/globebrowsing 2016-11-08 13:58:48 +01:00
Alexander Bock 0db02995bd Update Ghoul repository 2016-11-08 13:30:11 +01:00
kalbl c116b34765 Update biaxial ellipsoid for planets and add rings for saturn. 2016-11-08 00:57:59 +01:00
kalbl d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
kalbl 82d08ec45e Enable VIIRS by default 2016-11-07 22:57:19 +01:00
kalbl a411ba4347 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-07 22:38:24 +01:00
kalbl ef62fdca30 New data folder structure for lodglobes 2016-11-07 22:38:14 +01:00
Erik Broberg ae6d27e474 TileIOResult -> RawTile, PreprocessData -> TileMetaData 2016-11-07 17:03:06 +01:00
Alexander Bock f99513a976 Remove the km to m conversion in RenderableFoV (closing #156) 2016-11-07 16:15:28 +01:00
Alexander Bock 70af0f0073 Add an option to the configuration manager to append the scene name to the cache directory (closing #159) 2016-11-07 13:39:01 +01:00
Alexander Bock 921f5060c4 Move mission scene files into their own subdirectory missions 2016-11-07 13:12:41 +01:00
Alexander Bock af7e43c66a Rename bind_keys.lua script file to bind_common_keys.lua
Move SPICE kernel declaration from osirisrex.scene into the osirisrex mod file
2016-11-07 11:06:52 +01:00