 Erik Broberg
|
3df34be916
|
Add DebugRenderer enabling easy screen space point rendering
|
2016-06-14 18:16:43 -04:00 |
|
|
Alexander Bock
|
abdb666660
|
Update GDAL library
|
2016-06-14 22:57:30 +02:00 |
|
|
Alexander Bock
|
896d9bd1db
|
Merge remote-tracking branch 'origin/feature/iSWA' into release/ips
|
2016-06-14 22:52:30 +02:00 |
|
|
Kalle Bladin
|
69c0d7f464
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-14 14:00:33 -04:00 |
|
|
Kalle Bladin
|
627b8e635b
|
Activated texture layers can be set from mod file.
|
2016-06-14 14:00:21 -04:00 |
|
|
Sebastian Piwell
|
294773b2cb
|
Updated shaders
|
2016-06-14 13:53:24 -04:00 |
|
|
Sebastian Piwell
|
d368ad9054
|
Correct coordinate transformation
|
2016-06-14 13:33:55 -04:00 |
|
|
Erik Broberg
|
3d7722f4b1
|
Move ChunkLevelEvaluators classes to separate file
|
2016-06-14 11:19:22 -04:00 |
|
|
Erik Broberg
|
5025e09d77
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-14 10:32:16 -04:00 |
|
|
Michael Nilsson
|
0ce4b50855
|
updated ghoul reference
|
2016-06-14 10:08:24 -04:00 |
|
|
Erik Broberg
|
53870a7ef0
|
Add depth first search chunk iteration std::function as argument
|
2016-06-14 00:34:14 -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 |
|
|
Michael Nilsson
|
fd026dae53
|
only get selected datavalues from file
|
2016-06-13 17:59:36 -04:00 |
|
|
Michael Nilsson
|
546b1a9d92
|
another windows fix + disable update when enable equals false
|
2016-06-13 17:14:20 -04:00 |
|
|
Erik Broberg
|
84e6e9a7af
|
Modularize desired chunk level calculation for easy testing of different approaches
|
2016-06-13 16:30:22 -04:00 |
|
|
Michael Nilsson
|
b74782a103
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-13 16:28:19 -04:00 |
|
|
Michael Nilsson
|
86bcbfb92c
|
windows fix
|
2016-06-13 16:27:59 -04:00 |
|
|
Sebastian Piwell
|
04a0abf010
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-13 16:10:41 -04:00 |
|
|
Sebastian Piwell
|
c2a64df1c4
|
Processing speed test
|
2016-06-13 16:10:31 -04:00 |
|
|
Michael Nilsson
|
cdbe0ae1e0
|
solve merge conflict
|
2016-06-13 15:45:28 -04:00 |
|
|
Michael Nilsson
|
55e1850045
|
download texture resource ahead of time
|
2016-06-13 15:44:31 -04:00 |
|
|
Sebastian Piwell
|
afb54ea8d1
|
Do not process x,y,z variables in DataProcessorText
|
2016-06-13 14:17:34 -04:00 |
|
|
Sebastian Piwell
|
c0b0d45470
|
Linux compile fix
|
2016-06-13 13:50:38 -04:00 |
|
|
Sebastian Piwell
|
65bacf3119
|
Merge with develop
|
2016-06-13 13:30:26 -04:00 |
|
|
Sebastian Piwell
|
3e034b73bb
|
Solved merge conflict
|
2016-06-13 13:25:03 -04:00 |
|
|
Sebastian Piwell
|
661dd00129
|
Faster processing in DataProcessorText
|
2016-06-13 13:20:00 -04:00 |
|
|
Michael Nilsson
|
db9af4c886
|
abstracted cygnet properties to DataCygnet
|
2016-06-10 16:57:55 -04:00 |
|
|
Michael Nilsson
|
cb484f3ce5
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-10 15:48:46 -04:00 |
|
|
Michael Nilsson
|
1633d9048e
|
cleanup iswacygnet header, 90 degree rotation fix, small optimization
|
2016-06-10 15:48:34 -04:00 |
|
|
Sebastian Piwell
|
39f083c342
|
Every datacygnet uses own dimensions
|
2016-06-10 15:19:32 -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 |
|
|
Michael Nilsson
|
9800ca72be
|
change demo server cygnet ids
|
2016-06-10 11:53:05 -04:00 |
|
|
Sebastian Piwell
|
82fed8a9c5
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-10 11:51:39 -04:00 |
|
|
Sebastian Piwell
|
e2e5d39d3f
|
x data for new offset
|
2016-06-10 11:51:20 -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 |
|