Commit Graph

268 Commits

Author SHA1 Message Date
Elon 944f9fc978 Fail to initialize asset, debris, satellites_shared:184 2019-04-10 13:57:48 -06:00
Jonathan Fransson dc4c62e8ef push latest 2019-04-10 13:56:46 -06:00
Elon a41c5dbb82 loop debris elements 2019-04-10 13:56:16 -06:00
Jonathan Fransson 3ae7b3835a initializeGL stuff 2019-04-10 13:55:48 -06:00
Elon b1827267b0 started building on a new renderable from scratch 2019-04-10 13:54:27 -06:00
Jonathan Fransson d65c384d74 work on renderablesatellites 2019-04-10 13:53:48 -06:00
Elon dd4fd93cd6 correcting errors 2019-04-10 13:53:08 -06:00
Jonathan Fransson d50ba68c51 working on renderableSatellites 2019-04-10 13:53:08 -06:00
Elon e55e9a1726 appearance 2019-04-10 13:53:08 -06:00
Jonathan Fransson f296c3fcf2 merge 2019-04-10 13:53:06 -06:00
Elon ad448a841f some code to test 1 sgn, more renderables 2019-04-10 13:52:25 -06:00
Jonathan Fransson fbf52f5fd7 work on renderablesatellites 2019-04-10 13:44:19 -06:00
Elon 1ba4a01b61 correcting errors 2019-04-10 13:44:18 -06:00
Jonathan Fransson f3e8d0a428 working on renderableSatellites 2019-04-10 13:43:44 -06:00
Elon f248c42ab1 appearance 2019-04-10 13:42:43 -06:00
Jonathan Fransson 3c51ae0fa9 merge 2019-04-10 13:38:40 -06:00
Elon e46548ebef some code to test 1 sgn, more renderables 2019-04-10 13:35:30 -06:00
Elon 1a3467418b pre rebase 2019-04-10 13:34:54 -06:00
Elon 6f3ae6b2ac merge 2019-04-10 13:21:49 -06:00
Elon ae238ba367 mergeing elonsTest with renderableSatellites 2019-04-10 13:19:58 -06:00
Jonathan Fransson 673fdd857d Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-04-09 15:46:06 -06:00
Jonathan Fransson 4fc0a7e8c2 General code cleanup 2019-04-09 15:45:34 -06:00
Elon b89e834101 merge 2019-04-09 15:34:31 -06:00
Elon 083ddc1c24 use an alternative position function from keplerTranslation 2019-04-09 15:32:45 -06:00
Jonathan Fransson be2c98de09 Fixed readTLE 2019-04-09 15:27:52 -06:00
Jonathan Fransson b8d9bf5426 merge 2019-04-08 09:25:30 -06:00
Jonathan Fransson 6c1ce53613 merge 2019-04-08 09:21:59 -06:00
Elon 6dc2a3c7a3 started adding on calculatePosition. Does not complie yet 2019-04-05 18:53:04 -06:00
Elon da4843cc8d TLETranslation errer, File and Type missing key 2019-04-04 15:37:35 -06:00
ElonOlsson d7452b15ff Merge branch 'thesis/2019/spaceDebris' into thesis/2019/spaceDebris 2019-04-04 13:22:17 -06:00
Jonathan Fransson 5103677be7 Merge branch 'thesis/2019/spaceDebris' into thesis/2019/spaceDebris 2019-04-04 13:16:39 -06:00
Elon 772bd00081 todo: add render and updateBuffer functions 2019-04-03 17:18:03 -06:00
Jonathan Fransson 292d4a891d updateBuffer changes 2019-04-03 17:08:37 -06:00
Elon 088d2268f4 satellites_shared.asset added for debris 2019-04-03 15:42:25 -06:00
Jonathan Fransson 44e9628f37 change in RenderableSatellites 2019-04-02 17:07:20 -06:00
Elon b1ecde2645 runtime error, lua, satellites_shared 2019-04-02 14:25:30 -06:00
Elon a99abb2c51 Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-04-02 10:48:29 -06:00
Elon ef6ac25b3e - 2019-04-02 10:48:21 -06:00
Jonathan Fransson c5b52fd354 merge, renderableSatellites kind of broken atm 2019-04-01 16:14:52 -06:00
Jonathan Fransson 2e499bd8eb merge 2019-04-01 16:06:18 -06:00
Elon 22260a2086 Fail to initialize asset, debris, satellites_shared:184 2019-04-01 16:03:44 -06:00
Elon 06a853870a merge 2019-03-29 17:18:37 -06:00
Elon 569de86a3c loop debris elements 2019-03-29 17:17:41 -06:00
Jonathan Fransson e9a078c787 merge 2019-03-29 10:02:05 -06:00
Jonathan Fransson 2d918315da push latest 2019-03-29 09:39:46 -06:00
Elon c032310208 merge 2019-03-29 09:37:26 -06:00
Elon 968f8d2683 started building on a new renderable from scratch 2019-03-28 17:24:07 -06:00
Jonathan Fransson 565612e973 initializeGL stuff 2019-03-27 16:30:59 -06:00
Jonathan Fransson 7ee9982973 work on renderablesatellites 2019-03-27 11:55:00 -06:00
Jonathan Fransson be713c8cc4 Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-03-27 11:49:15 -06:00