Erik Broberg 7377d098cc Solve merge conflict

2016-06-08 00:36:35 -04:00

..

asynctilereader.cpp

Merge similar structs RawTileData and TileIOResult

2016-06-07 21:16:43 -04:00

asynctilereader.h

The tile retrieval stack uses dependency injection to for easier reconfiguration

2016-05-27 16:59:10 -04:00

concurrentjobmanager.h

The tile retrieval stack uses dependency injection to for easier reconfiguration

2016-05-27 16:59:10 -04:00

concurrentjobmanager.inl

Added templated ConcurrentJobManager to manage specific tasks in a separate thread

2016-04-27 19:22:39 -04:00

concurrentqueue.h

Factored out async reading from tile data provision, creating an endpoint for future disk caching of tile

2016-05-26 18:17:20 -04:00

distanceswitch.cpp

Restructure files in folders

2016-04-25 13:58:32 -04:00

distanceswitch.h

Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable

2016-05-11 16:10:39 -04:00

layeredtextureshaderprovider.cpp

Remove option to toggle use of height map and color texture and fix related crash bug.

2016-06-07 18:36:01 -04:00

layeredtextureshaderprovider.h

Remove option to toggle use of height map and color texture and fix related crash bug.

2016-06-07 18:36:01 -04:00

lrucache.h

Commented code to test tile loading with concurrent job manager. Texture Loader does not allow multithreading

2016-04-28 12:42:58 -04:00

lrucache.inl

Commented code to test tile loading with concurrent job manager. Texture Loader does not allow multithreading

2016-04-28 12:42:58 -04:00

temporaltileprovider.cpp

Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status

2016-06-07 23:13:54 -04:00

temporaltileprovider.h

Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status

2016-06-07 23:13:54 -04:00

threadpool.cpp

Removed unused include of atomic - avoids annoying comiler warnings

2016-05-20 17:03:25 -04:00

threadpool.h

Removed unused include of atomic - avoids annoying comiler warnings

2016-05-20 17:03:25 -04:00

tiledataset.cpp

Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status

2016-06-07 23:13:54 -04:00

tiledataset.h

Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status

2016-06-07 23:13:54 -04:00

tileprovider.cpp

Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status

2016-06-07 23:13:54 -04:00

tileprovider.h

Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status

2016-06-07 23:13:54 -04:00

TileProviderManager.cpp

Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status

2016-06-07 23:13:54 -04:00

TileProviderManager.h

Do Time -> TileProvider mapping only once per frame

2016-06-06 14:25:37 -04:00