Commit Graph

1054 Commits

Author SHA1 Message Date
Erik Broberg 5f77efebb3 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-07 12:45:15 -04:00
Erik Broberg 4ac7e5b533 Add a means of comparing AABBs and basic tests 2016-06-07 12:32:30 -04:00
Kalle Bladin 05e0e8254b Double precition for view frustum culling is not used in camera space. 2016-06-07 12:03:31 -04:00
Jonathas Costa f0b76267c4 Added night texture. 2016-06-07 10:49:26 -04:00
Jonathas Costa 388bb15461 Initial implementation of Atmosphere Effects. Use framebuffer to render it. 2016-06-07 10:35:18 -04:00
Jonathas Costa d6c9a65089 Merge branch 'develop' into feature/PlanetShadows 2016-06-07 09:12:18 -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
Jonathas Costa de6446282f Fixed small bug in shadows. 2016-06-06 18:23:06 -04:00
Erik Broberg 937cbabe21 Add method contains() to class AABB 2016-06-06 17:46:02 -04:00
Kalle Bladin e251e6f60f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-06 17:40:34 -04:00
Kalle Bladin ba437809e0 Update culling to be done with double precision. 2016-06-06 17:40:11 -04:00
Jonathas Costa 2f4f50b796 Using the correct boolean test for shadows. 2016-06-06 17:30:57 -04:00
Jonathas Costa 700f411784 Merged develop branch into PlanetShadows. 2016-06-06 17:19:11 -04:00
Erik Broberg db9923dc05 Do Time -> TileProvider mapping only once per frame 2016-06-06 14:25:37 -04:00
Erik Broberg c95363a732 Fix bug that caused multiple calls glBufferData(...) 2016-06-06 13:35:11 -04:00
Erik Broberg 08af82a82a Inject TileCache into TileProvider 2016-06-06 13:04:21 -04:00
Erik Broberg 2c37ac07a0 Select CachingTileProvider or TemporalTileProvider based on input XML 2016-06-06 12:26:23 -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
Erik Broberg 85c742642e Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 22:14:08 -04:00
Erik Broberg 097c9cf1db Move TileProvider initialization to TileProviderManager 2016-06-05 22:13:50 -04:00
Kalle Bladin f51f282dbb Merge branch 'feature/interaction' into feature/globebrowsing 2016-06-05 21:28:12 -04:00
Kalle Bladin 45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -04: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
Erik Broberg c3bd0bf4ee merge 2016-06-05 18:55:16 -04:00
Alexander Bock e85144b4eb Performance optimization of ImageSequencer::instrumentActive 2016-06-06 00:45:40 +02:00
Erik Broberg 5156071361 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 18:43:01 -04:00
Erik Broberg febe7326be Read temporal meta data from XML config and use it for TileProvider selection 2016-06-05 18:39:11 -04:00
Kalle Bladin 82d375373d Make it possible to activate and deactivate layer types and blending. 2016-06-05 18:38:19 -04:00
Alexander Bock 6a2624dbb2 Enable the sorting of performance measurement values 2016-06-05 23:27:24 +02:00
Kalle Bladin 9d59c25310 Failed experiment with anisotropic filtering. 2016-06-05 12:55:00 -04: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
Erik Broberg 9aea10b03e Read and parse time format from XML at TemporalTileProvider construction 2016-06-03 16:33:28 -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