 Kalle Bladin
|
627b8e635b
|
Activated texture layers can be set from mod file.
|
2016-06-14 14:00:21 -04:00 |
|
|
Kalle Bladin
|
88555a1e1b
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-14 00:20:55 -04:00 |
|
|
Kalle Bladin
|
0b7ce79e80
|
Collapse layer category rendering code in to for loop.
|
2016-06-14 00:20:37 -04:00 |
|
|
Erik Broberg
|
5b3725806f
|
Improve desired level by projected area
|
2016-06-13 23:32:24 -04:00 |
|
|
Kalle Bladin
|
164e133ce9
|
Update tileprovidermanager to loop through texture categories.
|
2016-06-13 22:17:15 -04:00 |
|
|
Erik Broberg
|
8eb3621e03
|
Make limiting chunk level by available height data togglable from GUI
|
2016-06-13 21:40:14 -04:00 |
|
|
Erik Broberg
|
f91ea449a5
|
avoid an unnecessary hashmap access
|
2016-06-13 19:12:39 -04:00 |
|
|
Erik Broberg
|
d3f3c9768c
|
Remove redundant safety check in LRU cache hashmap
|
2016-06-13 19:10:50 -04:00 |
|
|
Kalle Bladin
|
b5f1a09b8c
|
Cache uniform IDs upon recompiling of shader programs. Renaming of uniforms in shader code.
|
2016-06-13 18:57:18 -04:00 |
|
|
Erik Broberg
|
ebdb906adf
|
Make desired chunk level by distance calculation taking into account the chunks bounding height
|
2016-06-13 18:32:50 -04:00 |
|
|
Erik Broberg
|
f850aa53e6
|
Make it easy to compare desiredChunkLevel approaches through a simple common interface
|
2016-06-13 18:15:30 -04:00 |
|
|
Erik Broberg
|
84e6e9a7af
|
Modularize desired chunk level calculation for easy testing of different approaches
|
2016-06-13 16:30:22 -04:00 |
|
|
Erik Broberg
|
ff3ac1b368
|
Add Intersection test between ConvexHull2s, based on Separate Axis Theorem
|
2016-06-10 15:03:51 -04:00 |
|
|
Erik Broberg
|
2c89f36cbe
|
Add class ConvexHull2
|
2016-06-10 13:49:50 -04:00 |
|
|
Kalle Bladin
|
144191ba51
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-10 12:02:34 -04:00 |
|
|
Kalle Bladin
|
75e8e04e3d
|
Set max length of skirts and fix problem with toggeling of overlay.
|
2016-06-10 12:02:25 -04:00 |
|
|
Erik Broberg
|
795846f6ee
|
Updated file structure and removed unused class GlobeMesh
|
2016-06-10 11:53:26 -04:00 |
|
|
Erik Broberg
|
b7f4398f33
|
Add calculation of desired chunk level based on projected chunk area
|
2016-06-09 23:18:58 -04:00 |
|
|
Erik Broberg
|
3cc2733aad
|
Merge branch 'feature/globe-atmosphere' into feature/globebrowsing
|
2016-06-09 19:59:52 -04:00 |
|
|
Erik Broberg
|
f64998b517
|
Fix CMake and add MultiLevelTile
|
2016-06-09 19:58:54 -04:00 |
|
|
Erik Broberg
|
13c57f4931
|
Merge branch 'feature/globe-atmosphere' of github.com:OpenSpace/OpenSpace-Development into feature/globe-atmosphere
|
2016-06-09 18:29:25 -04:00 |
|
|
Erik Broberg
|
0ef0343efd
|
Toggle show chunk edges from gui and calculate level weights only once per vertex
|
2016-06-09 17:14:46 -04:00 |
|
|
Kalle Bladin
|
2951df9653
|
Simplify interface for TileProviderManager.
|
2016-06-09 16:09:43 -04:00 |
|
|
Jonathas Costa
|
b8025d8c23
|
New ray ellipsoid intersection routine (initial implementation).
|
2016-06-09 16:03:28 -04:00 |
|
|
Jonathas Costa
|
36157e81fa
|
Merge branch 'feature/globe-atmosphere' of https://github.com/OpenSpace/OpenSpace-Development into feature/globe-atmosphere
|
2016-06-09 15:21:15 -04:00 |
|
|
Jonathas Costa
|
da956af2bc
|
Update matrix type in atmosphere (new issues present to be fixed).
|
2016-06-09 15:21:12 -04:00 |
|
|
Erik Broberg
|
25d02086a1
|
Use separate function for getting level weights
|
2016-06-09 14:18:39 -04:00 |
|
|
Erik Broberg
|
7ac8e37807
|
Rename TextureTile to Tile in shader for better correspondance with its CPU counterpart
|
2016-06-09 13:22:44 -04:00 |
|
|
Erik Broberg
|
bc19a826bf
|
Factor out tile texture sampling
|
2016-06-09 12:44:16 -04:00 |
|
|
Jonathas Costa
|
b2c895dab0
|
Merged branch Atmosphere.
|
2016-06-09 11:45:56 -04:00 |
|
|
Kalle Bladin
|
99a06b88a4
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-08 22:38:58 -04:00 |
|
|
Kalle Bladin
|
ebdcfcfa44
|
Update water rendering.
|
2016-06-08 22:38:43 -04:00 |
|
|
Erik Broberg
|
b9c4c80491
|
Use preprocessed chunk bounding heights for chunk culling when possible
|
2016-06-08 22:03:29 -04:00 |
|
|
Kalle Bladin
|
2fc61dcf6d
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-08 21:44:58 -04:00 |
|
|
Kalle Bladin
|
bd5b0de144
|
fix crash bug for local rendering.
|
2016-06-08 21:43:36 -04:00 |
|
|
Kalle Bladin
|
3980aeff57
|
Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere.
|
2016-06-08 21:30:19 -04:00 |
|
|
Erik Broberg
|
37b500b001
|
FrustumCuller and HorizonCullers implements virtual ChunkCuller and managed by ChunkedLodGlobe
|
2016-06-08 19:59:45 -04:00 |
|
|
Erik Broberg
|
1f1c02d42a
|
Remove patchrenderer.cpp
|
2016-06-08 18:04:06 -04:00 |
|
|
Erik Broberg
|
22acf6b529
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-08 18:02:11 -04:00 |
|
|
Erik Broberg
|
0fff28f53d
|
Remove baseclass PatchRenderer and rename patchrenderer.* to chunkrenderer.*
|
2016-06-08 18:01:54 -04:00 |
|
|
Kalle Bladin
|
b84f5cfc05
|
Merge branch 'feature/globebrowsing' into feature/globe-atmosphere
|
2016-06-08 17:42:38 -04:00 |
|
|
Kalle Bladin
|
5e9fb5b05b
|
Commented away use of border overlay.
|
2016-06-08 17:41:58 -04:00 |
|
|
Erik Broberg
|
ba52acd270
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-08 15:13:28 -04:00 |
|
|
Erik Broberg
|
bf5f353972
|
Factor out a lot of common code in ChunkRenderer
|
2016-06-08 15:13:04 -04:00 |
|
|
Kalle Bladin
|
884d09f733
|
Merge branch 'feature/globebrowsing' into feature/globe-atmosphere
|
2016-06-08 12:51:27 -04:00 |
|
|
Kalle Bladin
|
869be5dc44
|
Add glsl function to calculate intersection of ellipsoid.
|
2016-06-08 12:50:33 -04:00 |
|
|
Kalle Bladin
|
562e249dc9
|
Merge branch 'develop' into feature/globebrowsing
|
2016-06-08 12:32:31 -04:00 |
|
|
Erik Broberg
|
3c0aa69b16
|
Move call to TileProviderManager::prerender() from patchrenderer to RenderableGlobe
|
2016-06-08 12:05:38 -04:00 |
|
|
Kalle Bladin
|
f5ecb76358
|
Fox compilation error for OSX
|
2016-06-08 11:02:09 -04:00 |
|
|
Emil Axelsson
|
73ceaafd13
|
merge
|
2016-06-08 15:02:10 +02:00 |
|