Commit Graph

1612 Commits

Author SHA1 Message Date
Alexander Bock
8c2f2efcd1 Sort CMakeLists file
Set debugging correctly as globebrowsing dependency
Remove extra files
2016-12-05 13:35:45 +01:00
Alexander Bock
3318022a40 Jenkins compile fix 2016-12-04 14:55:21 +01:00
Alexander Bock
bf16e65077 Jenkins compile fix 2016-12-04 14:51:45 +01:00
Alexander Bock
d2bea839c8 Jenkins compile fix 2016-12-04 14:49:59 +01:00
Alexander Bock
0fa8c29af5 Jenkins compile fix 2016-12-04 14:47:36 +01:00
Alexander Bock
6c1bd2c91b Jenkins compile fix 2016-12-04 14:42:23 +01:00
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
fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +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
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
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
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
Erik Broberg
2646e2dcbb Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-23 13:37:09 +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
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
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
e543163612 Updating Ghoul reference
Adapt to the API changes
2016-11-14 14:45:26 +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
kalbl
d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
kalbl
a411ba4347 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-07 22:38:24 +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
4caa3d25ba Add documentation to the rosetta scene keyboard bindings 2016-11-07 10:34:19 +01:00
Alexander Bock
572257d3b0 Move the rendertime into a property and remove the toggleFrametimeType
Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
2016-11-06 22:15:52 +01:00
Alexander Bock
c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00