Commit Graph

2785 Commits

Author SHA1 Message Date
Erik Broberg 9c3a50bb22 Merge branch 'feature/globebrowsing' into feature/globe-atmosphere 2016-06-08 15:15:09 -04:00
Erik Broberg ba52acd270 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-08 15:13:28 -04:00
Erik Broberg bf5f353972 Factor out a lot of common code in ChunkRenderer 2016-06-08 15:13:04 -04:00
Jonathas Costa 335e183363 Fixed include path. 2016-06-08 14:34:04 -04:00
Kalle Bladin 884d09f733 Merge branch 'feature/globebrowsing' into feature/globe-atmosphere 2016-06-08 12:51:27 -04:00
Kalle Bladin 869be5dc44 Add glsl function to calculate intersection of ellipsoid. 2016-06-08 12:50:33 -04:00
Kalle Bladin 562e249dc9 Merge branch 'develop' into feature/globebrowsing 2016-06-08 12:32:31 -04:00
Erik Broberg 3c0aa69b16 Move call to TileProviderManager::prerender() from patchrenderer to RenderableGlobe 2016-06-08 12:05:38 -04:00
Kalle Bladin f5ecb76358 Fox compilation error for OSX 2016-06-08 11:02:09 -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
Erik Broberg 7377d098cc Solve merge conflict 2016-06-08 00:36:35 -04:00
Erik Broberg 7d1f1bd3ce Redefining Tile data structures. Tiles now have a TilePreprocessData pointer and a Status 2016-06-07 23:13:54 -04:00
Kalle Bladin ec22683568 Use spice ephemeris for renderable globe. Still not considering rotation in rendering. 2016-06-07 22:47:05 -04:00
Erik Broberg d0c7fe180f Merge similar structs RawTileData and TileIOResult 2016-06-07 21:16:43 -04:00
Erik Broberg 607356f10b Remove redundant information from RawTileData 2016-06-07 20:48:48 -04:00
Kalle Bladin d36c33cbb6 Update other modules to work with the new interaction mode and camera class. 2016-06-07 19:51:37 -04:00
Erik Broberg 887b26e441 Move numRasters to be part of DataLayout instead of DataRegion 2016-06-07 19:42:29 -04:00
Erik Broberg 28b3afc604 Add ability to do per tile preprocessing, such as calculate min max values 2016-06-07 18:54:51 -04:00
Kalle Bladin dce89545d3 Remove option to toggle use of height map and color texture and fix related crash bug. 2016-06-07 18:36:01 -04:00
Kalle Bladin bc21643f06 Add the ability to change the interaction mode dynamically and via lua script. 2016-06-07 17:25:00 -04:00
Jonathas Costa dd51c71fb1 Fixed bug in shader that was crashing OS in MacOSX. 2016-06-07 13:51:28 -04:00
Kalle Bladin 674700d2b9 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-07 12:55:10 -04:00
Kalle Bladin 012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
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
Erik Broberg 1cd06aa3c8 Add basic tests for AABB contains and intersect 2016-06-07 12:02:27 -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 releases/v0.3.3 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 7ec7bbecea Remove OpenStreetMap dataset from debugglobe 2016-06-06 17:43:34 -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 113c37203b Add some temporal wms configs 2016-06-06 12:28:02 -04:00
Erik Broberg 2c37ac07a0 Select CachingTileProvider or TemporalTileProvider based on input XML 2016-06-06 12:26:23 -04: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