Commit Graph

1034 Commits

Author SHA1 Message Date
Alexander Bock e1460575f5 Reenable up-vector definition in RenderablePlanetProjection 2016-06-17 16:49:04 +02:00
Alexander Bock f2347a5f56 Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-17 11:31:33 +02:00
Alexander Bock cbb7a3e1db Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 11:31:17 +02:00
Alexander Bock 3d4e1ec19c Merge branch 'develop' into release/ips
Conflicts:
	tests/main.cpp
2016-06-17 11:31:11 +02:00
Michael Nilsson f9411385d6 remove unnecessary includes from dataprocessor 2016-06-16 16:56:30 -04:00
Michael Nilsson 35c3d3ce8b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-16 14:40:39 -04:00
Michael Nilsson 268ca0ea75 change method for adding data values in dataprocessortext 2016-06-16 14:40:26 -04: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
Alexander Bock 78f3b42c3b Started cleanup of ScreenSpaceImage 2016-06-16 01:22:30 +02:00
Alexander Bock 77c8ecf6df Rename screnspace* to screenspace shaders 2016-06-16 01:02:13 +02:00
Alexander Bock ad1893fd6f Cleanup of ScreenSpaceRenderable
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Alexander Bock 4fc838cbaf Compile fix for missing Boost 2016-06-16 00:58:31 +02:00
Alexander Bock 7548b5654b Make iSWA module dependent on Kameleon 2016-06-16 00:24:03 +02:00
Alexander Bock d03d484f40 Actually spell textureplane correctly 2016-06-16 00:12:22 +02:00
Alexander Bock 1fb0b40563 Rename cygnetplane to textureplane in CMakeLists 2016-06-16 00:08:47 +02: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
Sebastian Piwell db375d310e Update kameleonlpane when sliding 2016-06-15 13:42:26 -04:00
Sebastian Piwell 389d094b8e Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-15 11:49:50 -04:00
Sebastian Piwell 1ef3c035e3 Renormalize values in the histogram correctly 2016-06-15 11:49:36 -04:00
Michael Nilsson 4401a21677 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-15 11:07:30 -04:00
Michael Nilsson 6573a6dfce add heroku baseurl and key bindings 2016-06-15 11:07:20 -04:00
Sebastian Piwell 78b827d9d6 Histogram with standard score normalization 2016-06-15 10:32:59 -04:00
Gene Payne d5ddaf84b8 Working on global settings integrated in gui but no functionality yet 2016-06-15 14:46:19 +02: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 5e3ff9077b Bugfix. Make box faces face outwards in DebugRenderer 2016-06-14 23:16:40 -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
Erik Broberg aefb7c3030 Add methods for debug rendering of box faces and box edges 2016-06-14 21:05:08 -04:00
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