Commit Graph

74 Commits

Author SHA1 Message Date
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
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
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
Elon
847af32a5f pre rebase 2019-05-30 10:43:06 -06:00
Jonathan Fransson
c1205959a5 General code cleanup 2019-05-30 10:43:06 -06:00
Elon
a9f14b8b26 mergeing elonsTest with renderableSatellites 2019-05-30 10:43:06 -06:00
Jonathan Fransson
d3563d95e2 Fixed readTLE 2019-05-30 10:42:35 -06:00
Jonathan Fransson
5e86c498e0 merge 2019-05-30 10:42:11 -06:00
Elon
830cee8f5a TLETranslation errer, File and Type missing key 2019-05-30 10:41:48 -06:00
Elon
10a6408f04 runtime error, lua, satellites_shared 2019-05-30 10:41:48 -06:00
Jonathan Fransson
99bddfe8a2 updateBuffer changes 2019-05-30 10:41:48 -06:00
Jonathan Fransson
d3219d5b2e change in RenderableSatellites 2019-05-30 10:41:48 -06:00
Elon
246f77a204 satellites_shared.asset added for debris 2019-05-30 10:41:47 -06:00
Jonathan Fransson
e01dacff75 merge 2019-05-30 10:41:33 -06:00
Elon
a6f4298611 Fail to initialize asset, debris, satellites_shared:184 2019-05-30 10:41:33 -06:00
Jonathan Fransson
2ae6fdd7a2 push latest 2019-05-30 10:41:33 -06:00
Elon
8447714f97 loop debris elements 2019-05-30 10:41:33 -06:00
Jonathan Fransson
2e42282388 initializeGL stuff 2019-05-30 10:41:09 -06:00
Elon
14ef2644a9 started building on a new renderable from scratch 2019-05-30 10:41:09 -06:00
Jonathan Fransson
019faebeb0 work on renderablesatellites 2019-05-30 10:37:54 -06:00
Elon
be3ab5fe92 correcting errors 2019-05-30 10:37:54 -06:00
Jonathan Fransson
da40f81b4e working on renderableSatellites 2019-05-30 10:37:54 -06:00
Jonathan Fransson
ba2422b0fa merge 2019-05-30 10:37:54 -06:00
Elon
b96bea4327 some code to test 1 sgn, more renderables 2019-05-30 10:37:54 -06:00
Elon
44e5870460 correcting errors 2019-05-30 10:37:53 -06:00
Jonathan Fransson
0c9f5f8ecc working on renderableSatellites 2019-05-30 10:37:52 -06:00
Elon
662da5bdb8 appearance 2019-05-30 10:37:52 -06:00
Jonathan Fransson
8f35261b52 merge 2019-05-30 10:37:12 -06:00
Elon
dfef5ecb35 some code to test 1 sgn, more renderables 2019-05-30 10:36:51 -06:00
Elon
e829c66de9 pre rebase 2019-05-30 10:33:58 -06:00
Elon
9efb32e5cc mergeing elonsTest with renderableSatellites 2019-05-30 10:33:58 -06:00