mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-27 14:39:20 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,335 Commits 83 Branches 46 Tags
0ce4b5085538ef4c91bdfd0d0ea63de939b2ba1a
Commit Graph

1360 Commits

Author SHA1 Message Date
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
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
5a81b1089a Rename PerformanceHelper to PerformanceMeasurement 
Add performance measurements to FramebufferRenderer
 2016-06-06 08:48:44 +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
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
4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Alexander Bock
afe2ecc1e8 Allow RenderEngine's removeRenderProgram method to reject passed nullptrs 2016-06-04 13:39:11 +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
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
Alexander Bock
de3edd5022 Do not clear Framebuffer in FramebufferRenderer so that multiviewport rendering works 2016-06-01 23:15:46 +02:00
Alexander Bock
0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Sebastian Piwell
342b7fa985 Renamed IswaGroup to IswaBaseGroup 2016-06-01 15:25:11 -04: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
00d8445825 Increase the Syncbuffer to deal with larger scripts 2016-05-30 12:26:06 +02:00
Michael Nilsson
4bcb69739e windows fix 2016-05-25 14:06:15 -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
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
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
b964cbe1a2 Remove comments in Downloadmanager 2016-05-19 13:25:47 +02:00
Alexander Bock
caae5336b5 Make use of new thread priority scheme 
Updated Ghoul repository
 2016-05-19 13:23:40 +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
Michael Nilsson
c3a8bb9bde Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-17 17:22:00 -04:00
Michael Nilsson
2af533e6fe fetchFile in downloadmanager will fail when response status is 400 or above 2016-05-17 17:21:46 -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
Alexander Bock
e7f728868d Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-05-17 19:47:46 +02:00