Commit Graph

44 Commits

Author SHA1 Message Date
Emil Axelsson
442969f2b1 Jenkins compilation fix 2017-03-02 18:50:11 +01:00
Emil Axelsson
686fec4f9d Add Spice kernels for Mercury and Saturn magnetosphere rendering, implement inside volume rendering for kameleon volumes
Conflicts:
	data/scene/mercury/mercury.mod
	data/scene/saturn/saturn/saturn.mod
2017-03-02 18:20:02 +01:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock
15867d6849 Cleanup of warnings in external libraries 2017-02-13 13:45:27 -05:00
Alexander Bock
70020e3de7 - Add style check for correct use of components and subcomponents in
include guards
- Disallow use of lower case characters in include guards
- Fix wrong components and subcomponents
2017-02-10 14:46:51 -05:00
Alexander Bock
23ea86949f Updated check_style_guide to test for include guards and copyright
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
2017-02-09 23:55:39 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
dbb599a5fa Separate base module into base and space 2016-12-13 14:43:44 +01:00
Alexander Bock
df543f0ec3 Cleanup of license headers
Cleanup of include guards in modules
2016-12-09 12:02:16 +01:00
Michael Nilsson
fd026dae53 only get selected datavalues from file 2016-06-13 17:59:36 -04:00
Michael Nilsson
86bcbfb92c windows fix 2016-06-13 16:27:59 -04:00
Michael Nilsson
db9af4c886 abstracted cygnet properties to DataCygnet 2016-06-10 16:57:55 -04:00
Michael Nilsson
1633d9048e cleanup iswacygnet header, 90 degree rotation fix, small optimization 2016-06-10 15:48:34 -04:00
Sebastian Piwell
1f8df7a166 Refactor dataprocessor 2016-05-31 16:52:46 -04:00
Sebastian Piwell
e3c1093310 Read cdf list 2016-05-23 17:24:46 -04:00
Sebastian Piwell
e3c7624605 Read cdf slice of any axis 2016-05-19 10:55:59 -04:00
Sebastian Piwell
19c301f769 Options to Kameleonplane 2016-05-18 14:26:29 -04:00
Sebastian Piwell
6878975192 Colormaps and read image format from string 2016-04-27 14:44:07 -04:00
Sebastian Piwell
d3df58ff92 Preparation for ENLIL model 2016-04-25 13:37:27 -04:00
Michael Nilsson
c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Sebastian Piwell
bea3a1b89b Correct updateintervall 2016-04-05 17:09:45 -04:00
Sebastian Piwell
b1a009e1b0 Create ISWACygnets with metadata struct 2016-04-05 11:44:49 -04:00
Michael Nilsson
0feb7fb771 fix for windows. removed thread for updating texture. 2016-03-30 17:26:05 -04:00
Sebastian Piwell
c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00
Michael Nilsson
2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Sebastian Piwell
c10dda95d8 Towards more general model scale and position 2016-03-24 16:38:56 -04:00
Michael Nilsson
73545c721e merge conflict, added textureplane 2016-03-24 09:25:47 -04:00
Sebastian Piwell
27666200db Created renderabledataplane through own module in scenegraph 2016-03-23 09:44:19 -04:00
Michael Nilsson
6b19a785e1 changed initital max value in getUniformSliceValues, removed couts 2016-03-23 09:16:54 -04:00
Emil Axelsson
c5aba19d52 Merge branch 'master' of github.com:OpenSpace/OpenSpace-Development into develop 2016-03-23 13:33:42 +01:00
Sebastian Piwell
7712dd0190 Right scale and read from cdf file 2016-03-22 16:15:46 -04:00
Michael Nilsson
1a47008694 solved merge conflict 2016-03-22 09:34:23 -04:00
Sebastian Piwell
d269eedf77 Correct size and position 2016-03-22 09:31:17 -04:00
Michael Nilsson
ea3d50561d removed cout 2016-03-21 18:04:35 -04:00
Michael Nilsson
1db9d08c2b attempt to load data from model 2016-03-21 17:41:55 -04:00
Michael Nilsson
97aa12b77b added boost dependency to kameleon module 2016-03-18 17:09:51 -04:00
Alexander Bock
2b7a532f57 Merge branch 'develop' 2016-02-21 14:22:14 +01:00
Alexander Bock
2f7fbb1f39 Uncomment old Progressbar from Kameleon to make jenkins compile again 2016-02-05 23:00:12 +01:00
Alexander Bock
c87fdfd38b Fixes for Windows
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
Alexander Bock
2fce471743 Started cleanup of module structure 2015-12-14 10:50:38 -08:00
Alexander Bock
5227ce2213 Renamed OpenSpaceModule's initialize method to create
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
Alexander Bock
978b535a2f Remove setName function from OpenSpaceModule and move naming into constructor 2015-06-22 22:57:15 +02:00
Joakim Kilby
63cce6226e Removed redefinition of BOOST_ROOT from cmakelists 2015-06-16 11:28:34 +02:00
Alexander Bock
9d733eb613 Moving Kameleon into its own module
Moving fieldline rendering into its own module
2015-05-26 23:51:15 +02:00