Commit Graph

248 Commits

Author SHA1 Message Date
Alexander Bock b6ddf2a879 Fix clang compile error regarding std::abs 2017-03-04 20:53:13 -05:00
Alexander Bock 9d30d3323b Update Ghoul repository
Adapt to changed signature of ghoul_assert macro
2017-03-03 10:55:20 -05:00
Alexander Bock 2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs
Adjust accordingly
2017-03-01 22:03:48 -05:00
Alexander Bock fbea8389c8 - Add check in style guide that prevents ‘using namespace’ in header files
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
2017-03-01 21:02:33 -05:00
Alexander Bock 4e52f27f9e Remove Dictionary include with forward declarations 2017-03-01 19:20:00 -05:00
Alexander Bock 2500b5f72b Add Dictionary constructor to TileIndexTileProvider (closes #248) 2017-02-28 21:22:42 -05:00
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock 283c83e37c Removing code analysis warnings
Start cleaning RenderEngine
2017-02-26 23:45:39 -05:00
Alexander Bock 2da100c001 Windows compile fix 2017-02-16 18:19:52 +01:00
Alexander Bock 0d03177d43 Feature/globebrowsingcleanup (#230)
* Initial restructuring of the Globebrowsing branch

* Update Ghoul repository
Fix include guards

* More cleanup

* Split texttileprovider subclasses into separate files

* Move TileProviders into namespace

* Convert static class methods into free functions

* Splitting tile subclasses into their own files
Remove `using namespace` from header file

* Split TileDataSet subclass into separate file
Update SGCT reference

* Move shader preprocessing data into internal class

* More Globebrowsing cleanup

* More cleanup
Remove unused Convexhull class
2017-02-15 21:20:05 +01:00
Alexander Bock 8456087cf5 Add a style check that checks whether the correct GLM header is used
Adapted files to use the correct GLM headers
2017-02-14 13:12:59 -05:00
Alexander Bock 70020e3de7 - Add style check for correct use of components and subcomponents in
include guards
- Disallow use of lower case characters in include guards
- Fix wrong components and subcomponents
2017-02-10 14:46:51 -05:00
Alexander Bock 23ea86949f Updated check_style_guide to test for include guards and copyright
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
2017-02-09 23:55:39 -05:00
Alexander Bock 6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock 8da0684ae2 More cleanup for newhorizons and globebrowsing module 2016-12-07 21:56:59 +01:00
Alexander Bock b3db661277 Fix RenderableFoV for all missions (NewHorizons, Rosetta, OsirisRex)
Make the CacheManager not crash when ShadowCylinder shader is created in the same cache directory as RenderablePlanet
Remove excessive logging from TileDataset
2016-12-07 14:51:31 +01:00
Alexander Bock bf16e65077 Jenkins compile fix 2016-12-04 14:51:45 +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
kalbl ddd101e1b6 Add ability to read local temporal datasets. 2016-11-30 01:01:59 +01:00
Erik Broberg 322c87e499 Add ability to limit num parents in chunktile seletion 2016-11-29 13:32:55 +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 14f9126df2 Add TileProviderByLevel and use for Earth 2016-11-28 17:40:47 +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 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
Erik Broberg ae6d27e474 TileIOResult -> RawTile, PreprocessData -> TileMetaData 2016-11-07 17:03:06 +01:00
kalbl 6e68472c66 Remove unused data struct TileProviderInitData and clean up. 2016-10-27 11:31:43 +02:00
Erik Broberg 9f7e1e05b2 Merge in feature/globebrowsing 2016-10-26 19:16:37 +02:00
Erik Broberg c4bdd12e0a Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-10-26 19:09:19 +02:00
Erik Broberg 9f65907579 Refactor chunk rendering related class names and file structure 2016-10-26 18:15:31 +02:00
Erik Broberg 21b41e3ec0 Clean up and remove unused code 2016-10-26 14:40:35 +02:00
kalbl c3eae0347c Add default geo transform for global maps if it is not specified. 2016-10-25 23:32:08 +02:00
Erik Broberg baba1f02d0 layers in LayerGroup are private 2016-10-25 19:56:11 +02:00
Erik Broberg 1b2291484f Small DRY refactor 2016-10-25 19:47:31 +02:00
Erik Broberg 8d639f8c1a Fix tile level blending bug 2016-10-25 19:24:51 +02:00
Erik Broberg a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg 9eb805a39d Merge 2016-10-25 18:30:15 +02:00
Erik Broberg 3dfbb4e6bf Add GPULayerManager and remove LayeredTextureShaderUniformIdHandler 2016-10-25 18:20:59 +02:00
Erik Broberg ac3b67e3bb cleanup and rename Layer isActive to enabled 2016-10-25 17:00:01 +02:00
Erik Broberg 92ae076c51 Refactor CPU and GPU layer rendering settings 2016-10-25 16:35:49 +02:00
Erik Broberg d03093d1e9 Layers have LayerRenderingSetting which syncs to GPU automatically 2016-10-24 20:17:05 +02:00
Erik Broberg 0bdb22cc3a Refactor: CPU to GPU mapping of all Layer data 2016-10-24 12:22:23 +02:00