Commit Graph

2785 Commits

Author SHA1 Message Date
Alexander Bock
b2ce3d774c Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-16 13:51:08 +02: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
5cc278c97f Add ModelMatrix retrieval to WindowWrapper 2016-06-16 00:57:31 +02:00
Alexander Bock
f38b8856c1 Updated Ghoul version 2016-06-16 00:32:47 +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
Alexander Bock
9c83dc1135 Make TransformationManager work without Kameleon module 2016-06-15 22:59:16 +02: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
fe28c9b0aa Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-15 10:33:08 -04:00
Sebastian Piwell
78b827d9d6 Histogram with standard score normalization 2016-06-15 10:32:59 -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
Alexander Bock
8e6bdf5f06 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-14 22:52:15 +02:00
Michael Nilsson
573ebd34a7 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-14 14:02:05 -04: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
Michael Nilsson
b3f1f12a40 add scene orientation to screenspacerenderables 2016-06-14 13:54: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
Michael Nilsson
448492c655 update ghoul ref 2016-06-14 10:45:01 -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
Alexander Bock
2dd29e5ecb Fixing bug with disappearing SGCT arguments 2016-06-14 09:19:11 +02: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