288 Commits

Author	SHA1	Message	Date
Sebastian Piwell	fa3fc8dc87	Transfer function to dataplan and ColorBar	2016-04-13 11:36:43 -04:00
Sebastian Piwell	e292f79697	Get metadata and add new images	2016-04-11 17:45:41 -04:00
Sebastian Piwell	5af317e594	Functions to create iSWAcygnets	2016-04-11 15:15:58 -04:00
Sebastian Piwell	6d74bd3b29	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-11 14:41:38 -04:00
Sebastian Piwell	d4ade042c1	Parse json string to Lua table	2016-04-11 14:41:31 -04:00
Michael Nilsson	0d298e7232	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-11 14:27:02 -04:00
Michael Nilsson	d5d79e01b3	add and remove iswaCygnets through lua scripts	2016-04-11 14:26:53 -04:00
Sebastian Piwell	6c72494859	Small json parse fix	2016-04-11 14:10:37 -04:00
Sebastian Piwell	f64804d043	Add frame from json	2016-04-11 13:57:03 -04:00
Sebastian Piwell	a820d0a4dd	Parse json to lua table string	2016-04-11 12:11:38 -04:00
Sebastian Piwell	9419ed9dfc	No more parent variable in ISWACygnet	2016-04-08 17:18:18 -04:00
Sebastian Piwell	6f582912f6	Update with ISWAManager	2016-04-08 16:10:53 -04:00
Sebastian Piwell	a55d5e9e9a	Put ISWACygnets in sceneGraph	2016-04-08 15:42:24 -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	20c1fa0cfa	Compile fix for Linux, included string	2016-04-08 10:47:59 -04:00
Sebastian Piwell	cb10757b29	Merge branch 'feature/scenegraphmodification' into feature/iSWA	2016-04-08 10:23:44 -04:00
Alexander Bock	2acb2cbd92	Updated ghoul repository ... Make use of automatic conversion and swizzling of textures	2016-04-07 19:07:18 +02:00
Michael Nilsson	575c580e80	iSWAmanager allow GIF loading, update ref to ghoul	2016-04-06 18:20:10 -04:00
Michael Nilsson	65179d49e2	update ghoul reference and iswamanager remove check for '.jpeg' extension	2016-04-06 15:49:14 -04:00
Michael Nilsson	a276b330e1	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-06 15:35:00 -04:00
Michael Nilsson	43b79b2101	referencing kameleon back to old commit	2016-04-06 15:39:34 -04:00
Michael Nilsson	5e8df2fd06	add check if cdf file exist before reading	2016-04-06 15:34:50 -04:00
Sebastian Piwell	3fc0fb625c	Updated ghoul and kameleon	2016-04-06 14:33:24 -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	7a0d880299	Works even if no iSWA module is created	2016-04-05 16:38:30 -04:00
Sebastian Piwell	48ccd6d389	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-05 16:22:57 -04:00
Sebastian Piwell	b25453e368	Works without iSWA module enabled	2016-04-05 15:55:55 -04:00
Michael Nilsson	e370e915fc	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-05 15:39:09 -04:00
Michael Nilsson	5c33642774	added comment and cout	2016-04-05 15:38:53 -04:00
Sebastian Piwell	2af071f1d7	Warning for gif and non existing cygnets	2016-04-05 14:37:43 -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	e25d30f2fb	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-05 12:11:27 -04:00
Michael Nilsson	0810376b03	fix for windows	2016-04-05 12:11:06 -04:00
Michael Nilsson	49d8319938	merge with develop	2016-04-05 12:02:25 -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
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
Sebastian Piwell	7e4aecbd90	Add ISWACygnets at runtime	2016-04-04 16:42:01 -04:00
Michael Nilsson	b62ff11c75	example creation of screenspacecygnet	2016-04-04 16:38:18 -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