c20cd80eaa
Merge globebrowsing, resolve conflicts
...
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
3badd4158e
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-09-07 15:47:08 -04:00
66640c28bf
Add planet mercury as a RenderableGlobe and use in osirisrex.scene
2016-09-07 15:46:53 -04:00
672581a065
Add lod moon to scene.
2016-09-07 15:40:45 -04:00
3785d30ff6
Ability to enable and disable the ShadowMapping
2016-09-07 10:35:05 +02:00
7416d7ca69
Update mod files for osirisrex
2016-09-06 22:57:29 -04:00
33bea46d5c
Remove old rosetta kernels from 67P
2016-09-01 10:41:18 +02:00
0060e4782a
Adding a configuration value to ProjectionComponent that determines the aspect ratio of the projection texture (default = 1.0)
2016-09-01 09:54:49 +02:00
34b1401d99
Some configuration update to 67P and key bindings
2016-09-01 09:34:08 +02:00
134ece1293
Add size reference for LodEarth
2016-08-31 16:43:15 -04:00
c201957001
SizeReferenceTileProvider renders referred distance next to its text
2016-08-31 14:38:05 -04:00
b064c5606f
Add new TileProvider implementation SizeReferenceTileProvider and add to lodMars
2016-08-31 13:27:36 -04:00
8d17ad7e34
Remove TileProviderFactory and instantiate TileProviders using FactoryManager instead
2016-08-30 23:52:53 -04:00
af5c0c71e8
More explicit scheduled script helpers and set osiris rex trails enabled values at launch
2016-08-30 15:37:33 -04:00
a50cb8d06a
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-30 15:06:35 -04:00
64be557abf
Use alpha from projection texture in RenderableModelProjection.
2016-08-30 14:17:00 -04:00
73c4cb795b
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-30 14:04:39 -04:00
69681ea36e
Move helper lua functions for script scheduling to scripts/common.lua
2016-08-30 14:03:19 -04:00
8c137a78b2
Add scheduled scripts for enabling different Bennu trails
2016-08-30 13:34:56 -04:00
e7d8308537
Add objects to the osiris rex scene
2016-08-30 13:23:21 -04:00
53a626a0ea
Solve merge conflict
2016-08-30 13:12:45 -04:00
357462adac
Update osirisrex.mod and spice kernel loading order
2016-08-30 13:01:55 -04:00
b5c99604cd
Render Philae separately from Rosetta
2016-08-30 10:56:41 +02:00
c06b7bce11
Adding Philae trail
2016-08-30 10:48:12 +02:00
2a244f42b7
Updated Rosetta kernels
...
Removed old kernel torrent files
Cleaned .gitignore
2016-08-30 01:30:54 +02:00
99309b3cb3
Use more explicit names for different osiris rex trails
2016-08-29 16:52:18 -04:00
6206b47ef9
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-29 16:16:21 -04:00
b74b01d294
Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua
2016-08-29 16:16:11 -04:00
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
84834f230d
Merge branch 'develop' into feature/osirisrex
2016-08-29 13:01:28 -04:00
6884eca40e
Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta
...
Conflicts:
modules/newhorizons/rendering/renderablemodelprojection.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
modules/newhorizons/util/projectioncomponent.cpp
2016-08-29 18:34:18 +02:00
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
35462c2c53
Add improved rosetta model
2016-08-29 13:22:15 +02:00
e3780f2fc6
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-26 17:54:43 -04:00
547807a8d1
Fix problem with projection texture getting overwritten upon image projection.
2016-08-26 17:54:15 -04:00
ef94fe3533
Add key bindings file for OsirisRex scene
2016-08-26 17:36:43 -04:00
47583327ec
use additive blending for white planet markers to avoid z-fighting
2016-08-26 10:31:02 +02:00
64fca6e08d
Update start time for osiris rex
2016-08-25 20:18:16 -04:00
64187aca5d
fix but in InstrumentTimesParser that caused sequence time to be overwritten.
2016-08-25 20:17:17 -04:00
b6be6da974
add support for additive blending in renderable plane
2016-08-25 20:44:00 +02:00
e2730a45ea
Update new new horizons to use new renderables.
2016-08-24 11:44:12 -04:00
d3a0fe1553
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-23 20:50:24 -04:00
9aea11e173
Update rosetta and newhorizons to new renderable trail.
2016-08-23 20:49:35 -04:00
bbffb3929c
Update osirisrex.mission based on SPICE coverage, SPICE observations and OSIRIS-REx website
2016-08-23 20:38:49 -04:00
3ec224061d
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-23 17:30:02 -04:00
57d47cd856
Implement class RenderableTrailNew and use it for osiris rex. Higher precision than the old one.
2016-08-23 17:29:51 -04:00
f539d5b0b0
Show mission progress from osiris rex spice kernels
2016-08-23 12:43:59 -04:00
37bb16baa8
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-22 15:03:39 -04:00
f1c705fa19
Add mission description
2016-08-22 15:03:30 -04:00
6a2b422f00
Use mission file formatting favoring data as opposed to lua structure
2016-08-22 14:46:37 -04:00
Erik Broberg