Commit Graph

176 Commits

Author SHA1 Message Date
Michael Nilsson
fd026dae53 only get selected datavalues from file 2016-06-13 17:59:36 -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
661dd00129 Faster processing in DataProcessorText 2016-06-13 13:20:00 -04:00
Sebastian Piwell
39f083c342 Every datacygnet uses own dimensions 2016-06-10 15:19:32 -04:00
Michael Nilsson
9800ca72be change demo server cygnet ids 2016-06-10 11:53:05 -04:00
Emil Axelsson
8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Sebastian Piwell
9e7c420719 KameleonTransformationMatrix() in Transformation manager 2016-06-06 10:20:53 -04:00
Alexander Bock
a0e5fe34fe Use more fine-grained texture specification for Pluto and Charon 2016-06-06 00:49:09 +02:00
Alexander Bock
3d82173ff0 Don't set alpha value to 1.0 for all projection images 2016-06-04 20:33:17 +02:00
Alexander Bock
6362318399 Make textured milkyway show again 2016-06-04 20:17:28 +02:00
Alexander Bock
50e0c1a43b Reset Earth as camera focus 2016-06-04 20:03:16 +02:00
Alexander Bock
c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
2016-06-04 19:54:34 +02:00
Alexander Bock
36f5f7bb04 Only load cdf list if ISWA module is loaded 2016-06-04 19:39:22 +02:00
Alexander Bock
4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop
Conflicts:
	data/scene/default.scene
2016-06-04 19:06:54 +02:00
Sebastian Piwell
8e8d949107 Summer school release 2016-06-03 13:42:50 -04:00
Alexander Bock
104cbcfd39 Update Pluto textures to remove superfluous textures 2016-06-03 16:02:51 +02:00
Emil Axelsson
1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Sebastian Piwell
41299f17f7 Improved multiple transfer functions 2016-06-02 16:56:25 -04:00
Michael Nilsson
cb601042a6 solve merge conflict 2016-06-01 14:03:39 -04:00
Alexander Bock
a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
2016-06-01 19:46:23 +02:00
Sebastian Piwell
876c86ca75 Merge fix 2016-06-01 12:09:58 -04:00
Sebastian Piwell
d33121d07c New dataprocessor classes works with IswaGroup 2016-06-01 11:50:26 -04:00
Sebastian Piwell
1f8df7a166 Refactor dataprocessor 2016-05-31 16:52:46 -04:00
Alexander Bock
2742340112 Extract batsrus volume file into a variable for ease of change 2016-05-31 19:17:18 +02:00
Alexander Bock
8bfdf8db0d Add more interesting times to rosetta scene files 2016-05-31 18:35:13 +02:00
Alexander Bock
469358a8d6 Enable easy toggling of high v low resolution Pluto+Charon textures 2016-05-31 18:34:49 +02:00
Alexander Bock
592c2d41b5 First fix for reenabling Jupiter projections 2016-05-31 18:25:57 +02:00
Alexander Bock
fde537681f Some work on fixing 67P projections for all available times 2016-05-30 15:26:47 +02:00
Alexander Bock
884324c467 Cleanup of default.scene and keybindings 2016-05-30 13:36:55 +02:00
Michael Nilsson
627d31a5b2 refactor textureplane and cygnetplane 2016-05-27 16:50:01 -04:00
Sebastian Piwell
95dd221f84 Fix crash when cygnet has no group 2016-05-26 15:53:44 -04:00
Sebastian Piwell
edfff68491 Memory leak fix 2016-05-26 15:29:45 -04:00
Michael Nilsson
4bcb69739e windows fix 2016-05-25 14:06:15 -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
Sebastian Piwell
e3c1093310 Read cdf list 2016-05-23 17:24:46 -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
c983ecfb89 Histogram eq with group dataprocessor 2016-05-20 16:46:33 -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
7e7d27446c volumetric galaxy rendering 2016-05-20 11:01:01 +02:00
Alexander Bock
7b525d1b29 Move keybindings for the newhorizons scene into its own file 2016-05-19 17:20:38 +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
Michael Nilsson
b7343398d0 fieldlines selection added to kamelionplane 2016-05-19 10:08:51 -04:00