208 Commits

Author	SHA1	Message	Date
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
Jonathan Fransson	2ec20e546b	merge	2019-04-10 14:16:19 -06:00
Elon	e4734ae0b3	clean up after rebase	2019-04-10 14:15:29 -06:00
Elon	1d08e58cd6	merge	2019-04-10 14:10:18 -06:00
Elon	98790eddec	pre rebase	2019-04-10 14:07:15 -06:00
Jonathan Fransson	74fba46ffe	General code cleanup	2019-04-10 14:07:13 -06:00
Elon	0b10bd69be	mergeing elonsTest with renderableSatellites	2019-04-10 14:06:34 -06:00
Jonathan Fransson	014e624258	Fixed readTLE	2019-04-10 14:05:57 -06:00
Jonathan Fransson	95079bb81a	merge	2019-04-10 14:04:38 -06:00
Elon	963e3e706b	use an alternative position function from keplerTranslation	2019-04-10 14:03:35 -06:00
Elon	a06d4d0a0d	started adding on calculatePosition. Does not complie yet	2019-04-10 14:03:35 -06:00
Elon	038f650d68	TLETranslation errer, File and Type missing key	2019-04-10 14:03:35 -06:00
Elon	62070aa0ad	runtime error, lua, satellites_shared	2019-04-10 14:02:37 -06:00
Jonathan Fransson	78bab5b7c5	updateBuffer changes	2019-04-10 14:02:06 -06:00
Jonathan Fransson	ae8c33da7a	change in RenderableSatellites	2019-04-10 14:02:05 -06:00
Elon	fcd5c6fcc4	todo: add render and updateBuffer functions	2019-04-10 14:00:38 -06:00
Elon	8003d9a9b7	satellites_shared.asset added for debris	2019-04-10 14:00:38 -06:00
Jonathan Fransson	60085f65ef	merge	2019-04-10 13:59:31 -06:00
Elon	127f64c123	-	2019-04-10 13:57:48 -06:00
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