296 Commits

Author	SHA1	Message	Date
Kalle Bladin	012bcaefaf	Solve merge conflicts.	2016-06-07 12:54:52 -04:00
Alexander Bock	55456ae272	Add button to reset performance measurements ... Clang compile fix	2016-06-06 10:23:28 +02:00
Kalle Bladin	f51f282dbb	Merge branch 'feature/interaction' into feature/globebrowsing	2016-06-05 21:28:12 -04:00
Kalle Bladin	45e7c41690	Update camera to use double precition.	2016-06-05 21:27:20 -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	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	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
Kalle Bladin	3ff322c282	Clean up camera class	2016-05-20 12:03:05 -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
Erik Broberg	afd8ba5e9b	Added copy constructor for Camera	2016-05-11 18:36:19 -04:00
Sebastian Piwell	e51b104ce8	Transformation Manager	2016-05-10 11:18:09 -04:00
Michael Nilsson	c72536fbbc	untabify to make merge easier	2016-04-20 15:21:30 -04:00
Kalle Bladin	aaa099d542	Solve conflict and fixed old code that did not run on OSX due to use of depricated shader functionality.	2016-04-18 23:05:19 -04:00
Kalle Bladin	ada97704f8	Solve compilation problems for OSX.	2016-04-18 22:44:20 -04:00
Erik Broberg	4073f4e6cb	Merged in branch develop to feature/globebrowsing	2016-04-18 20:02:42 -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	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
Erik Broberg	3ec7badcf0	Camera: added convenience method for getting viewRotation and added inner class SyncData	2016-04-14 17:33:52 -04:00
Erik Broberg	299cd27f2c	Fixed bug Camera (view rot matrix had translation components) and structured Camera code	2016-04-14 12:47:12 -04:00
Alexander Bock	352e7283d6	Enable the usage of modifiers in bindKey calls (closing #158)	2016-04-08 18:03:09 +02:00
Karl Bladin	ff74f0794c	Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing	2016-04-04 12:12:19 -04:00
Erik Broberg	9d45463e93	Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate	2016-03-30 19:34:42 -04:00
Emil Axelsson	ebe10a29b5	Volume rendering compatible with abuffer and framebuffer renderers	2016-03-21 16:40:24 +01:00
Alexander Bock	d0f4ab6f60	Removing Jenkins warnings	2016-02-05 23:28:45 +01:00
Alexander Bock	877a4d1ba6	Updated copyright header	2016-02-05 17:43:21 +01:00
Emil Axelsson	a6a9537b6c	Merge with antialiased abuffer	2016-02-03 17:47:29 +01:00
Emil Axelsson	d4ff8119d1	refactor abuffer and add msaa support. volumes temporarily disabled.	2016-02-02 11:30:27 +01:00
Alexander Bock	cdf228975a	Started cleanup of Time class	2015-12-23 17:44:05 -05:00