6083 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Elon	f4d29ba14a	old	2019-05-17 09:27:19 -06:00
Elon	c219a344b1	get index from position merge with density get density at	2019-05-13 13:25:27 -06:00
Elon	d25b18d9b7	get index from position	2019-05-13 12:54:24 -06:00
Jonathan Fransson	d567e1f254	quick task fix	2019-05-13 12:14:47 -06:00
Jonathan Fransson	ca6fa695bb	getDensityAt	2019-05-13 12:10:25 -06:00
Jonathan Fransson	4504f13722	merge	2019-05-13 10:15:30 -06:00
Elon	3a063a1f8c	started on mapping density of generated positions to cartesian grid cells	2019-05-10 17:51:12 -06:00
Jonathan Fransson	46de52ec14	Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris	2019-05-10 10:27:50 -06:00
Jonathan Fransson	309dd4195e	merge	2019-05-10 10:27:46 -06:00
Elon	1155dd249d	created getPositionBuffer function for debris volume task	2019-05-08 16:02:52 -06:00
Elon	b0d5fdf722	sync with removal of duplicate branch	2019-05-08 12:21:09 -06:00
Gene Payne	648ff0cad2	Add missing changes (#849)	2019-05-08 11:46:20 -06:00
Elon	10e9991820	+	2019-05-08 10:48:33 -06:00
Jonathan Fransson	44d1f320b9	branch cleanup	2019-05-07 16:41:40 -06:00
Jonathan Fransson	82928c11fc	asset and task for volume rendering	2019-05-07 15:24:42 -06:00
Jonathan Fransson	0e2f4d75a0	merge	2019-05-07 14:38:56 -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	8a0a589e0f	merging	2019-04-30 14:57:45 -06:00
Elon	847d222f28	merging	2019-04-30 14:51:11 -06:00
Jonathan Fransson	1e07fe4b5a	moved fade calculations to frag shader	2019-04-30 14:49:35 -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
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