Commit Graph

3896 Commits

Author SHA1 Message Date
Alexander Bock ab6a952193 Some more code cleanup 2016-12-04 11:23:41 +01:00
Alexander Bock dc3ded891b Started with code cleanup of Globebrowsing 2016-12-04 10:34:25 +01:00
Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00
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 c515bbfd0f Redesign the ScriptScheduler to not copy scripts on return
Fix earth.mod file
2016-12-03 00:51:32 +01:00
Alexander Bock fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +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 ee8d129da6 Update Ghoul and SGCT repository 2016-11-28 14:20:32 +01:00
Alexander Bock af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +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
Alexander Bock c199d38aac Add setting to SpiceManager that disables exceptions (closing #142)
Disable exceptions on default
2016-11-24 10:57:53 +01:00
Alexander Bock 6fad08dfda Jenkins compile fix 2016-11-24 08:54:42 +01:00
Alexander Bock b00595af40 Replacing const std::string with const char* to reduce binary size and initialization costs 2016-11-23 23:52:16 +01:00
Alexander Bock 7ffcf81235 Add visibility setting to the property classes (closing #166) 2016-11-23 23:24:07 +01:00
Alexander Bock 357a447435 Update ghoul reference
Wrap OpenSpace main with an exception handler that logs exceptions
2016-11-23 18:35:02 +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