 Alexander Bock
|
3fe802ae1f
|
Merge branch 'develop' into release/ips
|
2016-06-16 13:51:34 +02:00 |
|
|
Alexander Bock
|
1c75e1da3a
|
Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips
|
2016-06-16 13:51:21 +02:00 |
|
|
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 |
|
|
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
|
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 |
|
|
Gene Payne
|
6f05594440
|
Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop
|
2016-06-15 15:40:48 +02:00 |
|
|
Gene Payne
|
2eab8aee28
|
Fixed bug in global settings implementation
|
2016-06-15 15:38:16 +02:00 |
|
|
Gene Payne
|
d5ddaf84b8
|
Working on global settings integrated in gui but no functionality yet
|
2016-06-15 14:46:19 +02:00 |
|
|
Emil Axelsson
|
fa1bf5873f
|
fix fisheye rendering bug
|
2016-06-15 10:41:47 +02:00 |
|
|
Alexander Bock
|
76a2f78676
|
Perform a glFinish at the beginning and the end of the performance measurement frame to capture all OpenGL timings
|
2016-06-15 09:30:22 +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 |
|
|
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 |
|