78 Commits

Author	SHA1	Message	Date
Alexander Bock	3fe802ae1f	Merge branch 'develop' into release/ips	2016-06-16 13:51:34 +02:00
Gene Payne	d5ddaf84b8	Working on global settings integrated in gui but no functionality yet	2016-06-15 14:46:19 +02:00
Alexander Bock	896d9bd1db	Merge remote-tracking branch 'origin/feature/iSWA' into release/ips	2016-06-14 22:52:30 +02: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
Michael Nilsson	9800ca72be	change demo server cygnet ids	2016-06-10 11:53:05 -04:00
Kalle Bladin	012bcaefaf	Solve merge conflicts.	2016-06-07 12:54:52 -04:00
Alexander Bock	146b71e129	Make performance widget graphs fill from right to left instead of circular	2016-06-07 11:16:27 +02:00
Michael Nilsson	c4ae0084ae	changed demo server ids	2016-06-06 10:24:02 -04:00
Alexander Bock	55456ae272	Add button to reset performance measurements ... Clang compile fix	2016-06-06 10:23:28 +02:00
Alexander Bock	742bfcfe86	Remove static min/max values and compute scaling factors directly from data	2016-06-06 09:52:47 +02:00
Alexander Bock	16559231bd	Move Performance ImGui components into separate windows	2016-06-06 09:01:15 +02:00
Alexander Bock	55bd1341e6	More work on PerformanceHelper ... Getting first version to run and produce output	2016-06-06 07:00:36 +02:00
Alexander Bock	53c35c7531	Moving performance-related collection code from RenderEngine into new PerformanceManager code	2016-06-06 03:21:25 +02:00
Alexander Bock	2c8e3fd7b9	Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent	2016-06-06 01:54:41 +02:00
Alexander Bock	e85144b4eb	Performance optimization of ImageSequencer::instrumentActive	2016-06-06 00:45:40 +02:00
Alexander Bock	6a2624dbb2	Enable the sorting of performance measurement values	2016-06-05 23:27:24 +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
Sebastian Piwell	d788e31334	Change resolution and cdf file in KameleonPlane	2016-06-02 16:25:11 -04:00
Alexander Bock	4c679c15ea	Allow the disabling of ISWA components	2016-06-02 13:25:05 +02:00
Alexander Bock	1e8d329e3d	Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95)	2016-06-02 13:12:28 +02:00
Erik Broberg	1097db4b5f	Increase value range of delta time in GUI	2016-06-01 20:53:51 -04:00
Sebastian Piwell	f079c2d18a	Solved GUI name conflict	2016-05-26 10:05:18 -04:00
Sebastian Piwell	2830708112	Fieldlines in IswaGroup	2016-05-25 14:18:16 -04:00
Sebastian Piwell	b3d5d41ca6	Auto filter property	2016-05-24 16:00:18 -04:00
Sebastian Piwell	fbcad58d98	Small bug fix	2016-05-24 15:07:51 -04:00
Sebastian Piwell	a4d90fb667	Load cdf files at start up	2016-05-24 14:42:38 -04:00
Sebastian Piwell	e3c1093310	Read cdf list	2016-05-23 17:24:46 -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
Sebastian Piwell	94d8360e73	Moved renderproperties functions	2016-05-18 09:33:32 -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
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	39ff2415bb	Name changes	2016-05-09 13:09:47 -04:00
Michael Nilsson	ea5006f9c6	removee displaying propery owner name from gui properties	2016-05-06 17:21:48 -04:00
Sebastian Piwell	9eb6804a29	Created GuiISWAComponent	2016-05-06 11:57:21 -04:00
Sebastian Piwell	4056b36ba5	Add GuiISWAComponent	2016-05-04 12:06:29 -04:00
Sebastian Piwell	1e4e8919c3	Set attributes of screenspacerenderable through dictionary	2016-05-03 15:35:33 -04:00
Sebastian Piwell	dfd1968f0b	Lua script to add cygnet	2016-05-03 13:24:17 -04:00
Michael Nilsson	aa40e3a8b3	fix bug where screenspace cygnets crash program if moved to fast	2016-05-02 10:03:07 -04:00
Michael Nilsson	c72536fbbc	untabify to make merge easier	2016-04-20 15:21:30 -04:00
Michael Nilsson	07dfafeddb	solve merge conflict with develop	2016-04-20 15:03:51 -04:00
Sebastian Piwell	b2f25b5ca7	Multiple data values on the same plane	2016-04-19 15:14:23 -04:00
Alexander Bock	906470f28e	Untabify the rest of the source files ... Update Ghoul repository	2016-04-18 20:14:29 +02:00