55 Commits

Author	SHA1	Message	Date
Alexander Bock	ad1893fd6f	Cleanup of ScreenSpaceRenderable ... Add missing includes to other files	2016-06-16 01:00:10 +02:00
Sebastian Piwell	05fa58c39b	Delete ScreenSpaceCygnet with lua script	2016-05-13 10:39:26 -04:00
Sebastian Piwell	489b7bbcd2	Clean up	2016-05-13 10:20:51 -04:00
Sebastian Piwell	581002175c	IswaManager loads cygnet info	2016-05-12 18:49:16 -04:00
Sebastian Piwell	03de689de3	Use update time for ScreenSpaceCygnet from json	2016-05-12 17:40:15 -04:00
Sebastian Piwell	39ff2415bb	Name changes	2016-05-09 13:09:47 -04:00
Michael Nilsson	ab62eaada5	solve merge conflict	2016-05-06 17:06:09 -04:00
Michael Nilsson	f2b802b317	MemoryFile har now char pointer and size instead of string	2016-05-06 16:39:24 -04:00
Sebastian Piwell	e6ac01a1c7	Set names on screenSpaceImage	2016-05-06 16:27:55 -04:00
Sebastian Piwell	eebda18fee	Fix register multiple properties	2016-05-06 16:17:00 -04:00
Sebastian Piwell	d25f2e60ab	ScreenSpaceImage can take urls and is parent to ScreenSpaceCygnet	2016-05-06 16:12:30 -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
Michael Nilsson	47e2abf87d	new download function using std::future and std::async	2016-05-06 10:48:27 -04:00
Michael Nilsson	df030b4529	warnings if download to memory failed for some reason	2016-05-05 10:53:50 -04:00
Michael Nilsson	3a80405c30	solve merge conflict	2016-05-04 12:10:49 -04:00
Michael Nilsson	05cc0850b7	if screenspacecygnet already downloading image, dont send another request	2016-05-04 12:04:08 -04:00
Sebastian Piwell	1e4e8919c3	Set attributes of screenspacerenderable through dictionary	2016-05-03 15:35:33 -04:00
Michael Nilsson	c34fa48c73	add script to remove screenspacerenderables from renderengine	2016-05-03 13:30:22 -04:00
Michael Nilsson	4d61694f75	ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory	2016-05-03 10:39:32 -04:00
Michael Nilsson	aa40e3a8b3	fix bug where screenspace cygnets crash program if moved to fast	2016-05-02 10:03:07 -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	0246cd482e	Solved merge conflict	2016-04-22 20:01:15 -04:00
Sebastian Piwell	f6bbce8b4c	Add extension to futurefile	2016-04-22 17:39:45 -04:00
Sebastian Piwell	9786628d6d	Log and standard score normalization	2016-04-21 17:24:45 -04:00
Sebastian Piwell	132d21160f	Texture plane updates with cygnet update time	2016-04-21 16:45:24 -04:00
Michael Nilsson	c72536fbbc	untabify to make merge easier	2016-04-20 15:21:30 -04:00
Sebastian Piwell	64a9dd8069	Update screenspacerenderables	2016-04-19 18:03:29 -04:00
Sebastian Piwell	5af317e594	Functions to create iSWAcygnets	2016-04-11 15:15:58 -04:00
Sebastian Piwell	bf61f6f1e4	Load and read textures from memory	2016-04-06 14:17:29 -04:00
Sebastian Piwell	fdaeaa7361	Changed function names	2016-04-06 09:39:54 -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	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
Michael Nilsson	7263b251ca	iswa module ready for api change in downloadmanager	2016-04-05 11:03:55 -04:00
Michael Nilsson	4da6d72985	merge solved, fixed broken for loop in iswacontainer	2016-04-04 17:55:46 -04:00
Michael Nilsson	aa10012386	solve merge	2016-04-04 16:21:51 -04:00
Michael Nilsson	cf2403c93d	screenspacecygnet gets image path in constructor	2016-04-04 16:15:21 -04:00
Michael Nilsson	bf6a8e249a	solve merge conflict	2016-04-04 16:02:27 -04:00
Sebastian Piwell	6f1b9a9fab	Merge with screenspaceimage	2016-04-04 15:51:30 -04:00
Michael Nilsson	6e8d8a9576	getting extension moved to iswa container	2016-04-04 15:46:20 -04:00
Sebastian Piwell	8e996f5bab	Remove screenspacerenderables and iSWACygnets	2016-04-04 15:30:54 -04:00
Sebastian Piwell	7eb312d10b	Delete cygnets	2016-04-04 11:58:42 -04:00
Michael Nilsson	66a9aeb008	solve merge conflict	2016-04-01 16:39:35 -04:00
Michael Nilsson	f4964b1628	request file extension	2016-04-01 16:32:18 -04:00
Sebastian Piwell	f7643769d9	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-01 11:24:32 -04:00