Commit Graph

100 Commits

Author SHA1 Message Date
Sebastian Piwell
e6ac01a1c7 Set names on screenSpaceImage 2016-05-06 16:27:55 -04:00
Sebastian Piwell
d25f2e60ab ScreenSpaceImage can take urls and is parent to ScreenSpaceCygnet 2016-05-06 16:12:30 -04:00
Sebastian Piwell
c284986c21 Implemented dataSphere 2016-05-05 17:57:52 -04:00
Sebastian Piwell
b56f85e968 Refactor of ISWACygnet class tree 2016-05-05 15:36:00 -04:00
Sebastian Piwell
12baec3827 Small typo 2016-05-05 10:11:59 -04:00
Sebastian Piwell
930cd8e0b4 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-04 15:00:45 -04:00
Sebastian Piwell
99a3ebf8da Coordinate transformation with kameleon 2016-05-04 15:00:38 -04:00
Michael Nilsson
3a80405c30 solve merge conflict 2016-05-04 12:10:49 -04:00
Michael Nilsson
0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Sebastian Piwell
7eae57b02f Removed iswacontainer 2016-05-03 13:46:02 -04:00
Sebastian Piwell
3977a8cdb5 Change transfer functions at runtime 2016-05-02 11:34:13 -04:00
Alexander Bock
0b30bf642e Correctly show milkyway background texture for all scenes 2016-04-30 14:25:54 +02:00
Alexander Bock
20532d704f Rename Lua functions to preInitialization and postInitialization
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
Sebastian Piwell
45721dae4b Clean up and multiple transferfunction 2016-04-29 09:56:02 -04:00
Sebastian Piwell
233b01c641 Multiple textures and transferfunctions 2016-04-28 15:56:06 -04:00
Sebastian Piwell
434f8bfabb Some clean up and small fixes 2016-04-27 14:48:22 -04:00
Michael Nilsson
d759d3fe03 fix fieldlines modules shaders 2016-04-27 14:47:06 -04:00
Sebastian Piwell
b67180e325 Add transferFunction to dataplane 2016-04-27 14:47:06 -04:00
Sebastian Piwell
6878975192 Colormaps and read image format from string 2016-04-27 14:44:07 -04:00
Alexander Bock
75175512a8 First implementation of moving the startup scripts into the scene description files 2016-04-27 16:46:31 +02:00
Alexander Bock
b46f40030b Untabify more files 2016-04-27 14:24:58 +02:00
Michael Nilsson
6a2dedcba4 normalize data values with standard score 2016-04-21 16:22:49 -04:00
Michael Nilsson
fffc60b56d set ProjectionListener to false in plutoprojection.mod 2016-04-21 11:04:03 -04:00
Michael Nilsson
3d3e59eabe solve merge conflict with develop 2016-04-20 16:38:41 -04:00
Michael Nilsson
07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Michael Nilsson
a068ca2030 load cygnets through mod file 2016-04-20 09:47:20 -04:00
Alexander Bock
c14aa7b11b Fix inverted texture problem
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
2016-04-20 14:28:11 +02:00
Alexander Bock
ea91d50b87 Start correcting fixes for wrong image origin 2016-04-20 13:07:01 +02:00
Alexander Bock
acc6095ba3 Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes 2016-04-20 13:06:40 +02:00
Alexander Bock
53e482b40e Use correct Mars SPICE constants 2016-04-20 09:58:11 +02:00
Sebastian Piwell
b2f25b5ca7 Multiple data values on the same plane 2016-04-19 15:14:23 -04:00
Alexander Bock
f76d65cf19 Remove high-resolution Mars kernel and fall back to regular de430 kernel
Use correct PlutoProject path instead of previous PlutoProjectionHybrid
Updated Ghoul version
2016-04-18 15:11:13 +02:00
Alexander Bock
c73404a1de Rename PlutoProjectionHybrid module to PlutoProjection
Remove outdated PlutoProjection module
2016-04-15 10:37:24 -04:00
Alexander Bock
04af38f546 Enable subdirectories by specifying an intermediate directory in the scene file 2016-04-15 10:27:41 -04:00
Alexander Bock
588bc74a88 Enable subdirectories for modules
Move newhorizons scene modules into subdirectories
2016-04-15 09:52:08 -04:00
Alexander Bock
ef2981f535 Enable global variables for module Lua scripts (closing #172)
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
2016-04-14 22:33:28 -04:00
Alexander Bock
dcf5507e1c Add the images of the plutoprojection into gitignore
Add a data directive to the plutoprojection that will download the New Horizons LORRI images
2016-04-14 21:17:19 -04:00
Emil Axelsson
48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Sebastian Piwell
e292f79697 Get metadata and add new images 2016-04-11 17:45:41 -04:00
Sebastian Piwell
6c72494859 Small json parse fix 2016-04-11 14:10:37 -04:00
Sebastian Piwell
a820d0a4dd Parse json to lua table string 2016-04-11 12:11:38 -04:00
Emil Axelsson
4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02:00
Sebastian Piwell
a55d5e9e9a Put ISWACygnets in sceneGraph 2016-04-08 15:42:24 -04:00
Alexander Bock
f86739073a Add variables to be able to toggle between available and accurate kernels 2016-04-08 14:55:14 +02:00
Alexander Bock
7c750ff2a2 Merge branch 'develop' into feature/newhorizons 2016-04-08 13:54:23 +02:00
Alexander Bock
fafc856dd5 Use only one mod file for NewHorizons and determine the kernels used inside 2016-04-08 13:53:55 +02:00
Sebastian Piwell
7a0d880299 Works even if no iSWA module is created 2016-04-05 16:38:30 -04:00
Sebastian Piwell
b25453e368 Works without iSWA module enabled 2016-04-05 15:55:55 -04:00
Michael Nilsson
2bfe0129e4 add screenspacecygnets 2016-03-31 12:17:32 -04:00
Sebastian Piwell
100f1b75dd Seperated iSWAManager and iSWAContainer 2016-03-31 10:53:03 -04:00