69 Commits

Author	SHA1	Message	Date
Sebastian Piwell	294773b2cb	Updated shaders	2016-06-14 13:53:24 -04:00
Michael Nilsson	f029362372	refactor datasphere	2016-06-01 13:19:45 -04:00
Michael Nilsson	e8238859f8	refactor cygnetplane and dataplane	2016-05-31 17:54:39 -04:00
Michael Nilsson	627d31a5b2	refactor textureplane and cygnetplane	2016-05-27 16:50:01 -04:00
Michael Nilsson	fccf05a026	uncommented important code	2016-05-27 09:57:11 -04:00
Sebastian Piwell	edfff68491	Memory leak fix	2016-05-26 15:29:45 -04:00
Michael Nilsson	b8c093c411	bugfix for adding iswacygnet without group	2016-05-24 16:47:01 -04:00
Michael Nilsson	627e33fd7e	finished refactoring for datasphere. bugfix in textureplane future object	2016-05-24 16:19:18 -04:00
Sebastian Piwell	813a68c85f	Alpha and group name first	2016-05-24 15:35:34 -04:00
Sebastian Piwell	c5fa1891b6	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-09 13:10:06 -04:00
Sebastian Piwell	39ff2415bb	Name changes	2016-05-09 13:09:47 -04:00
Michael Nilsson	279d85f0c2	windows fix	2016-05-09 11:24:05 -04:00
Michael Nilsson	f2b802b317	MemoryFile har now char pointer and size instead of string	2016-05-06 16:39:24 -04:00
Michael Nilsson	d63dd7db44	remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile	2016-05-06 15:56:12 -04:00
Michael Nilsson	cbd6fd9234	iswacygnets now use new download funtions aswell	2016-05-06 15:09:09 -04:00
Sebastian Piwell	e6adcfba27	Replaced SimpleSphereGeometry with PowerScaledSphere	2016-05-06 10:32:09 -04:00
Sebastian Piwell	b56f85e968	Refactor of ISWACygnet class tree	2016-05-05 15:36:00 -04:00
Michael Nilsson	df030b4529	warnings if download to memory failed for some reason	2016-05-05 10:53:50 -04:00
Sebastian Piwell	355e70ca0a	Remove cygnet groups	2016-05-03 17:13:28 -04:00
Sebastian Piwell	233b01c641	Multiple textures and transferfunctions	2016-04-28 15:56:06 -04:00
Sebastian Piwell	38a5e83f50	Texture and tranferfunction to vectors	2016-04-27 17:44:36 -04:00
Sebastian Piwell	434f8bfabb	Some clean up and small fixes	2016-04-27 14:48:22 -04:00
Sebastian Piwell	6878975192	Colormaps and read image format from string	2016-04-27 14:44:07 -04:00
Sebastian Piwell	3fc25492f2	Read texture from memory with bare pointer	2016-04-25 11:26:15 -04:00
Sebastian Piwell	7c350ae2a9	Real world update time interval	2016-04-22 10:14:11 -04:00
Sebastian Piwell	3381fe5c59	Update dataplan with cygnet update time	2016-04-21 17:38:06 -04:00
Sebastian Piwell	132d21160f	Texture plane updates with cygnet update time	2016-04-21 16:45:24 -04:00
Sebastian Piwell	d58ae61c49	Log normalizing function	2016-04-21 16:14:34 -04:00
Sebastian Piwell	201963a2f2	Solved merge conflict	2016-04-20 14:46:37 -04:00
Sebastian Piwell	f6ddce7929	Seperated coordinate scale and spatial scale	2016-04-20 14:38:12 -04:00
Michael Nilsson	b7dc02d421	solve merge conflict	2016-04-20 13:29:05 -04:00
Michael Nilsson	6aa8536d8c	create both textureplane and dataplane through gui easier	2016-04-20 13:21:14 -04:00
Sebastian Piwell	7b510dae98	Add dataplane when time is running	2016-04-20 10:48:49 -04:00
Sebastian Piwell	64a9dd8069	Update screenspacerenderables	2016-04-19 18:03:29 -04:00
Sebastian Piwell	3d229fdc3a	Update textureplane and delete dataplane	2016-04-19 16:59:40 -04:00
Michael Nilsson	c0e3eed9e3	loading image cygnets from localhost	2016-04-19 09:54:18 -04:00
Sebastian Piwell	02c2ee9ef6	DataPlane reads from server	2016-04-18 15:16:11 -04:00
Sebastian Piwell	86bf771cdd	Read data file from server	2016-04-18 13:05:50 -04:00
Sebastian Piwell	e292f79697	Get metadata and add new images	2016-04-11 17:45:41 -04:00
Michael Nilsson	d5d79e01b3	add and remove iswaCygnets through lua scripts	2016-04-11 14:26:53 -04:00
Sebastian Piwell	9419ed9dfc	No more parent variable in ISWACygnet	2016-04-08 17:18:18 -04:00
Sebastian Piwell	6a81065b42	ISWACygnet child of Renderable	2016-04-08 12:27:23 -04:00
Sebastian Piwell	263bc9508e	Create ISWACygnets with dictionary	2016-04-08 11:58:46 -04:00
Sebastian Piwell	bf61f6f1e4	Load and read textures from memory	2016-04-06 14:17:29 -04:00
Sebastian Piwell	bea3a1b89b	Correct updateintervall	2016-04-05 17:09:45 -04:00
Sebastian Piwell	fd9fbb540c	Solved merge conficts	2016-04-05 13:21:34 -04:00
Sebastian Piwell	ca9adfeb44	Some cleanup	2016-04-05 12:13:30 -04:00
Michael Nilsson	a3266dfcc5	small addition to solving conflict	2016-04-05 11:57:55 -04:00
Michael Nilsson	e59ea07b24	solved merge conflict	2016-04-05 11:57:17 -04:00
Sebastian Piwell	b1a009e1b0	Create ISWACygnets with metadata struct	2016-04-05 11:44:49 -04:00