58 Commits

Author	SHA1	Message	Date
Sebastian Piwell	afb54ea8d1	Do not process x,y,z variables in DataProcessorText	2016-06-13 14:17:34 -04:00
Sebastian Piwell	c0b0d45470	Linux compile fix	2016-06-13 13:50:38 -04:00
Sebastian Piwell	65bacf3119	Merge with develop	2016-06-13 13:30:26 -04:00
Sebastian Piwell	661dd00129	Faster processing in DataProcessorText	2016-06-13 13:20:00 -04:00
Sebastian Piwell	39f083c342	Every datacygnet uses own dimensions	2016-06-10 15:19:32 -04:00
Michael Nilsson	9800ca72be	change demo server cygnet ids	2016-06-10 11:53:05 -04:00
Sebastian Piwell	9e7c420719	KameleonTransformationMatrix() in Transformation manager	2016-06-06 10:20:53 -04:00
Alexander Bock	50e0c1a43b	Reset Earth as camera focus	2016-06-04 20:03:16 +02:00
Alexander Bock	c6dc426211	Merge remote-tracking branch 'origin/feature/galaxy' into develop ... Conflicts: data/scene/default.scene shaders/PowerScaling/powerScalingMath.hglsl	2016-06-04 19:54:34 +02:00
Alexander Bock	36f5f7bb04	Only load cdf list if ISWA module is loaded	2016-06-04 19:39:22 +02:00
Alexander Bock	4409003524	Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop ... Conflicts: data/scene/default.scene	2016-06-04 19:06:54 +02:00
Sebastian Piwell	8e8d949107	Summer school release	2016-06-03 13:42:50 -04:00
Michael Nilsson	cb601042a6	solve merge conflict	2016-06-01 14:03:39 -04:00
Sebastian Piwell	876c86ca75	Merge fix	2016-06-01 12:09:58 -04:00
Sebastian Piwell	d33121d07c	New dataprocessor classes works with IswaGroup	2016-06-01 11:50:26 -04:00
Sebastian Piwell	1f8df7a166	Refactor dataprocessor	2016-05-31 16:52:46 -04:00
Alexander Bock	884324c467	Cleanup of default.scene and keybindings	2016-05-30 13:36:55 +02:00
Michael Nilsson	627d31a5b2	refactor textureplane and cygnetplane	2016-05-27 16:50:01 -04:00
Sebastian Piwell	95dd221f84	Fix crash when cygnet has no group	2016-05-26 15:53:44 -04:00
Sebastian Piwell	edfff68491	Memory leak fix	2016-05-26 15:29:45 -04:00
Sebastian Piwell	92f64e8653	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-24 14:42:55 -04:00
Sebastian Piwell	a4d90fb667	Load cdf files at start up	2016-05-24 14:42:38 -04:00
Michael Nilsson	8f6bc7d418	solve merge conflict	2016-05-24 14:10:37 -04:00
Sebastian Piwell	e3c1093310	Read cdf list	2016-05-23 17:24:46 -04:00
Sebastian Piwell	5b9813c817	Don't load all Histograms at startup for KameleonPlane	2016-05-23 11:08:12 -04:00
Sebastian Piwell	eefa5ea844	Small fix for ionospere	2016-05-23 09:51:10 -04:00
Sebastian Piwell	c983ecfb89	Histogram eq with group dataprocessor	2016-05-20 16:46:33 -04:00
Sebastian Piwell	57cd44535d	IswaGroup has own dataProcessor	2016-05-20 12:48:48 -04:00
Emil Axelsson	7e7d27446c	volumetric galaxy rendering	2016-05-20 11:01:01 +02:00
Sebastian Piwell	e3c7624605	Read cdf slice of any axis	2016-05-19 10:55:59 -04:00
Sebastian Piwell	f5b33158bd	Add KameleonPlanes again	2016-05-18 11:10:04 -04:00
Sebastian Piwell	ff39239b0f	Auto filter of 'background'	2016-05-17 16:11:57 -04:00
Sebastian Piwell	6c37ab289a	Group name instead of id	2016-05-17 13:25:57 -04:00
Michael Nilsson	ace6a91301	fetch ionosphere date from localhost - solve merge conflict	2016-05-16 14:27:17 -04:00
Sebastian Piwell	2a236bca77	Read ionosphere data from json file	2016-05-16 13:36:25 -04:00
Sebastian Piwell	88dca0d6c0	Ionosphere test data	2016-05-13 15:22:50 -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	39ff2415bb	Name changes	2016-05-09 13:09:47 -04:00
Sebastian Piwell	e6ac01a1c7	Set names on screenSpaceImage	2016-05-06 16:27:55 -04:00
Sebastian Piwell	d25f2e60ab	ScreenSpaceImage can take urls and is parent to ScreenSpaceCygnet	2016-05-06 16:12:30 -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	12baec3827	Small typo	2016-05-05 10:11:59 -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	3a80405c30	solve merge conflict	2016-05-04 12:10:49 -04:00
Michael Nilsson	0d49076c54	solve merge conflict with develop	2016-05-03 17:11:28 -04:00
Alexander Bock	0b30bf642e	Correctly show milkyway background texture for all scenes	2016-04-30 14:25:54 +02: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