Commit Graph

289 Commits

Author SHA1 Message Date
Michael Nilsson ace6a91301 fetch ionosphere date from localhost - solve merge conflict 2016-05-16 14:27:17 -04:00
Sebastian Piwell 2a236bca77 Read ionosphere data from json file 2016-05-16 13:36:25 -04:00
Kalle Bladin 2909d120e5 Try a new dataset for color texture. 2016-05-16 10:27:57 -04:00
Alexander Bock ffdaeeedcc Renamed default_nh.scene to newhorizons.scene
Remove all 'projection' suffices from newhorizons classes
2016-05-16 09:30:27 +02:00
Alexander Bock 9fd0e02cb7 Flip placeholder texture 2016-05-16 09:16:33 +02:00
Sebastian Piwell 88dca0d6c0 Ionosphere test data 2016-05-13 15:22:50 -04:00
Sebastian Piwell 929fe810df Set scale and position for ScreenSpaceCygnets at start up 2016-05-13 09:45:37 -04:00
Sebastian Piwell 581002175c IswaManager loads cygnet info 2016-05-12 18:49:16 -04:00
Sebastian Piwell a28abd7774 iSWA Screen Space Options 2016-05-12 15:10:17 -04:00
Erik Broberg 0c9ce5af70 Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging 2016-05-11 18:38:19 -04:00
Erik Broberg 9ccd43b8b9 Using lua key bindings in globebrowsing scene 2016-05-11 16:57:32 -04:00
Sebastian Piwell c2443a9ee2 Merge branch 'develop' into feature/iSWA 2016-05-11 13:30:59 -04:00
Sebastian Piwell 39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Alexander Bock 33ecbc8012 Fixing correct time for rosetta scene 2016-05-08 16:19:14 +02:00
Erik Broberg b63f427cff Fixed bug in GdalDataConverter<T>::geodeticToPixel which caused some tile texture data to be read and displayed incorrectly 2016-05-07 00:10:23 -04:00
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
Alexander Bock b4ec681821 Fix mod files for new directory structure 2016-05-06 13:51:57 +02:00
Alexander Bock 4188aebb5e Cleanup of data/scene directory 2016-05-06 11:23:40 +02:00
Kalle Bladin 004f7c6185 Temporary solution to problem with too small tiles. 2016-05-05 19:32:59 -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
Kalle Bladin 04a363bab1 Merge branch 'develop' into feature/globebrowsing 2016-05-04 15:57:44 -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
Kalle Bladin 6de208721d Separate shader files. 2016-05-04 13:19:46 -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
Kalle Bladin 6f4e39cc7d Generalize gdaldataconverter so it can handle any data type. 2016-05-03 16:00:29 -04:00
Sebastian Piwell 7eae57b02f Removed iswacontainer 2016-05-03 13:46:02 -04:00
Kalle Bladin 81b2c69284 Solve merge conflict in texturetilesety 2016-05-02 11:44:55 -04:00
Sebastian Piwell 3977a8cdb5 Change transfer functions at runtime 2016-05-02 11:34:13 -04:00
Kalle Bladin 1e352b7826 Testing simple global heightmapping using color textures. 2016-05-02 11:19:16 -04:00
Erik Broberg 3a3038e862 Carving out cachable geodetic tiles from GDAL datasets 2016-05-02 11:13:41 -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
Kalle Bladin 2df2d25305 Use dictionary to set radii of globe. 2016-04-28 22:07:45 -04:00
Sebastian Piwell 233b01c641 Multiple textures and transferfunctions 2016-04-28 15:56:06 -04:00
Kalle Bladin 78339e909c Load TWMS using GDAL. Iimage is flipped in y direction and the reading is not general enough yet. 2016-04-27 23:21:42 -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
Erik Broberg e6195486ae GDAL trying opening WMS config file 2016-04-25 16:01:09 -04:00
Erik Broberg f253edad53 Proof of concept - real time tile fetching 2016-04-25 12:25:11 -04:00
Erik Broberg 3d1db76c16 Merge branch 'develop' into feature/globebrowsing 2016-04-21 17:07:18 -04:00