782 Commits

Author	SHA1	Message	Date
Sebastian Piwell	157ca752b2	Find highest value over multiple bins in histogram	2016-06-10 15:36:36 -04:00
Sebastian Piwell	9e7c420719	KameleonTransformationMatrix() in Transformation manager	2016-06-06 10:20:53 -04:00
Michael Nilsson	f9f9e9abd1	cleanup, update ghoul ref	2016-06-03 11:32:09 -04:00
Sebastian Piwell	c983ecfb89	Histogram eq with group dataprocessor	2016-05-20 16:46:33 -04:00
Sebastian Piwell	ff39239b0f	Auto filter of 'background'	2016-05-17 16:11:57 -04:00
Michael Nilsson	ae131f88c5	changed the naming of min and max value in histogram class	2016-05-17 14:02:40 -04:00
Michael Nilsson	7549beb5f2	solve merge conflict	2016-05-17 12:53:29 -04:00
Michael Nilsson	d2e913b70e	moved histogram class to core	2016-05-17 12:49:16 -04:00
Sebastian Piwell	e51b104ce8	Transformation Manager	2016-05-10 11:18:09 -04:00
Sebastian Piwell	39ff2415bb	Name changes	2016-05-09 13:09:47 -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
Michael Nilsson	47e2abf87d	new download function using std::future and std::async	2016-05-06 10:48:27 -04:00
Michael Nilsson	d0e6c8dd6e	removed progresscallback from downloadToMemory	2016-05-05 11:07:00 -04:00
Michael Nilsson	3a80405c30	solve merge conflict	2016-05-04 12:10:49 -04:00
Sebastian Piwell	355e70ca0a	Remove cygnet groups	2016-05-03 17:13:28 -04:00
Michael Nilsson	0d49076c54	solve merge conflict with develop	2016-05-03 17:11:28 -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
Alexander Bock	20532d704f	Rename Lua functions to preInitialization and postInitialization ... Apply change to all scene files in the repository Remove default_settings and default_startup as their functoins have moved into the scene file	2016-04-30 14:18:08 +02:00
Sebastian Piwell	b67180e325	Add transferFunction to dataplane	2016-04-27 14:47:06 -04:00
Alexander Bock	75175512a8	First implementation of moving the startup scripts into the scene description files	2016-04-27 16:46:31 +02:00
Sebastian Piwell	f13367e717	Kameleon plane	2016-04-25 10:37:06 -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
Michael Nilsson	c72536fbbc	untabify to make merge easier	2016-04-20 15:21:30 -04:00
Michael Nilsson	07dfafeddb	solve merge conflict with develop	2016-04-20 15:03:51 -04:00
Michael Nilsson	a068ca2030	load cygnets through mod file	2016-04-20 09:47:20 -04:00
Alexander Bock	906470f28e	Untabify the rest of the source files ... Update Ghoul repository	2016-04-18 20:14:29 +02:00
Alexander Bock	a21c9538b6	Untabify more files	2016-04-18 15:15:30 +02:00
Alexander Bock	4936a4a084	Remove sgct.h inclusion from LuaConsole ... Untabify more files	2016-04-18 11:12:12 +02:00
Alexander Bock	46b207b379	Removing some cppcheck warnings	2016-04-14 22:49:03 -04:00
Alexander Bock	b43a454e9f	Fix GCC compiler warnings	2016-04-14 22:40:25 -04:00
Alexander Bock	cf517f5309	Replacing CMake-based version setting with C++-based version ... Adding function to OpenSpace that returns the license header	2016-04-14 10:27:59 -04:00
Sebastian Piwell	fa3fc8dc87	Transfer function to dataplan and ColorBar	2016-04-13 11:36:43 -04:00
Emil Axelsson	48bd41ad9f	merge in changes from develop	2016-04-12 16:29:35 +02:00
Emil Axelsson	4ff0205eae	bring in support for multiresolution volume rendering	2016-04-11 16:56:44 +02:00
Sebastian Piwell	a55d5e9e9a	Put ISWACygnets in sceneGraph	2016-04-08 15:42:24 -04:00
Alexander Bock	352e7283d6	Enable the usage of modifiers in bindKey calls (closing #158)	2016-04-08 18:03:09 +02: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	8d3c667ada	Untabify InteractionHandler files	2016-04-08 15:13:21 +02:00
Alexander Bock	8c354e5e37	Add Lua functions to add and remove SceneGraphNodes	2016-04-08 13:35:04 +02:00
Alexander Bock	21276f2cd8	Adding methods to add and remove scenegraphnodes from the scenegraph at runtime	2016-04-08 13:11:54 +02:00
Sebastian Piwell	bf61f6f1e4	Load and read textures from memory	2016-04-06 14:17:29 -04:00
Michael Nilsson	49d8319938	merge with develop	2016-04-05 12:02:25 -04:00
Michael Nilsson	0d0f761d6e	downloadmanager return shared_ptr to FileFutures instead of bare pointers	2016-04-05 11:33:58 -04:00
Sebastian Piwell	6f1b9a9fab	Merge with screenspaceimage	2016-04-04 15:51:30 -04:00