386 Commits

Author	SHA1	Message	Date
Alexander Bock	f2347a5f56	Merge remote-tracking branch 'origin/feature/iSWA' into release/ips	2016-06-17 11:31:33 +02:00
Alexander Bock	cbb7a3e1db	Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips	2016-06-17 11:31:17 +02:00
Kalle Bladin	96d7a1dd44	Solve synching bug in time class.	2016-06-16 17:50:19 -04:00
Alexander Bock	9c83dc1135	Make TransformationManager work without Kameleon module	2016-06-15 22:59:16 +02:00
Sebastian Piwell	78b827d9d6	Histogram with standard score normalization	2016-06-15 10:32:59 -04:00
Alexander Bock	896d9bd1db	Merge remote-tracking branch 'origin/feature/iSWA' into release/ips	2016-06-14 22:52:30 +02:00
Sebastian Piwell	d368ad9054	Correct coordinate transformation	2016-06-14 13:33:55 -04:00
Michael Nilsson	86bcbfb92c	windows fix	2016-06-13 16:27:59 -04:00
Sebastian Piwell	65bacf3119	Merge with develop	2016-06-13 13:30:26 -04:00
Sebastian Piwell	3e034b73bb	Solved merge conflict	2016-06-13 13:25:03 -04:00
Sebastian Piwell	661dd00129	Faster processing in DataProcessorText	2016-06-13 13:20:00 -04:00
Michael Nilsson	cb484f3ce5	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-06-10 15:48:46 -04:00
Michael Nilsson	1633d9048e	cleanup iswacygnet header, 90 degree rotation fix, small optimization	2016-06-10 15:48:34 -04:00
Sebastian Piwell	157ca752b2	Find highest value over multiple bins in histogram	2016-06-10 15:36:36 -04:00
Kalle Bladin	012bcaefaf	Solve merge conflicts.	2016-06-07 12:54:52 -04:00
Sebastian Piwell	9e7c420719	KameleonTransformationMatrix() in Transformation manager	2016-06-06 10:20:53 -04:00
Kalle Bladin	f51f282dbb	Merge branch 'feature/interaction' into feature/globebrowsing	2016-06-05 21:28:12 -04:00
Kalle Bladin	d7278bfcc8	Update camera class.	2016-06-05 21:07:36 -04:00
Alexander Bock	55d484205a	Rename performance file	2016-06-06 02:14:42 +02:00
Alexander Bock	f8f89e6fd1	Moving more code into performance files	2016-06-06 02:12:46 +02:00
Alexander Bock	2c8e3fd7b9	Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent	2016-06-06 01:54:41 +02:00
Erik Broberg	6285cac488	Add more flexibility to construction of Time instances	2016-06-05 18:35:40 -04:00
Alexander Bock	4c679c15ea	Allow the disabling of ISWA components	2016-06-02 13:25:05 +02:00
Erik Broberg	9ddb54d546	Add explicit default constructor and copy constructor to class Time	2016-05-31 19:50:11 -04:00
Erik Broberg	6d4c9331dd	Enable Time conversion to ISO8601 format	2016-05-31 19:37:17 -04:00
Kalle Bladin	bbc002514d	Possible to render in fisheye mode now that the combinedViewMatrix() function in the camera class actually returns the combined view matrix.	2016-05-27 12:13:40 -04:00
Kalle Bladin	060298f74b	Solve precision problem that causes jagged movement.	2016-05-27 11:09:07 -04:00
Kalle Bladin	e0814a23dd	The ellipsoid of a globe is used to determine how to move the camera in a new interaction mode.	2016-05-26 18:56:36 -04:00
Michael Nilsson	4bcb69739e	windows fix	2016-05-25 14:06:15 -04:00
Kalle Bladin	8ab0a70886	Solve merge conflict for interaction.	2016-05-25 13:20:12 -04:00
Kalle Bladin	09ca260778	Rotating with orbital interaction mode.	2016-05-24 13:26:07 -04:00
Sebastian Piwell	1d8c77ee3b	Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA	2016-05-20 16:46:41 -04:00
Sebastian Piwell	c983ecfb89	Histogram eq with group dataprocessor	2016-05-20 16:46:33 -04:00
Kalle Bladin	309c97098c	Changed interface of camera class	2016-05-20 16:09:35 -04:00
Michael Nilsson	4056cbb160	linux fix	2016-05-20 15:08:00 -04:00
Michael Nilsson	0ccc48d1c3	windows fix	2016-05-20 14:18:49 -04:00
Kalle Bladin	74f190ef7e	More clean up in camera class.	2016-05-20 11:46:36 -04:00
Kalle Bladin	e057f60a18	Remove psc internally from camera class.	2016-05-20 10:31:33 -04:00
Kalle Bladin	1db9f2f60c	Clean up camera class.	2016-05-19 23:21:48 -04:00
Kalle Bladin	9dda48d44b	Remove functions setViewRotationMatrix and compileViewRotationMatrix from camera class.	2016-05-19 12:22:55 -04:00
Kalle Bladin	4ac19f21b7	Solve merge conflict.	2016-05-19 12:10:14 -04:00
Kalle Bladin	0215c63bab	Camera class compiles but missing implementation of two functions.	2016-05-19 11:29:31 -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	2a236bca77	Read ionosphere data from json file	2016-05-16 13:36:25 -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
Alexander Bock	d66e2e1b59	Add time information to SpiceExeception	2016-05-05 10:46:26 +02:00