Commit Graph

75 Commits

Author SHA1 Message Date
Kalle Bladin 8a617ee254 Feature/globebrowsing (#281)
* Solve bug related to corrupted texture tiles for certain sizes.

* Regard layer settings when sampling height map.

* Make Tile in to a class instead of a struct.

* Memory aware lru cache. Needs cleanup.

* Clean up and comment.

* Clean up and comment.

* Clean up

* Clean up and comment.

* Fix compilation error on Windows.

* Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242

* Update the key type for the memory aware lru cache and use a unordered map instead of a map.

* Solve pixel row size bug.

* Solve initialization bug.

* Add cache size as property of the globe browsing module.

* Use memory aware tile cache for text tile provider.

* Log GDAL errors as GHOUL messages

* Add the ability to toggle tile level limiting by available data

* Add ability to toggle GDAL logging

* Add lock guard to memory aware tile cache

* create base class rawtiledatareader that can be extended with different implementations than GDAL.

* Let GdalWrapper take care of global GDAL settings.

* Move iodescription to separate file

* Move some functionality from gdalrawtiledatareader to rawtiledatareader

* Move functionality from gdalrawtiledatareader to rawtiledatareader.

* GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed.

* Add ifdef check for GLOBEBROWSING_USE_GDAL

* Implement SimpleRawTileDataReader. Currently can only read pow 2 textures.

* Change ints to unsigned long longs

* Limit number of texture creations per tile provider per frame

* Solve linker error on windows

* Fix Windows build errors

* Fix crash in reading local patches

* Update lodglobe descriptions

* Abstract away overviews in gdal raw tile data reader

* Update Mars and Moon configs.

* Update screenshot script

* Update ghoul version

* Remove use of interaction depth below ellipsoid

* Normalize direction vector

* Use scale for distance swotch

* Go back to use of interaction depth below ellipsoid

* Fix comments on pull request.

* TileProviderByLevel error does not propagate up.

* Comment on mars and moon mod file

* Add model space cut off level as a property

* Update ChunkTile struct

* Minor clean up

* Go back tu constructor for ChunkTile
2017-04-13 10:14:47 +02: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 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
kalbl 0df09d23ad Add possibility to switch geographic position 2016-11-29 13:29:02 +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
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 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
kalbl 4548394f1c Clean up and document functions in globes. 2016-10-27 15:29:41 +02:00
Erik Broberg 21b41e3ec0 Clean up and remove unused code 2016-10-26 14:40:35 +02:00
Erik Broberg a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg 92ae076c51 Refactor CPU and GPU layer rendering settings 2016-10-25 16:35:49 +02:00
kalbl 7e0e913131 Remove pointglobe from renderableglobe 2016-10-20 16:01:34 +02:00
Erik Broberg ee9bb36a06 TileProviderManager -> LayerManager. Fix shader recompilation bug 2016-10-19 16:10:56 +02:00
kalbl 7f62bd7206 Create namespace globebrowsing. 2016-10-18 15:40:27 +02:00
kalbl 0f452b8f8b Comment and document code. 2016-10-17 16:16:50 +02:00
kalbl d7ce3cabaf Add new distance switch value PointGlobe. 2016-10-15 15:34:46 +02:00
kalbl 670497c16d Update file structure in globebrowsing 2016-10-15 13:22:22 +02:00
kalbl 2f13b9e9f4 Simplify the ability to add more per layer settings and move layered rendering src files to separate folder. 2016-10-15 03:04:09 +02:00
kalbl da947cab7e Add the settings properties gamma and multiplier to RenderableGlobe textures. 2016-10-04 00:52:18 +02:00
kalbl 423c55ba38 Update structure of properties for renderable globes. 2016-10-02 21:30:26 +02:00
kalbl fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
Erik Broberg 5cf1a4fbe1 Enable per frame toggling of RenderableGlobes for multi node sync debugging 2016-09-01 15:31:38 -04:00
Alexander Bock dfa0709b11 More work into removing gdal dependency to libOpenspace 2016-08-29 02:12:33 +02:00
Kalle Bladin ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -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 dd01953f7c Enable disabling rendering of RenderableGlobe 2016-07-21 17:13:55 -04:00
Erik Broberg edf114cda2 Enable resetting tile providers from GUI, i.e. reloading tiles 2016-07-12 11:20:57 -04:00
Kalle Bladin 5651e5bb24 Fix clang build errors. 2016-07-01 20:54:22 -04:00
Kalle 3c7d1e22fc Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
Kalle Bladin ce72f57183 Minimum camera height above surface is now configurable. 2016-06-27 18:46:35 -04:00
Kalle Bladin e8fc2250d5 Clean up in interaction mode abd push camera to the surface of the heightmap. 2016-06-22 17:48:59 -04:00
Kalle Bladin cb4b6dbdf3 Clean up in code that clamps camera position to height map. 2016-06-22 13:55:02 -04:00
Kalle Bladin 9e80baa792 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-21 22:57:38 -04:00
Kalle Bladin 5e8018b715 Limit camera to not go below the ground in globebrowsing interaction mode. 2016-06-21 22:57:12 -04:00
Erik Broberg 953d8554dc Move commonly used GUI debug options to separate struct 2016-06-21 19:24:25 -04:00
Erik Broberg 14ea82d929 Remove unused GUI properties 2016-06-21 18:28:29 -04:00
Erik Broberg c7ff3a4730 Remove unused GUI property chunkHeight 2016-06-21 17:21:37 -04:00
Erik Broberg 9df878e237 Use smart pointers in ChunkLodGlobe and RenderableGlobe 2016-06-21 16:26:38 -04:00
Erik Broberg c24b768397 Clean up GUI code managing layer categories 2016-06-21 16:01:18 -04:00
Erik Broberg 974d5fdaec Solve merge conflict 2016-06-21 14:04:33 -04:00
Erik Broberg 57700da843 Add ReferencedBoolSelection to abstract away a lot of boilare plate code in GUI bool properties 2016-06-21 14:01:29 -04:00
Erik Broberg db6793f762 Make DebugRendering have its own SelectionProperty in GUI 2016-06-21 12:49:54 -04:00
Kalle Bladin 1ab25d5845 Add new layer category grayscale overlay and use it for mars ctx global map. 2016-06-21 12:26:52 -04:00
Kalle Bladin 101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Erik Broberg abbede263f Enabling toggling rendering of bounding Chunk volumes from GUI 2016-06-14 23:19:28 -04:00