Commit Graph

1166 Commits

Author SHA1 Message Date
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
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