Commit Graph

1251 Commits

Author SHA1 Message Date
Kalle Bladin 4a9d03c54f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 13:57:33 -04:00
Erik Broberg d06c470636 Fix bounding heights (used for culling) for chunks with heightmap overlays 2016-07-15 13:48:00 -04:00
Kalle Bladin ae9560332b Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 13:04:00 -04:00
Erik Broberg c25d1cdc88 Enable GUI toggling of visualization of heightmap resolution and intensities 2016-07-14 17:09:35 -04:00
Erik Broberg e13c4c2162 Make desired level from projected area work (i.e. not get zero area) around the poles 2016-07-14 13:28:53 -04:00
Erik Broberg a77c7466cb Factor out tile vertex height calculation to separate shader file 2016-07-14 13:00:25 -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
Kalle Bladin 2e0bc756cb Solve bug with black texture data between grayscale overlays. 2016-07-13 23:33:00 -04:00
Erik Broberg 938843cda4 Include powerscaling_fs for abuffer rendering. Visualize heightmap overlay resolution 2016-07-13 20:31:59 -04:00
nusic 0958babaae Refactor out common frag shader code between between local and global rendering 2016-07-13 19:49:29 -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
Kalle Bladin 98a142e96d Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-13 13:46:02 -04:00
nusic f4f0e53b2c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-13 13:44:11 -04:00
nusic c2488b6d8a Add ChunkIndexTileProvider to dynamically render chunk indices on tiles 2016-07-13 13:43:12 -04:00
Kalle 8fcaaf2799 Merge remote-tracking branch 'origin/develop' into feature/globebrowsing 2016-07-13 12:09:02 -04:00
Kalle 2c005406fd Fix horizon culling bug 2016-07-13 11:49:57 -04:00
Erik Broberg 828ec96251 Remove debugoption limitedByAvailableData from GUI 2016-07-12 15:46:41 -04:00
Erik Broberg 23fcaee67d Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-12 15:36:16 -04:00
Erik Broberg 6a482d4189 Improve dynamic limit of chunk level by available tile data 2016-07-12 15:34:51 -04:00
Kalle 703ab140c1 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-12 15:02:10 -04:00
Kalle 6e827e4337 Change back scene to use debug globe. 2016-07-12 15:01:54 -04:00
Erik Broberg f1d8e42dff Add TileProviderGroup and use to represent tile provides in same category 2016-07-12 14:59:35 -04:00
Kalle 916916f82b Fix bug that caused change in camera direction when switching between interaction mode. 2016-07-12 14:52:00 -04:00
Erik Broberg 0d1c042b0e Improve performance of chunk level evaluator by projected area 2016-07-12 13:10:20 -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 1d94dfeb1b Prep presentation 2016-07-11 16:53:02 -04:00
Erik Broberg bb344a57af Increase default tile provider cache size 2016-07-10 19:49:08 -04:00
Erik Broberg 1e4247b80b Reduce value rnage of delta time slider in GUI 2016-07-10 18:15:05 -04:00
Alexander Bock 0228ca241b Add Juno scene and scenegraphnodes
Enable ability to apply a rotation matrix to the rotation vector to accomodate for model misalignments
2016-07-10 09:40:30 +02: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
Kalle 6c10e89ec0 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-08 13:20:19 -04:00
Kalle 8ec942d87a Solve bug by removing unnecessary assert in IODescription cut. 2016-07-08 13:19:41 -04:00
Kalle 60ca7db7a1 Merge commit 'eb34ad7aedf4450cdd59c1c6fcb5d66ed9e4eab0' into feature/globebrowsing 2016-07-08 13:00:03 -04:00
Kalle 6cb1eca56e Merge commit 'f4bb21d56b85f7ae00a6374ff731556e33315b69' into feature/globebrowsing 2016-07-08 12:53:05 -04:00
Kalle c4de82ef6b Merge commit '87299a178e175a7bbc5bc88912a6fdb9342bfa58' into feature/globebrowsing 2016-07-08 12:49:33 -04:00
Erik Broberg dd507d79dc Lazy init default tiles. Make TemporalTileProviders only use one default tile 2016-07-08 12:46:46 -04:00
Erik Broberg 35347b2d8d Lazy init default tiles. Make TemporalTileProviders only use one default tile 2016-07-08 12:46:46 -04:00
Kalle b66c597930 Merge commit '4298677f776393f9eb1444b6a35a93cc38f59e10' into feature/globebrowsing 2016-07-08 12:46:10 -04:00
Kalle fb96679042 Merge commit '2264a37327786f31392486be4658a643a92f45e8' into feature/globebrowsing 2016-07-08 12:43:23 -04:00
Kalle 3985dea808 Height map overlay working but needs to be used for height sampling on cpu. 2016-07-08 12:42:41 -04:00
Erik Broberg 3bc91bdf16 Enable getting a default tile from TileProviders. Used e.g. when no tiles are in memory 2016-07-08 12:30:19 -04:00
Erik Broberg cb78456739 Enable getting a default tile from TileProviders. Used e.g. when no tiles are in memory 2016-07-08 12:30:19 -04:00
Kalle fd05a88419 Create new layer category heightmap overlay used for local datasets with alpha channel. 2016-07-07 20:59:02 -04:00
Erik Broberg a5030ee664 Add method to create empty tile 2016-07-07 19:45:00 -04:00
Erik Broberg 67a18c723d Add method to create empty tile 2016-07-07 19:45:00 -04:00