Commit Graph

430 Commits

Author SHA1 Message Date
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
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
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
9327a34621 Handle repeated read where read and write regions have different sizes 2016-07-07 14:45:00 -04:00
Erik Broberg
79ad4a15cb TileDatasets are created with a const Configuration 2016-07-07 13:56:03 -04:00
Erik Broberg
a14e91c8db Clarify cached members in TileDataset 2016-07-07 13:11:10 -04:00
Erik Broberg
2923b4a698 Clean up initialization of TileDataset 2016-07-07 12:58:03 -04:00
Erik Broberg
b6237387d5 Use HSV for grayscale overlay. Add method TileDataset::pixelToGeodetic 2016-07-06 16:51:50 -04:00
Erik Broberg
7ebd4f55b6 No-overview datasets use virtual overview to downsample write region. Ensure tiles have even number of pixels 2016-07-06 11:57:20 -04:00
Erik Broberg
3e2166e145 Add moon height and color WMS 2016-07-05 21:44:05 -04:00
Erik Broberg
927dc531eb Remove IODescription implementation from h file, and add comment to PixelRegion 2016-07-05 17:17:40 -04:00
Erik Broberg
c193054669 Move definition of PixelRegion to separate file 2016-07-05 16:56:00 -04:00
Erik Broberg
cf37999128 Use texture tile padding 2016-07-05 13:35:14 -04:00
Erik Broberg
63a046ba14 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-05 13:12:17 -04:00
Erik Broberg
b95444e0c3 Implement repeat wrap mode on pixel read regions before performing gdal RasterIO 2016-07-05 13:11:38 -04:00
Kalle Bladin
d784984083 Fix clang build errors. 2016-07-01 20:54:22 -04:00
Kalle
4b3b6e8a76 Fix invisible earth. 2016-07-01 17:55:56 -04:00
Kalle
c674996397 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-01 17:43:19 -04:00
Kalle
83881e33b2 GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels 2016-07-01 17:42:49 -04:00
Kalle
3f1f5be712 Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
Erik Broberg
0f1d014b0e Handle GDAL flipped Y axis in rasterIO call. Add alternate readImageData method 2016-07-01 01:06:58 -04:00
Erik Broberg
ea10a9e9f5 Refactor TileDataset - divide code into more easily overviewable sections 2016-06-30 22:23:39 -04:00
Erik Broberg
c94c7999f4 Use globebrowsing scene 2016-06-30 20:54:20 -04:00
Erik Broberg
f0719af55e Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-30 18:39:16 -04:00
Erik Broberg
2b938f095b Structure IODescription in read and write sub structs. Cleanup 2016-06-30 18:38:54 -04:00
kbladin
e8cfd8eee4 Solve crashing in deinitialization of debug renderer. 2016-06-30 18:12:21 -04:00
Erik Broberg
aa36e6da00 Move GDAL read and write meta data to separate struct IODescription 2016-06-30 17:32:26 -04:00
kbladin
4bec28d611 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-30 14:08:08 -04:00
kbladin
a89f474502 Solve merge conflict and add properties for friction and interaction parameters. 2016-06-30 14:07:51 -04:00
Erik Broberg
d9d97b2dbd Correctly visualize texture tile resolution and pixel positions 2016-06-30 13:25:22 -04:00
Erik Broberg
8ac517e89c Cleanup 2016-06-30 12:15:12 -04:00
Erik Broberg
1b6d17575b Replace GdalDataRegion with more general class PixelRegion 2016-06-30 11:33:09 -04:00
Erik Broberg
5030465bb8 Add a local test texture and a new TileProvider severing a single tile 2016-06-29 15:18:25 -04:00
Erik Broberg
1d856151ed Implement and use factory pattern for TileProvider instantiation 2016-06-29 13:47:11 -04:00
Erik Broberg
5896d7eb71 Dont read padded texture tiles atm.. 2016-06-29 13:45:36 -04:00
Erik Broberg
072a97ee10 Make TileProviders default to disabled if unspecified in mode file 2016-06-29 12:41:36 -04:00
Erik Broberg
fd95871825 Improve TileProvider interface by removing getAsyncReader() 2016-06-29 11:31:50 -04:00
Erik Broberg
992c828cce Render vertex and heightmap resolution. Fix offsetted pixel read bug in TileDataset 2016-06-29 00:32:25 -04:00
Erik Broberg
626350b0dd Add GLSL function to compensate for GDAL sampling offset 2016-06-28 21:35:33 -04:00
Erik Broberg
3e53ff45b0 Visualize grid resolution when base layers are disabled 2016-06-28 19:28:54 -04:00
Erik Broberg
cdc3daedca Clear up some code in TileDataset 2016-06-28 18:35:35 -04:00
Erik Broberg
dd8bdc69b7 Move tile datatype related stuff to separate file 2016-06-28 11:59:19 -04:00
Erik Broberg
81676ed98f Move TileIOResult to separate file 2016-06-28 11:18:57 -04:00
Erik Broberg
ddf7342563 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-28 11:03:41 -04:00
Kalle Bladin
fcaee68424 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-27 20:18:02 -04:00
Erik Broberg
a9f7cf5444 DataCollector: Collect current time in millis and use long longs for integers 2016-06-27 19:18:54 -04:00