Commit Graph

157 Commits

Author SHA1 Message Date
Kalle Bladin
7a22763143 Remove texture cateory HeightMapOverlays 2016-09-14 20:08:33 -04:00
Kalle Bladin
db18bc0c1a Update error message in TileProvider::createFromDictionary. 2016-09-14 14:01:42 -04:00
Kalle Bladin
5583ad5a7a Add doxygen for grid and cleanup. 2016-09-14 13:46:47 -04:00
Kalle Bladin
42ef18447f Clean up in tile providers 2016-09-14 12:11:10 -04:00
Erik Broberg
9a34761e25 Clean up and add some doxygen comments for CachingTileProvider 2016-09-13 22:02:13 -04:00
Erik Broberg
bb9bebf558 Add doxygen comments for struct Tile 2016-09-13 21:12:11 -04:00
Erik Broberg
2fe3ecf72d Add Doxygen documentation for TileProvider 2016-09-13 20:24:13 -04:00
Erik Broberg
c20cd80eaa Merge globebrowsing, resolve conflicts
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
Erik Broberg
1195ff9619 Remove excessive debug logging in TileDataset 2016-09-03 18:28:47 -04:00
Erik Broberg
b8fb3dcbe6 SizeReferenceTileProvider hashes based on tile sizes instead of chunk indices 2016-08-31 16:42:48 -04:00
Erik Broberg
c201957001 SizeReferenceTileProvider renders referred distance next to its text 2016-08-31 14:38:05 -04:00
Erik Broberg
b064c5606f Add new TileProvider implementation SizeReferenceTileProvider and add to lodMars 2016-08-31 13:27:36 -04:00
Erik Broberg
8d17ad7e34 Remove TileProviderFactory and instantiate TileProviders using FactoryManager instead 2016-08-30 23:52:53 -04:00
Erik Broberg
b56eeade88 Fix misspelling of SingleImageProvider 2016-08-30 20:05:16 -04:00
Erik Broberg
bf1dddf103 Separate Tile and TileProvider. Remove necessary includes 2016-08-30 19:26:22 -04:00
Erik Broberg
87e3b81b68 Merge branch 'develop' into feature/globebrowsing 2016-08-30 18:58:23 -04:00
Erik Broberg
1be37a9333 Add a simple abstract class for providing Tiles with text. Refactor ChunkIndexTileProvider 2016-08-30 18:15:00 -04:00
Alexander Bock
04f206da76 Compile fix in globebrowsing 2016-08-29 10:00:45 +02:00
Alexander Bock
dfa0709b11 More work into removing gdal dependency to libOpenspace 2016-08-29 02:12:33 +02:00
Alexander Bock
a798a7aae7 Remove gdal include from TileDataset header 2016-08-29 01:32:21 +02:00
Alexander Bock
cb92b85081 Remove gdal include from TileProvider
Add stack include to RenderEngine
2016-08-29 01:19:57 +02:00
Erik Broberg
23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg
09ad585be5 Rebase to feature/globebrowsing 2016-08-17 19:16:01 -04:00
Erik Broberg
1199acc7b9 Re-add and revert back to old ThreadPool. See ticket #128 2016-08-17 18:22:27 -04:00
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Erik Broberg
3cb519ad77 Fix bug where TileDataLayout is created based on an uninitialized variable 2016-08-16 22:20:13 -04:00
Erik Broberg
42dc2da6f1 Each TileProvider has its own files located in tile/tileprovider/ 2016-08-12 00:14:13 -04:00
Erik Broberg
06dcc05729 Fix un-added file to previous commit 2016-08-11 22:12:34 -04:00
Erik Broberg
6cb3dd1fea Update AsyncTileReader according to new features of ghoul::ThreadPool 2016-08-11 22:04:15 -04:00
Erik Broberg
1dd569a3e1 Solve merge conflicts and fix bug in LayeredTextureUniformProvider 2016-08-11 17:05:14 -04:00
Alexander Bock
662e25963b Move ThreadPool class from OpenSpace into Ghoul 2016-08-03 10:58:53 +02:00
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock
06a5336961 Fix debugging with Clang
Removed include of vertex operations in fragment shader
2016-08-02 11:39:57 +02:00
Alexander Bock
67e8608581 Use the include paths to search for gdal_priv.h 2016-07-26 17:00:29 +02:00
Alexander Bock
0062276d45 Fix case for TileProviderManager 2016-07-26 16:05:03 +02:00
Erik Broberg
f4fa144606 Use shorter struct name. Previous name caused linker error LNK1179 2016-07-21 16:57:48 -04:00
Erik Broberg
7568912a7d Bounding chunk heights considers multiple heightmaps and handles missing data 2016-07-15 18:56:03 -04:00
Erik Broberg
d06c470636 Fix bounding heights (used for culling) for chunks with heightmap overlays 2016-07-15 13:48:00 -04:00
Erik Broberg
61928e83cd Make ChunkedLodGlobes able to fully reset their data sets 2016-07-14 01:13:26 -04:00
Erik Broberg
7e2e2cf2f4 Enable selecting highest resolution tile from a TileProviderGroup 2016-07-14 01:00:21 -04:00
nusic
f8bcd71bf4 Factor out creation of plain tiles to static method in Tile 2016-07-13 18:26:19 -04:00
nusic
5f2d692230 Fix: last commit did not consider the updated FontRenderer interface 2016-07-13 14:22:36 -04:00
nusic
c2488b6d8a Add ChunkIndexTileProvider to dynamically render chunk indices on tiles 2016-07-13 13:43:12 -04:00
Erik Broberg
f1d8e42dff Add TileProviderGroup and use to represent tile provides in same category 2016-07-12 14:59:35 -04:00
Erik Broberg
edf114cda2 Enable resetting tile providers from GUI, i.e. reloading tiles 2016-07-12 11:20:57 -04:00
Erik Broberg
bb344a57af Increase default tile provider cache size 2016-07-10 19:49:08 -04:00
Erik Broberg
5f0a5c2274 Merge 2016-07-09 17:38:57 -04:00
Erik Broberg
de3d76a30b Add PixelRegion methods 2016-07-09 17:37:36 -04:00
Kalle
36531a42af Solve merge conflict from previous filter. 2016-07-08 19:26:29 -04:00
Kalle
7bfdbedcd1 Change ordering of layer categories 2016-07-08 13:45:59 -04:00