3434 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kalle Bladin	53a626a0ea	Solve merge conflict	2016-08-30 13:12:45 -04:00
Kalle Bladin	357462adac	Update osirisrex.mod and spice kernel loading order	2016-08-30 13:01:55 -04:00
Erik Broberg	99309b3cb3	Use more explicit names for different osiris rex trails	2016-08-29 16:52:18 -04:00
Erik Broberg	6206b47ef9	Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex	2016-08-29 16:16:21 -04:00
Erik Broberg	b74b01d294	Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua	2016-08-29 16:16:11 -04:00
Kalle Bladin	e55cbaff8c	Normalize surface normal in for Rednerable globe shader and enable water mask and night texture for LodEarth in osirisrex.	2016-08-29 13:48:05 -04:00
Kalle Bladin	84834f230d	Merge branch 'develop' into feature/osirisrex	2016-08-29 13:01:28 -04: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
Kalle Bladin	a82ad66374	Add scale as a property of every scenegraph node.	2016-08-26 20:32:08 -04:00
Erik Broberg	99cfc4453f	Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex	2016-08-26 18:13:20 -04:00
Erik Broberg	4c502b1258	Avoid bind common keys twice	2016-08-26 18:13:09 -04:00
Kalle Bladin	e3780f2fc6	Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex	2016-08-26 17:54:43 -04:00
Kalle Bladin	547807a8d1	Fix problem with projection texture getting overwritten upon image projection.	2016-08-26 17:54:15 -04: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
Erik Broberg	8b4e6e855f	Mkae DeltaTimeKeys map to values relating to minutes, hours, days, years, etc	2016-08-26 17:41:44 -04:00
Erik Broberg	ef94fe3533	Add key bindings file for OsirisRex scene	2016-08-26 17:36:43 -04:00
Erik Broberg	475d4c9ec6	Break and proceed with next file if instrument times file parsing fails	2016-08-26 17:33:13 -04: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
Kalle Bladin	64fca6e08d	Update start time for osiris rex	2016-08-25 20:18:16 -04:00
Kalle Bladin	64187aca5d	fix but in InstrumentTimesParser that caused sequence time to be overwritten.	2016-08-25 20:17:17 -04:00
Kalle Bladin	14aad40e6c	Fix bug that caused crash when switching on and off night textures and water masks for RenderableGlobe	2016-08-25 13:50:46 -04: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