Commit Graph

110 Commits

Author SHA1 Message Date
Alexander Bock
ac867c4e9e Some rudimentary cleanup 2019-08-19 11:35:48 +02:00
GPayne
bb335d37b4 Fix for crashing when removing the final satellite asset 2019-08-16 17:22:50 -06:00
GPayne
7e6a9b71fa Changed to standard position method for renderablesatellites 2019-08-15 16:13:41 -06:00
GPayne
e60c77b415 Added graceful exit and logging for case of missing or corrupt TLE file, and removed some commented-out code. 2019-08-15 10:21:57 -06:00
GPayne
c01e59635c Restored ability to change trail colors in satellite asset files. 2019-08-15 08:51:18 -06:00
Elon
029e67797f merging 2019-07-22 16:25:47 -06:00
Elon
46c22488d7 wrapping up thesis project 2019 space debris 2019-07-22 16:16:21 -06:00
Jonathan Fransson
a3b511c7a7 Final Merge 2019-07-19 10:12:02 -06:00
Jonathan Fransson
e3378bc615 Final Merge 2019-07-19 10:09:03 -06:00
Elon
6f8095f15c merge 2019-06-17 17:22:57 -06:00
Elon
907c0a3909 merging spherical grid 2019-06-17 17:16:14 -06:00
Jonathan Fransson
fa8100ee0b Spherical representation working and general clean up 2019-06-17 17:11:39 -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
793c25200c a try to correct position error in orbits 2019-05-31 10:40:00 -06:00
Elon
9a4d41871b smooth movement, but position offset due to precision errors. Clean up in shaders 2019-05-29 16:17:35 -06:00
Elon
bba24a70f9 corrected datatype of timeOffset to make smooth movement in orbits 2019-05-24 15:41:10 -06:00
Elon
80ed465607 positions now work, but pause at vertex 2019-05-23 16:55:44 -06:00
Elon
6da1e3327a merge 2019-05-23 11:52:58 -06:00
Elon
33cb871a41 trying to fix orbits 2019-05-23 11:47:27 -06:00
Jonathan Fransson
8e107beeec orbit render modifications, unfinished 2019-05-23 11:39:40 -06:00
Jonathan Fransson
51a157eb40 generate derbris volume task, not working properly 2019-05-16 16:45:39 -06:00
Elon
10e9991820 + 2019-05-08 10:48:33 -06:00
Elon
fee36349e8 removed old test 2019-05-06 09:42:37 -06:00
Elon
abf686ddf6 line fade now works useing float for orbit and period 2019-05-02 14:52:34 -06:00
Elon
847d222f28 merging 2019-04-30 14:51:11 -06:00
Jonathan Fransson
c967ddb544 merge 2019-04-30 14:33:17 -06:00
Emil Axelsson
3be6b92bad Double to float in shaders. Fixes in asset handling of satellites. 2019-04-30 17:44:37 +02:00
Elon
19a2bbfc7a orbits are not rotating 2019-04-29 16:17:50 -06:00
Elon
f1792ee41c merge 2019-04-29 09:29:24 -06:00
Elon
2b92413b15 - 2019-04-29 09:26:54 -06:00
Jonathan Fransson
f621c06963 Fade almost done, issue with reading some data to the shader 2019-04-26 11:57:47 -06:00
Elon
f21edec80d trying to figure out how to fade lines 2019-04-24 17:12:07 -06:00
Elon
2b1c8fc782 ASAT working 2019-04-19 14:25:59 -06:00
Elon
ff15d30d85 merge 2019-04-17 14:29:02 -06:00
Jonathan Fransson
6083d52b52 merge 2019-04-17 14:26:10 -06:00
Elon
546731ecdf debris_shared and satellite_shared 2019-04-17 14:23:23 -06:00
Jonathan Fransson
81b8113cf4 New debris data 2019-04-17 14:22:53 -06:00
Elon
20fdc00527 orbits rendered proporly 2019-04-16 17:48:50 -06:00
Elon
d7d957d584 Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-04-15 16:30:58 -06:00
Elon
1d206dd9c0 getting min perigee and max apogee 2019-04-15 16:30:50 -06:00
Jonathan Fransson
85b8b30f45 Rendering separate orbits 2019-04-15 16:25:26 -06:00
Jonathan Fransson
44a2bd7bc5 Merge 2019-04-15 12:13:41 -06:00
Jonathan Fransson
9df2a8ae22 merge 2019-04-15 12:07:02 -06:00
Elon
f064b540a9 merge 2019-04-12 18:03:56 -06:00
Elon
8b694e7464 All debris rendered as one scene graph node 2019-04-12 17:59:55 -06:00
Jonathan Fransson
76959c4a35 Rendering issues 2019-04-12 12:01:29 -06:00
Jonathan Fransson
66ab6527fa glDrawElement issues 2019-04-11 15:19:48 -06:00
Jonathan Fransson
986176af56 No crash on render, but not rendering 2019-04-10 17:41:30 -06:00
Jonathan Fransson
71881c59e1 merge 2019-04-10 14:18:28 -06:00