394 Commits

Author	SHA1	Message	Date
Sebastian Piwell	a0efc00408	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-03 15:35:38 -04:00
Sebastian Piwell	1e4e8919c3	Set attributes of screenspacerenderable through dictionary	2016-05-03 15:35:33 -04:00
Michael Nilsson	57cd5c0bf7	solve merge conflict	2016-05-03 15:14:31 -04:00
Michael Nilsson	f05672436e	removed iswamanager update function and create cygnet through scripts instead	2016-05-03 15:07:22 -04:00
Sebastian Piwell	5e5e9244f5	Created dataSphere	2016-05-03 14:32:04 -04:00
Sebastian Piwell	ddb3345af8	Replace strings with enum	2016-05-03 14:00:51 -04:00
Sebastian Piwell	810bcbb4e1	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-03 13:46:18 -04:00
Sebastian Piwell	7eae57b02f	Removed iswacontainer	2016-05-03 13:46:02 -04:00
Michael Nilsson	2f7d2e294f	solve merge conflict	2016-05-03 13:37:19 -04:00
Michael Nilsson	c34fa48c73	add script to remove screenspacerenderables from renderengine	2016-05-03 13:30:22 -04:00
Sebastian Piwell	dfd1968f0b	Lua script to add cygnet	2016-05-03 13:24:17 -04:00
Sebastian Piwell	c17bfbba02	Chose ISWAGroup in GUI	2016-05-03 11:06:17 -04:00
Michael Nilsson	d6b5976298	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-03 10:39:41 -04:00
Michael Nilsson	4d61694f75	ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory	2016-05-03 10:39:32 -04:00
Sebastian Piwell	c57a9b7be1	Replaced string with enum	2016-05-03 10:06:47 -04:00
Sebastian Piwell	f5ab620398	Merge fix	2016-05-02 17:34:10 -04:00
Sebastian Piwell	8bde97fdfa	ISWAGroup for manipulation of multiple dataplanes	2016-05-02 17:32:25 -04:00
Michael Nilsson	40cd7e98ec	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-02 13:42:14 -04:00
Michael Nilsson	7245807a1a	changed function parameters to processData, update ghoul ref	2016-05-02 13:42:10 -04:00
Sebastian Piwell	14c0eb8b99	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-02 11:35:04 -04:00
Sebastian Piwell	3977a8cdb5	Change transfer functions at runtime	2016-05-02 11:34:13 -04:00
Michael Nilsson	080459d229	sove merge conflict	2016-05-02 10:13:03 -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	6ec125abc0	Changed name on property	2016-04-29 10:07:36 -04:00
Sebastian Piwell	45721dae4b	Clean up and multiple transferfunction	2016-04-29 09:56:02 -04:00
Sebastian Piwell	200a3d4dd6	Filter out background values	2016-04-28 17:40:04 -04:00
Sebastian Piwell	233b01c641	Multiple textures and transferfunctions	2016-04-28 15:56:06 -04:00
Michael Nilsson	b2725000e8	Added some benchmarking code	2016-04-28 15:08:24 -04:00
Sebastian Piwell	191e4e4d75	Set up for multipletextures in dataplane	2016-04-27 18:06:41 -04:00
Sebastian Piwell	38a5e83f50	Texture and tranferfunction to vectors	2016-04-27 17:44:36 -04:00
Sebastian Piwell	ba1f3ad8df	Option to log values in data files	2016-04-27 15:40:48 -04:00
Sebastian Piwell	7332ba6446	Merge fix	2016-04-27 14:56:19 -04:00
Sebastian Piwell	5e52910dc6	remove files and merge fix	2016-04-27 14:53:57 -04:00
Sebastian Piwell	434f8bfabb	Some clean up and small fixes	2016-04-27 14:48:22 -04:00
Michael Nilsson	d759d3fe03	fix fieldlines modules shaders	2016-04-27 14:47:06 -04:00
Sebastian Piwell	b67180e325	Add transferFunction to dataplane	2016-04-27 14:47:06 -04:00
Michael Nilsson	f6a6245795	add the useHistogram button again for histogram equalization	2016-04-27 14:47:06 -04:00
Sebastian Piwell	465caffc41	Remove old transferfunctions	2016-04-27 14:47:06 -04:00
Michael Nilsson	a02f57ea56	cleanup of read data function	2016-04-27 14:47:06 -04:00
Sebastian Piwell	6878975192	Colormaps and read image format from string	2016-04-27 14:44:07 -04:00
Michael Nilsson	2040eac26d	fix fieldlines modules shaders	2016-04-26 17:04:26 -04:00
Michael Nilsson	61b3fe561b	add the useHistogram button again for histogram equalization	2016-04-26 13:15:57 -04:00
Michael Nilsson	4ad34bbdf5	solve merge conflict	2016-04-25 17:42:02 -04:00
Michael Nilsson	b995cf95cc	cleanup of read data function	2016-04-25 17:31:37 -04:00
Sebastian Piwell	d3df58ff92	Preparation for ENLIL model	2016-04-25 13:37:27 -04:00
Sebastian Piwell	3fc25492f2	Read texture from memory with bare pointer	2016-04-25 11:26:15 -04:00
Sebastian Piwell	b786522be4	Merge branch 'develop' into feature/iSWA	2016-04-25 10:56:11 -04:00
Sebastian Piwell	c9bb834ef1	Render KameleonPlane	2016-04-25 10:48:48 -04:00
Sebastian Piwell	f13367e717	Kameleon plane	2016-04-25 10:37:06 -04:00
Sebastian Piwell	999b9706c0	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-04-25 09:04:05 -04:00