mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,978 Commits 83 Branches 46 Tags
08aea81e1e5246f76dbd103954635cd257af9780
Commit Graph

156 Commits

Author SHA1 Message Date
Alexander Bock
777e6c628f Change tabs to spaces 2016-12-03 01:21:54 +01:00
kalbl
0df09d23ad Add possibility to switch geographic position 2016-11-29 13:29:02 +01:00
Alexander Bock
328f57fb20 Fix error with pow being undefined when newValue becomes negative 
Add wms.itn.liu.se as main server for CTX and Mola for Mars
 2016-11-24 21:07:19 +01:00
Erik Broberg
9f7e1e05b2 Merge in feature/globebrowsing 2016-10-26 19:16:37 +02:00
Erik Broberg
6104b1fb58 Change ColorTextures to ColorLayers etc 2016-10-26 18:49:51 +02:00
Erik Broberg
9f65907579 Refactor chunk rendering related class names and file structure 2016-10-26 18:15:31 +02:00
kalbl
d2539b7ac5 Solve bug that caused chunk splitting to not match up with layer blending. 2016-10-25 19:39:29 +02:00
Erik Broberg
a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg
d03093d1e9 Layers have LayerRenderingSetting which syncs to GPU automatically 2016-10-24 20:17:05 +02:00
Erik Broberg
0bdb22cc3a Refactor: CPU to GPU mapping of all Layer data 2016-10-24 12:22:23 +02:00
Erik Broberg
bfbd331cdf Intermediate commit: Pre gpu layer refactorization 2016-10-21 15:19:59 +02:00
Erik Broberg
1df163a3b9 Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working 2016-10-21 13:49:44 +02:00
Erik Broberg
fd6dd16417 Intermediate commit: pre shader refactorization 2016-10-20 18:54:44 +02:00
Erik Broberg
2af1731583 Simple mapping of structs on CPU to GPU. See gpuChunkTilePile 2016-10-20 10:17:40 +02:00
Emil Axelsson
b87539f678 Fix const-correctness in shaders and add texture init data 2016-10-20 09:39:49 +02:00
kalbl
8e972ff7d6 Account for tile pixel start offset and size difference when calculating height on globe. 2016-10-18 17:21:05 +02:00
Erik Broberg
612980974e GSLS TextureLayerSettings supports signed data 2016-10-17 15:33:16 +02:00
kalbl
d7ce3cabaf Add new distance switch value PointGlobe. 2016-10-15 15:34:46 +02:00
kalbl
ba8066c3ed Fiddle with shaded rendering of globes 2016-10-13 21:12:12 +02:00
kalbl
da947cab7e Add the settings properties gamma and multiplier to RenderableGlobe textures. 2016-10-04 00:52:18 +02:00
kalbl
bacd189d8c Add per layer settings for shading. Includes opacity. 2016-10-03 12:29:50 +02:00
kalbl
619048e3b9 Add texture category GrayScaleTexture for textures with one channel. 2016-09-30 01:39:43 +02:00
kalbl
fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
Kalle Bladin
7a22763143 Remove texture cateory HeightMapOverlays 2016-09-14 20:08:33 -04:00
Kalle Bladin
82618bfd99 Improve temporary atmosphere rendering 2016-09-06 20:32:49 -04:00
Kalle Bladin
e55cbaff8c Normalize surface normal in for Rednerable globe shader and enable water mask and night texture for LodEarth in osirisrex. 2016-08-29 13:48:05 -04:00
Kalle Bladin
14aad40e6c Fix bug that caused crash when switching on and off night textures and water masks for RenderableGlobe 2016-08-25 13:50:46 -04:00
Kalle Bladin
850ccb6d3c Update rendering of shadow texture and water mask in RenderableGlobe. 2016-08-25 00:00:22 -04:00
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Erik Broberg
e832b953c1 Reenable showing height intensities and resolution (after commit 06a5336961) 2016-08-02 18:09:14 -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
Kalle Bladin
1d9aab6e63 Remove datasets from debugglobe.mod 2016-07-15 18:57:03 -04:00
Kalle Bladin
403ecd8209 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 17:13:05 -04:00
Erik Broberg
a2cd9bc19d Add static const CHUNK::DEFAULT_HEIGHT to avoid magic numbers in code 2016-07-15 14:21:29 -04:00
Kalle Bladin
4a9d03c54f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 13:57:33 -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
a77c7466cb Factor out tile vertex height calculation to separate shader file 2016-07-14 13:00:25 -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
Erik Broberg
1d94dfeb1b Prep presentation 2016-07-11 16:53:02 -04:00
Kalle
36531a42af Solve merge conflict from previous filter. 2016-07-08 19:26:29 -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
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