mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-27 06:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,329 Commits 85 Branches 47 Tags
86bcbfb92c4ca76b59fc6b84f0bd17003ccd7064
Commit Graph

637 Commits

Author SHA1 Message Date
Michael Nilsson 86bcbfb92c windows fix 2016-06-13 16:27:59 -04:00
Michael Nilsson cdbe0ae1e0 solve merge conflict 2016-06-13 15:45:28 -04:00
Michael Nilsson 55e1850045 download texture resource ahead of time 2016-06-13 15:44:31 -04:00
Sebastian Piwell afb54ea8d1 Do not process x,y,z variables in DataProcessorText 2016-06-13 14:17:34 -04: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 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 db9af4c886 abstracted cygnet properties to DataCygnet 2016-06-10 16:57:55 -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 39f083c342 Every datacygnet uses own dimensions 2016-06-10 15:19:32 -04:00
Michael Nilsson 9800ca72be change demo server cygnet ids 2016-06-10 11:53:05 -04:00
Sebastian Piwell 82fed8a9c5 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-10 11:51:39 -04:00
Sebastian Piwell e2e5d39d3f x data for new offset 2016-06-10 11:51:20 -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 a48b46e921 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-06 10:21:01 -04:00
Michael Nilsson c4ae0084ae changed demo server ids 2016-06-06 10:24:02 -04: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 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 6a4362d6ed Make OpenSpace not crash on a fault rebuild of shaders 2016-06-05 18:52:00 +02:00
Alexander Bock 25b49e882d Automatically remove placeholder.png for the projection cases where a real image is available 2016-06-05 16:11:06 +02:00
Alexander Bock 9a3818f007 ProjectionComponent always loads the placeholder textures and reuses it 2016-06-04 20:58:58 +02:00
Alexander Bock ef75066478 Rename projection shaders to more sensible names 2016-06-04 20:42:10 +02:00
Alexander Bock 3d82173ff0 Don't set alpha value to 1.0 for all projection images 2016-06-04 20:33:17 +02:00
Alexander Bock fe9a97fc80 Fix GLSL compile error 2016-06-04 19:56:29 +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 4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Alexander Bock 2700ef6ea8 Moving potential targets into ProjectionComponent 2016-06-04 13:45:55 +02:00
Alexander Bock 4dda541d1f More work on refactoring RenderablePlanetProjection and RenderableModelProjection 2016-06-04 13:38:50 +02:00
Michael Nilsson 79bbd6b01b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-03 16:27:00 -04:00
Michael Nilsson 11245c9ead fix for new ionosphere data 2016-06-03 16:26:51 -04:00
Sebastian Piwell 4ae4ecca3c Auto filter at start 2016-06-03 14:16:15 -04:00
Sebastian Piwell e3dae7abc3 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-03 13:43:01 -04:00
Sebastian Piwell 8e8d949107 Summer school release 2016-06-03 13:42:50 -04:00
Michael Nilsson dbe9066829 removed shared_ptr from group events. 2016-06-03 12:44:18 -04:00
Alexander Bock 491226ea7a Started refactoring RenderableModelProjection and RenderablePlanetProjection to place common code into ProjectionComponent 2016-06-03 18:30:16 +02:00
Alexander Bock 4ef03bb02b Further cleanup of projection code 2016-06-03 17:41:35 +02:00
Michael Nilsson f9f9e9abd1 cleanup, update ghoul ref 2016-06-03 11:32:09 -04:00
Alexander Bock 89d5e69da4 Enable fading of projection layer 2016-06-03 16:57:24 +02:00
Alexander Bock 239ac0ab4e Project images of RenderableModelProjection into a separate texture layer that can be cleared faster 2016-06-03 16:54:41 +02:00