Commit Graph

6222 Commits

Author SHA1 Message Date
Jonathan Fransson c8e297a5b9 debris performanslogging, fixed spherical coords and asset clean-up 2019-06-12 15:15:15 -06:00
Elon 7c2527a1e7 first start at using spherical grid with debris volume 2019-06-07 15:53:17 -06:00
Elon 3ae183b997 volume sequences can be made, and they will use a global min and max value 2019-06-04 16:44:14 -06:00
Elon a043ae0c44 failed try small value before casting to float 2019-06-03 10:27:51 -06:00
Elon e729c9e812 Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris
merge since release and rebase from master
2019-05-31 10:40:06 -06:00
Elon 793c25200c a try to correct position error in orbits 2019-05-31 10:40:00 -06:00
ElonOlsson 68f04031da merge after rebase 2019-05-31 09:58:44 -06:00
Elon bd7ea04362 smooth movement, but position offset due to precision errors. Clean up in shaders 2019-05-30 11:06:25 -06:00
Elon b9f20b7595 corrected datatype of timeOffset to make smooth movement in orbits 2019-05-30 11:06:24 -06:00
Elon fe8f3115cc positions now work, but pause at vertex 2019-05-30 11:05:43 -06:00
Jonathan Fransson a555e9e4b2 orbit render modifications, unfinished 2019-05-30 11:05:12 -06:00
Elon fb56f9a20b - 2019-05-30 11:04:28 -06:00
Jonathan Fransson 23cc9accc6 1st version volume render finished, with multiple data sets 2019-05-30 11:03:33 -06:00
Elon d2c078a48a merge 2019-05-30 11:02:57 -06:00
Elon 0ab6c48d18 old 2019-05-30 11:01:55 -06:00
Jonathan Fransson 7f00c0b62d generate derbris volume task, not working properly 2019-05-30 11:00:44 -06:00
Elon f00c1ab280 get index from position 2019-05-30 10:59:11 -06:00
Jonathan Fransson 0ad503f1ea quick task fix 2019-05-30 10:58:40 -06:00
Jonathan Fransson 06e79f16ed merge 2019-05-30 10:58:28 -06:00
Elon 65cecbbfd6 started on mapping density of generated positions to cartesian grid cells 2019-05-30 10:57:38 -06:00
Jonathan Fransson c513858355 merge 2019-05-30 10:57:38 -06:00
Elon 1c0a71fd4a created getPositionBuffer function for debris volume task 2019-05-30 10:57:38 -06:00
Elon c6fd47311a + 2019-05-30 10:57:37 -06:00
Jonathan Fransson 001ce3d3b0 branch cleanup 2019-05-30 10:56:39 -06:00
Jonathan Fransson 015cbbc38e asset and task for volume rendering 2019-05-30 10:56:39 -06:00
Jonathan Fransson 95531acb96 merge 2019-05-30 10:56:38 -06:00
Elon a7bd263e53 removed old test 2019-05-30 10:56:38 -06:00
Elon 599fdd3d5c line fade now works useing float for orbit and period 2019-05-30 10:54:22 -06:00
Elon 8503d4e59f merging 2019-05-30 10:53:53 -06:00
Jonathan Fransson fe5600e3c3 moved fade calculations to frag shader 2019-05-30 10:53:35 -06:00
Jonathan Fransson d0c78b544a merge 2019-05-30 10:53:35 -06:00
Emil Axelsson b18895592f Double to float in shaders. Fixes in asset handling of satellites. 2019-05-30 10:53:34 -06:00
ElonOlsson d26700268f - 2019-05-30 10:53:34 -06:00
Elon 7c793fd841 orbits are not rotating 2019-05-30 10:53:03 -06:00
Elon 03691705d9 - 2019-05-30 10:52:29 -06:00
Jonathan Fransson c4a7e7f930 Fade almost done, issue with reading some data to the shader 2019-05-30 10:51:42 -06:00
Elon b81db510de trying to figure out how to fade lines 2019-05-30 10:50:52 -06:00
Elon dc2f28678e ASAT working 2019-05-30 10:48:50 -06:00
Elon 23832046d6 debris_shared and satellite_shared 2019-05-30 10:48:49 -06:00
Jonathan Fransson 2895df2144 New debris data 2019-05-30 10:48:20 -06:00
Elon 1ed3bdadbe orbits rendered proporly 2019-05-30 10:47:54 -06:00
Elon f5007351b2 getting min perigee and max apogee 2019-05-30 10:47:31 -06:00
Jonathan Fransson bd7943b874 Rendering separate orbits 2019-05-30 10:47:31 -06:00
Jonathan Fransson 92aded4e3f merge 2019-05-30 10:47:18 -06:00
Elon 933c700498 All debris rendered as one scene graph node 2019-05-30 10:46:45 -06:00
Jonathan Fransson 1ab2698fea Rendering issues 2019-05-30 10:44:03 -06:00
Jonathan Fransson 4886bf06a4 glDrawElement issues 2019-05-30 10:44:03 -06:00
Jonathan Fransson 2a8888148d No crash on render, but not rendering 2019-05-30 10:44:02 -06:00
Jonathan Fransson 3ca62aba83 merge 2019-05-30 10:43:43 -06:00
Elon 86f961a0a1 clean up after rebase 2019-05-30 10:43:06 -06:00