Emil Axelsson
5e2ea10bcd
Add http proxy support for GDAL
2016-10-07 20:42:32 +02:00
Alexander Bock
329986c0c6
Merge branch 'develop' into feature/globebrowsing
...
Conflicts:
modules/base/scale/staticscale.cpp
modules/base/scale/staticscale.h
modules/globebrowsing/meshes/trianglesoup.h
modules/globebrowsing/tile/tiledataset.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
Alexander Bock
d3f7139f5e
Merge branch 'feature/globebrowsing' into syncing
...
Conflicts:
modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
openspace.cfg
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
2016-09-20 14:48:28 +02:00
Alexander Bock
1b4b0f49b6
Update SGCT
2016-09-20 10:11:59 +02:00
Kalle Bladin
80a9dfd431
Document LayeredTextureShaderProvider
2016-09-15 15:22:39 -04:00
Kalle Bladin
f9e88fb40c
Fix bug that caused black screen when unable to load gdal dataset.
2016-09-15 12:49:34 -04:00
Erik Broberg
a11f16a0b3
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-09-14 21:17:19 -04:00
Kalle Bladin
2c5c29ce9c
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-09-14 20:08:46 -04:00
Kalle Bladin
7a22763143
Remove texture cateory HeightMapOverlays
2016-09-14 20:08:33 -04:00
Erik Broberg
c08299ea58
Add Doxygen comments for TextTileProviders
2016-09-14 19:35:55 -04:00
Erik Broberg
5e801f04f0
Replace start and end time in TemporalTileProvider with TimeRange
2016-09-14 19:26:45 -04:00
Erik Broberg
775088dc4d
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-09-14 18:57:59 -04:00
Erik Broberg
f7567839ad
Clean up and add Doxygen documentation for TemporalTileProvider
2016-09-14 18:57:46 -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
9196ec2f50
Remove local, shared, synced versions of Time. Keep one source of true
2016-09-03 19:45:58 -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
