Commit Graph

2189 Commits

Author SHA1 Message Date
Sebastian Piwell
fbcad58d98 Small bug fix 2016-05-24 15:07:51 -04:00
Sebastian Piwell
92f64e8653 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-24 14:42:55 -04:00
Sebastian Piwell
a4d90fb667 Load cdf files at start up 2016-05-24 14:42:38 -04:00
Michael Nilsson
8f6bc7d418 solve merge conflict 2016-05-24 14:10:37 -04:00
Michael Nilsson
8633bc8522 refactoring, using pubsub pattern for groups 2016-05-24 14:02:42 -04:00
Sebastian Piwell
e3c1093310 Read cdf list 2016-05-23 17:24:46 -04:00
Sebastian Piwell
fb5b260b8f Fix for variable resolution for KameleonPlane 2016-05-23 11:19:54 -04:00
Sebastian Piwell
5b9813c817 Don't load all Histograms at startup for KameleonPlane 2016-05-23 11:08:12 -04:00
Sebastian Piwell
eefa5ea844 Small fix for ionospere 2016-05-23 09:51:10 -04:00
Sebastian Piwell
1d8c77ee3b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-20 16:46:41 -04:00
Sebastian Piwell
c983ecfb89 Histogram eq with group dataprocessor 2016-05-20 16:46:33 -04:00
Michael Nilsson
4056cbb160 linux fix 2016-05-20 15:08:00 -04:00
Michael Nilsson
1535803705 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-20 14:12:44 -04:00
Michael Nilsson
0ccc48d1c3 windows fix 2016-05-20 14:18:49 -04:00
Michael Nilsson
99ef3c13da update ghoul reference 2016-05-20 14:11:56 -04:00
Sebastian Piwell
a1188c3895 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-20 13:40:10 -04:00
Sebastian Piwell
57cd44535d IswaGroup has own dataProcessor 2016-05-20 12:48:48 -04:00
Michael Nilsson
8ca457b14c solve merge conflict with develop 2016-05-20 09:33:41 -04:00
Emil Axelsson
ca46661d3e fix compile errors for osx 2016-05-20 00:39:29 +02:00
Sebastian Piwell
672933cd05 Choose slice of kameleonPlane 2016-05-19 15:14:11 -04:00
Sebastian Piwell
0d54a24891 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-19 14:05:18 -04:00
Sebastian Piwell
bb2da4dd2a Choose resolution of KameleonPlane 2016-05-19 14:05:13 -04:00
Michael Nilsson
cd5431cb33 add try catch around json parse in kameleonwrapper, add doc comments to methods 2016-05-19 11:23:01 -04:00
Alexander Bock
7b525d1b29 Move keybindings for the newhorizons scene into its own file 2016-05-19 17:20:38 +02:00
Alexander Bock
50d8b93d30 Convert projected images instead of swizzling for RenderablePlanetProjection 2016-05-19 17:17:18 +02:00
Sebastian Piwell
91b159cb74 Merge fix 2016-05-19 11:16:46 -04:00
Sebastian Piwell
e3c7624605 Read cdf slice of any axis 2016-05-19 10:55:59 -04:00
Alexander Bock
f9358d4e45 Remove debugging code from RenderableTrail 2016-05-19 16:45:15 +02:00
Michael Nilsson
8306df2618 solve merge conflict 2016-05-19 10:11:50 -04:00
Michael Nilsson
b7343398d0 fieldlines selection added to kamelionplane 2016-05-19 10:08:51 -04:00
Alexander Bock
b964cbe1a2 Remove comments in Downloadmanager 2016-05-19 13:25:47 +02:00
Alexander Bock
54fa1c8cbc Merge branch 'feature/rosetta' into develop 2016-05-19 13:24:26 +02:00
Alexander Bock
caae5336b5 Make use of new thread priority scheme
Updated Ghoul repository
2016-05-19 13:23:40 +02:00
Alexander Bock
94bac5d886 Fix RenderableTrails artifacts with high delta time (closing #84) 2016-05-19 12:46:11 +02:00
Alexander Bock
92df988bb6 Show some information when NewHorizons is not present 2016-05-18 21:37:41 +02:00
Alexander Bock
dba650c80d Create separate key bindings for rosetta mission
Prolong rosetta trail
2016-05-18 21:37:27 +02:00
Sebastian Piwell
100a1e8749 Process Kameleon data 2016-05-18 15:06:35 -04:00
Sebastian Piwell
9387e6d993 Fill option function 2016-05-18 14:44:16 -04:00
Alexander Bock
ecf1862eb3 Only show Pluto text information when NewHorizons node is present 2016-05-18 20:40:38 +02:00
Sebastian Piwell
19c301f769 Options to Kameleonplane 2016-05-18 14:26:29 -04:00
Alexander Bock
7d32dba5cb Enable SingleSphereGeometry to have more segments
Another fix for RenderablePlanetProjection heightmap offset
2016-05-18 20:19:47 +02:00
Alexander Bock
ccffe60eee Use new Rosetta kernels for image projections 2016-05-18 19:18:59 +02:00
Alexander Bock
e6abbcd73a Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-05-18 19:11:54 +02:00
Alexander Bock
0c96a08afa Rename Pluto heightmap and normalmap 2016-05-18 19:11:29 +02:00
Alexander Bock
0ab3f0c026 Some fixes on heightmap displacement for RenderablePlanet
Some fixes on heightmap displacement for RenderablePlanetProjection
Enable optional normal map on RenderablePlanetProjection
2016-05-18 19:03:03 +02:00
Sebastian Piwell
f5b33158bd Add KameleonPlanes again 2016-05-18 11:10:04 -04:00
Sebastian Piwell
093d265dff Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-18 09:33:43 -04:00
Sebastian Piwell
94d8360e73 Moved renderproperties functions 2016-05-18 09:33:32 -04:00
Emil Axelsson
fe4fde67de remove incorrect include path 2016-05-18 13:31:33 +02:00
Emil Axelsson
5cd8cdd250 Merge pull request #82 from OpenSpace/feature/dataconverter
volume conversion tools and really basic data converter app
2016-05-18 13:09:01 +02:00