665 Commits

Author	SHA1	Message	Date
Emil Axelsson	73ceaafd13	merge	2016-06-08 15:02:10 +02:00
Emil Axelsson	8771a238d3	improve galaxy rendering	2016-06-08 15:00:03 +02:00
Alexander Bock	5a81b1089a	Rename PerformanceHelper to PerformanceMeasurement ... Add performance measurements to FramebufferRenderer	2016-06-06 08:48:44 +02:00
Alexander Bock	14ee3af94d	Make PerformanceManager available ... Add empty PerformanceHelper file	2016-06-06 03:30:10 +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	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
Alexander Bock	6a4362d6ed	Make OpenSpace not crash on a fault rebuild of shaders	2016-06-05 18:52:00 +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	30264fb00e	Add Lua function to check whether a specific module is loaded (closing #36)	2016-06-04 19:38:56 +02:00
Alexander Bock	afe2ecc1e8	Allow RenderEngine's removeRenderProgram method to reject passed nullptrs	2016-06-04 13:39:11 +02:00
Emil Axelsson	1901166640	improved galaxy rendering	2016-06-03 11:16:57 +02:00
Alexander Bock	de3edd5022	Do not clear Framebuffer in FramebufferRenderer so that multiviewport rendering works	2016-06-01 23:15:46 +02:00
Michael Nilsson	8ca457b14c	solve merge conflict with develop	2016-05-20 09:33:41 -04:00
Emil Axelsson	f8007266e8	Merge branch 'feature/hybrid-renderer' into feature/galaxy	2016-05-19 15:25:10 +02:00
Alexander Bock	92df988bb6	Show some information when NewHorizons is not present	2016-05-18 21:37:41 +02:00
Alexander Bock	ecf1862eb3	Only show Pluto text information when NewHorizons node is present	2016-05-18 20:40:38 +02:00
Alexander Bock	ed8cebbb9d	Fix crash with incidenttargetlist for rosetta	2016-05-17 19:47:41 +02: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
Sebastian Piwell	1e4e8919c3	Set attributes of screenspacerenderable through dictionary	2016-05-03 15:35:33 -04:00
Michael Nilsson	c34fa48c73	add script to remove screenspacerenderables from renderengine	2016-05-03 13:30:22 -04:00
Michael Nilsson	4d61694f75	ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory	2016-05-03 10:39:32 -04:00
Michael Nilsson	aa40e3a8b3	fix bug where screenspace cygnets crash program if moved to fast	2016-05-02 10:03:07 -04:00
Sebastian Piwell	434f8bfabb	Some clean up and small fixes	2016-04-27 14:48:22 -04:00
Sebastian Piwell	b67180e325	Add transferFunction to dataplane	2016-04-27 14:47:06 -04:00
Alexander Bock	b46f40030b	Untabify more files	2016-04-27 14:24:58 +02:00
Emil Axelsson	7db9bf0d98	start on experimental hybrid renderer	2016-04-26 10:20:54 +02:00
Sebastian Piwell	3fc25492f2	Read texture from memory with bare pointer	2016-04-25 11:26:15 -04:00
Sebastian Piwell	f13367e717	Kameleon plane	2016-04-25 10:37:06 -04:00
Michael Nilsson	3d3e59eabe	solve merge conflict with develop	2016-04-20 16:38:41 -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
Alexander Bock	906470f28e	Untabify the rest of the source files ... Update Ghoul repository	2016-04-18 20:14:29 +02:00
Alexander Bock	c8da825098	Rename ImageSequencer2 to ImageSequencer	2016-04-18 15:14:59 +02:00
Alexander Bock	6b5681626b	Removing clang-analyze warnings	2016-04-13 11:46:07 -04:00
Emil Axelsson	48bd41ad9f	merge in changes from develop	2016-04-12 16:29:35 +02:00
Emil Axelsson	4ff0205eae	bring in support for multiresolution volume rendering	2016-04-11 16:56:44 +02:00
Sebastian Piwell	6a81065b42	ISWACygnet child of Renderable	2016-04-08 12:27:23 -04:00
Alexander Bock	7c750ff2a2	Merge branch 'develop' into feature/newhorizons	2016-04-08 13:54:23 +02:00
Michael Nilsson	49d8319938	merge with develop	2016-04-05 12:02:25 -04:00
Sebastian Piwell	b1a009e1b0	Create ISWACygnets with metadata struct	2016-04-05 11:44:49 -04:00
Sebastian Piwell	6f1b9a9fab	Merge with screenspaceimage	2016-04-04 15:51:30 -04:00
Sebastian Piwell	453fbe300e	Remove screenspacerenderables in any order	2016-04-04 15:40:45 -04:00
Sebastian Piwell	8e996f5bab	Remove screenspacerenderables and iSWACygnets	2016-04-04 15:30:54 -04:00
Sebastian Piwell	3fbfb9bb33	Remove screenspacerenderables	2016-04-04 13:49:21 -04:00
Emil Axelsson	90f3193236	Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop	2016-04-01 17:48:45 +02:00
Emil Axelsson	568a6a3416	fix bug when numberOfSamples is 0	2016-04-01 17:47:00 +02:00
Sebastian Piwell	7423d2f1c3	Change cygnet in screenspacecygnet	2016-03-31 17:14:52 -04:00
Sebastian Piwell	e729723b06	Merge with feature/screenspacerenderable	2016-03-31 15:58:54 -04:00