2071 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Michael Nilsson	d0e6c8dd6e	removed progresscallback from downloadToMemory	2016-05-05 11:07: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
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
Michael Nilsson	e4a8683aba	fixed path to fboPass shaders in renderablePlanetProjection	2016-05-03 16:30:04 -04:00
Michael Nilsson	f3cb845be9	Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop	2016-05-03 16:08:30 -04:00
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