Commit Graph

3421 Commits

Author SHA1 Message Date
Alexander Bock
ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
2016-08-29 15:53:59 +02:00
Alexander Bock
67f1a389d2 Move back to default.scene 2016-08-29 14:55:37 +02:00
Alexander Bock
35462c2c53 Add improved rosetta model 2016-08-29 13:22:15 +02:00
Alexander Bock
46686d55eb Set default magnification value to 1 2016-08-29 11:56:26 +02:00
Alexander Bock
193e2bdc64 Fix linking error when OpenSpace is compiled without the globebrowsing module 2016-08-29 10:45:59 +02:00
Alexander Bock
04f206da76 Compile fix in globebrowsing 2016-08-29 10:00:45 +02:00
Alexander Bock
d5063b116c Compile fixes 2016-08-29 02:33:50 +02:00
Alexander Bock
dfa0709b11 More work into removing gdal dependency to libOpenspace 2016-08-29 02:12:33 +02:00
Alexander Bock
a798a7aae7 Remove gdal include from TileDataset header 2016-08-29 01:32:21 +02:00
Alexander Bock
cb92b85081 Remove gdal include from TileProvider
Add stack include to RenderEngine
2016-08-29 01:19:57 +02:00
Alexander Bock
6d20c8301f Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 01:07:27 +02:00
Alexander Bock
be67131c33 Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 00:56:28 +02:00
Alexander Bock
227554ce40 Update Ghoul repository 2016-08-29 00:37:50 +02:00
Alexander Bock
460da3893e Add ability to define external libraries which will cause DLLs to be copied to application directories automatically
Add gdal.dll as external library to the globebrowsing module
2016-08-26 23:47:08 +02:00
Alexander Bock
ee7f886a87 Remove OsirisRex kernels in anticipation of purging 2016-08-26 21:34:03 +02:00
Alexander Bock
3dbcd20de8 Require the Qt5 modules in the Launcher application 2016-08-26 19:32:28 +02:00
Emil Axelsson
47583327ec use additive blending for white planet markers to avoid z-fighting 2016-08-26 10:31:02 +02:00
Emil Axelsson
b6be6da974 add support for additive blending in renderable plane 2016-08-25 20:44:00 +02:00
Emil Axelsson
bc58623467 add render bins to improve rendering of transparent objects using framebuffer renderer 2016-08-25 18:26:59 +02:00
Emil Axelsson
d0ec7ac735 render trails with additive blending 2016-08-25 16:32:27 +02:00
Kalle Bladin
850ccb6d3c Update rendering of shadow texture and water mask in RenderableGlobe. 2016-08-25 00:00:22 -04:00
Kalle Bladin
5551da922d Update renderables to higher precision rendering by calculating M and V matrix in double precision. 2016-08-24 16:16:31 -04:00
Kalle Bladin
e2730a45ea Update new new horizons to use new renderables. 2016-08-24 11:44:12 -04:00
Kalle Bladin
ed98107214 Small comment in renderabletrailnew 2016-08-24 11:43:09 -04:00
Kalle Bladin
22d60779c6 Update renderable planet projection to render in high precision 2016-08-24 11:42:44 -04:00
Kalle Bladin
d3a0fe1553 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 20:50:24 -04:00
Kalle Bladin
9bf696d181 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 20:50:14 -04:00
Erik Broberg
e84d3df715 Add one line spacing before mission related text 2016-08-23 20:50:02 -04:00
Kalle Bladin
9aea11e173 Update rosetta and newhorizons to new renderable trail. 2016-08-23 20:49:35 -04:00
Erik Broberg
bbffb3929c Update osirisrex.mission based on SPICE coverage, SPICE observations and OSIRIS-REx website 2016-08-23 20:38:49 -04:00
Erik Broberg
25705962cd Before accessing current mission, check if available 2016-08-23 19:53:53 -04:00
Erik Broberg
737018089c Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 18:52:36 -04:00
Erik Broberg
6952b526cc Unable to load mission file is an error 2016-08-23 18:47:28 -04:00
Erik Broberg
afc5d47ec7 Always render full depth of mission phases 2016-08-23 18:44:14 -04:00
Kalle Bladin
de7a60df9e Update comments about new renderable trail. 2016-08-23 17:58:59 -04:00
Kalle Bladin
3ec224061d Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 17:30:02 -04:00
Kalle Bladin
57d47cd856 Implement class RenderableTrailNew and use it for osiris rex. Higher precision than the old one. 2016-08-23 17:29:51 -04:00
Erik Broberg
cd16e73f56 Add node helper script for generating mission file from spice kernels 2016-08-23 12:47:41 -04:00
Erik Broberg
f539d5b0b0 Show mission progress from osiris rex spice kernels 2016-08-23 12:43:59 -04:00
Erik Broberg
3291bb5ac0 Render nested mission phases 2016-08-22 19:18:34 -04:00
Erik Broberg
6875e8c1c7 Re-fix, after doing git submodule update 2016-08-22 15:55:42 -04:00
Erik Broberg
337cc64ab1 Add forgotten file 2016-08-22 15:35:27 -04:00
Erik Broberg
81f72e0e92 Move TimeRange to OpenSpaceLib 2016-08-22 15:27:16 -04:00
Erik Broberg
fd76e8063e Fix compilation error after git pull 2016-08-22 15:26:19 -04:00
Erik Broberg
37bb16baa8 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-22 15:03:39 -04:00
Erik Broberg
f1c705fa19 Add mission description 2016-08-22 15:03:30 -04:00
Erik Broberg
6a2b422f00 Use mission file formatting favoring data as opposed to lua structure 2016-08-22 14:46:37 -04:00
Erik Broberg
b6429183d6 Move parsing of time range to TimeRange class 2016-08-22 13:13:57 -04:00
Erik Broberg
46f005fa58 Add Mission related classes. Add basic mission phase viz. Move TimeRange to separate file 2016-08-22 11:53:59 -04:00
Kalle Bladin
6d9d2b5127 Update RenderableFov to inherit transform in model matrix 2016-08-19 21:12:12 -04:00