Commit Graph

812 Commits

Author SHA1 Message Date
Sebastian Piwell 16bdc88633 Correctly unnormalize standardscroe normalization 2016-06-20 12:01:21 -04:00
Sebastian Piwell 8468742d6b Better auto contrast 2016-06-17 14:20:06 -04:00
Alexander Bock ad1893fd6f Cleanup of ScreenSpaceRenderable
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Alexander Bock 5cc278c97f Add ModelMatrix retrieval to WindowWrapper 2016-06-16 00:57:31 +02: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 157ca752b2 Find highest value over multiple bins in histogram 2016-06-10 15:36:36 -04:00
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 146b71e129 Make performance widget graphs fill from right to left instead of circular 2016-06-07 11:16:27 +02:00
Sebastian Piwell 9e7c420719 KameleonTransformationMatrix() in Transformation manager 2016-06-06 10:20:53 -04:00
Alexander Bock 55456ae272 Add button to reset performance measurements
Clang compile fix
2016-06-06 10:23:28 +02:00
Alexander Bock 5a81b1089a Rename PerformanceHelper to PerformanceMeasurement
Add performance measurements to FramebufferRenderer
2016-06-06 08:48:44 +02:00
Alexander Bock 6af96c4ef3 Add macro for easy generation of PerformanceHelper 2016-06-06 07:09:54 +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 ff0b916b90 Started implementing PerformanceHelper class 2016-06-06 03:53:42 +02:00
Alexander Bock 1430f6b9c2 Clang compile fix 2016-06-06 03:34:56 +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 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
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 4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop
Conflicts:
	data/scene/default.scene
2016-06-04 19:06:54 +02:00
Michael Nilsson f9f9e9abd1 cleanup, update ghoul ref 2016-06-03 11:32:09 -04:00
Emil Axelsson 1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Alexander Bock 4c679c15ea Allow the disabling of ISWA components 2016-06-02 13:25:05 +02:00
Alexander Bock 0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Alexander Bock a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
2016-06-01 19:46:23 +02:00
Alexander Bock c84972dee0 Updating versioning number to prerelease-9 (IPS) 2016-05-31 18:26:20 +02:00
Sebastian Piwell c983ecfb89 Histogram eq with group dataprocessor 2016-05-20 16:46:33 -04:00
Emil Axelsson f8007266e8 Merge branch 'feature/hybrid-renderer' into feature/galaxy 2016-05-19 15:25:10 +02: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 e51b104ce8 Transformation Manager 2016-05-10 11:18:09 -04:00
Sebastian Piwell 39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Michael Nilsson f2b802b317 MemoryFile har now char pointer and size instead of string 2016-05-06 16:39:24 -04:00
Michael Nilsson d63dd7db44 remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile 2016-05-06 15:56:12 -04:00
Michael Nilsson cbd6fd9234 iswacygnets now use new download funtions aswell 2016-05-06 15:09:09 -04:00
Michael Nilsson 47e2abf87d new download function using std::future and std::async 2016-05-06 10:48:27 -04:00
Michael Nilsson d0e6c8dd6e removed progresscallback from downloadToMemory 2016-05-05 11:07:00 -04:00
Michael Nilsson 3a80405c30 solve merge conflict 2016-05-04 12:10:49 -04:00
Sebastian Piwell 355e70ca0a Remove cygnet groups 2016-05-03 17:13:28 -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