453 Commits

Author	SHA1	Message	Date
Michael Nilsson	f41bf3e424	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-13 15:32:51 -04:00
Michael Nilsson	ece7519b8f	solve merge conflict	2016-05-13 15:32:30 -04:00
Sebastian Piwell	88dca0d6c0	Ionosphere test data	2016-05-13 15:22:50 -04:00
Michael Nilsson	d37de2e582	moved histogram stuff to Histogram class, fixed miscalculated standard deviation	2016-05-13 15:16:43 -04:00
Sebastian Piwell	fec15357e8	Moved function body	2016-05-13 14:29:25 -04:00
Sebastian Piwell	1eb0d47fad	DataProcessor class	2016-05-13 14:17:42 -04:00
Sebastian Piwell	c81078682d	Solved iSWA name problem	2016-05-13 11:00:50 -04: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	929fe810df	Set scale and position for ScreenSpaceCygnets at start up	2016-05-13 09:45:37 -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	9da4f36ad0	Read cygnet options from json	2016-05-12 15:39:14 -04:00
Sebastian Piwell	a28abd7774	iSWA Screen Space Options	2016-05-12 15:10:17 -04:00
Sebastian Piwell	c2443a9ee2	Merge branch 'develop' into feature/iSWA	2016-05-11 13:30:59 -04:00
Sebastian Piwell	e51b104ce8	Transformation Manager	2016-05-10 11:18:09 -04:00
Sebastian Piwell	18c83a3bd7	Clamp valu in dataplane shader	2016-05-09 15:33:07 -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	2b541127fa	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-09 11:24:33 -04:00
Michael Nilsson	279d85f0c2	windows fix	2016-05-09 11:24:05 -04:00
Michael Nilsson	819b227976	bugfix, reset dataBuffer in DataPlane before append new data	2016-05-09 09:09:47 -04:00
Alexander Bock	02674cb1c5	Cleanup in projection classes	2016-05-08 16:20:51 +02:00
Alexander Bock	bee9309f98	Using correct w-component for multimodelgeometry rendering	2016-05-08 16:19:34 +02:00
Michael Nilsson	ea5006f9c6	removee displaying propery owner name from gui properties	2016-05-06 17:21:48 -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	997b9154e3	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-06 15:09:29 -04:00
Michael Nilsson	cbd6fd9234	iswacygnets now use new download funtions aswell	2016-05-06 15:09:09 -04:00
Sebastian Piwell	9eb6804a29	Created GuiISWAComponent	2016-05-06 11:57:21 -04:00
Michael Nilsson	36ce30e0a8	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-06 10:48:40 -04:00
Michael Nilsson	47e2abf87d	new download function using std::future and std::async	2016-05-06 10:48:27 -04:00
Sebastian Piwell	e6adcfba27	Replaced SimpleSphereGeometry with PowerScaledSphere	2016-05-06 10:32:09 -04:00
Sebastian Piwell	c284986c21	Implemented dataSphere	2016-05-05 17:57:52 -04:00
Sebastian Piwell	b56f85e968	Refactor of ISWACygnet class tree	2016-05-05 15:36:00 -04:00
Sebastian Piwell	c45121e12c	Filled in CygnetSphere	2016-05-05 10:55:31 -04:00
Michael Nilsson	df030b4529	warnings if download to memory failed for some reason	2016-05-05 10:53:50 -04:00
Sebastian Piwell	12baec3827	Small typo	2016-05-05 10:11:59 -04:00
Sebastian Piwell	8f730987df	Use frameTransformationMatrix from SpiceManager	2016-05-04 17:38:21 -04:00
Sebastian Piwell	930cd8e0b4	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-04 15:00:45 -04:00
Sebastian Piwell	99a3ebf8da	Coordinate transformation with kameleon	2016-05-04 15:00:38 -04:00
Michael Nilsson	bf9a819617	windows fix, add base module as dependency to iswa	2016-05-04 12:43:59 -04:00
Michael Nilsson	3a80405c30	solve merge conflict	2016-05-04 12:10:49 -04:00
Sebastian Piwell	4056b36ba5	Add GuiISWAComponent	2016-05-04 12:06:29 -04:00
Michael Nilsson	05cc0850b7	if screenspacecygnet already downloading image, dont send another request	2016-05-04 12:04:08 -04:00
Sebastian Piwell	8fc89d8762	Can't add different cygnet type to a group	2016-05-04 09:37:20 -04:00