Commit Graph

327 Commits

Author SHA1 Message Date
Alexander Bock
c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Alexander Bock
af672b6a4e - Update Ghoul reference
- Remove not needed cmake files
- Make ConcurrentJobManager compile again
2016-08-11 11:12:15 +02:00
Alexander Bock
662e25963b Move ThreadPool class from OpenSpace into Ghoul 2016-08-03 10:58:53 +02:00
Alexander Bock
f4f4e7de9e More Jenkins compile fixes 2016-07-27 11:01:58 +02:00
Alexander Bock
60ce1872bd Include correct directory for GDAL on non-Win32 systems 2016-07-27 09:25:17 +02:00
Alexander Bock
67e8608581 Use the include paths to search for gdal_priv.h 2016-07-26 17:00:29 +02:00
Alexander Bock
0062276d45 Fix case for TileProviderManager 2016-07-26 16:05:03 +02:00
Alexander Bock
9705c33c16 Disable default module setting for galaxy, globebrowsing, and multiresvolume
Update Ghoul repository
2016-06-24 10:55:49 +02:00
Alexander Bock
37e18441dc Support GDAL on non-Windows platforms
Fix compile fix with TileProviderManager
Fix projection error on PlanetProjection
2016-06-22 08:51:58 +02:00
Alexander Bock
f7502de92f Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 22:06:58 +02:00
Kalle Bladin
dd70733c2a Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable. 2016-06-17 15:52:32 -04:00
Alexander Bock
c3eda5e4e6 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 21:37:43 +02:00
Kalle Bladin
153d239790 Catch exceptions when not able to read a GDAL dataset. 2016-06-17 13:07:15 -04:00
Kalle Bladin
101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Alexander Bock
cbb7a3e1db Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 11:31:17 +02:00
Erik Broberg
5dcddfe5e9 Separate tile selection from tile provision 2016-06-16 00:08:13 -04:00
Erik Broberg
5451951146 Add decrement operators in ChunkIndex for calculation of parent index 2016-06-16 00:03:25 -04:00
Erik Broberg
faec017cef Make Chunk bounding polyhedron fully, but still not tightly, encapsulate the chunk 2016-06-15 14:27:14 -04:00
Erik Broberg
fa3671eb4a Improve GeodeticPatch interface by allowing getting min/max lat/lon 2016-06-15 14:25:32 -04:00
Erik Broberg
bfd2441eaa Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 23:19:45 -04:00
Erik Broberg
abbede263f Enabling toggling rendering of bounding Chunk volumes from GUI 2016-06-14 23:19:28 -04:00
Erik Broberg
d635b852a7 Remove old debugrenderer 2016-06-14 23:12:29 -04:00
Erik Broberg
ad73cb0627 Enable iteration over ChunkNodes, not just Chunks 2016-06-14 22:05:03 -04:00
Erik Broberg
454e19dd83 Add method getBoundingPolyhedronCorners in Chunk class 2016-06-14 21:42:44 -04:00
Alexander Bock
abdb666660 Update GDAL library 2016-06-14 22:57: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
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
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
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
0ef0343efd Toggle show chunk edges from gui and calculate level weights only once per vertex 2016-06-09 17:14:46 -04:00