mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-08 12:39:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,675 Commits 84 Branches 46 Tags
3980aeff57e17655d1b530a7622ce357dd72aa16
Commit Graph

919 Commits

Author SHA1 Message Date
Kalle Bladin
3980aeff57 Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere. 2016-06-08 21:30:19 -04:00
Kalle Bladin
b84f5cfc05 Merge branch 'feature/globebrowsing' into feature/globe-atmosphere 2016-06-08 17:42:38 -04:00
Kalle Bladin
5e9fb5b05b Commented away use of border overlay. 2016-06-08 17:41:58 -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
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
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
Alexander Bock
146b71e129 Make performance widget graphs fill from right to left instead of circular 2016-06-07 11:16:27 +02: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
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