mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,707 Commits 99 Branches 46 Tags
db4524d2acc48941ae45d9d903f28f5d007cd4fc
Commit Graph

397 Commits

Author SHA1 Message Date
Alexander Bock
f5f70eb9db Adding Spice file for pluto to the pluto scene 2016-09-27 11:11:04 +02:00
Alexander Bock
a688a1eee9 Rename Ephemeris to Translation 2016-09-26 13:34:22 +02:00
Alexander Bock
488fc9f994 Merge branch 'feature/missions' into develop 2016-09-25 14:26:09 +02:00
Alexander Bock
49308c658c Moved Missions from NewHorizons module into core 2016-09-24 19:32:42 +02:00
Alexander Bock
6cd33e23f5 Add a version of OsirisRex without globebrowsing 2016-09-24 08:30:58 +02:00
Alexander Bock
bc1366e79d Use correct identifiers in OsirisRex data files 2016-09-20 21:23:58 +02:00
Alexander Bock
f15efdad6e Add OsirisRex data file 2016-09-20 21:09:59 +02:00
Alexander Bock
428f488bb6 Add documentation to Ephemeris classes 
Remove unused "Reference" specification from mod files
Add osirisrex files to gitgnore
Make Ephemeris values into properties
 2016-09-20 19:24:14 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Kalle Bladin
5cf9a89223 Add new local patches to mars 2016-09-15 12:37:01 -04:00
Kalle Bladin
ae65b8f306 Clean up globe browsing module files. 2016-09-14 21:17:26 -04:00
Kalle Bladin
7a22763143 Remove texture cateory HeightMapOverlays 2016-09-14 20:08:33 -04:00
Kalle Bladin
0442046262 Update openspace config and mod files for osirisrex 2016-09-13 12:27:50 -04:00
Kalle Bladin
be8f7bf541 Update scene files 2016-09-13 11:55:32 -04:00
Kalle Bladin
b27e9548a1 Update mod files 2016-09-07 21:39:59 -04:00
Erik Broberg
ef5e69d78e Change LodMercury GUI name to Mercury 2016-09-07 17:54:44 -04:00
Erik Broberg
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
Erik Broberg
3badd4158e Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-09-07 15:47:08 -04:00
Erik Broberg
66640c28bf Add planet mercury as a RenderableGlobe and use in osirisrex.scene 2016-09-07 15:46:53 -04:00
Kalle Bladin
672581a065 Add lod moon to scene. 2016-09-07 15:40:45 -04:00
Alexander Bock
3785d30ff6 Ability to enable and disable the ShadowMapping 2016-09-07 10:35:05 +02:00
Kalle Bladin
7416d7ca69 Update mod files for osirisrex 2016-09-06 22:57:29 -04:00
Alexander Bock
33bea46d5c Remove old rosetta kernels from 67P 2016-09-01 10:41:18 +02:00
Alexander Bock
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
Alexander Bock
34b1401d99 Some configuration update to 67P and key bindings 2016-09-01 09:34:08 +02:00
Erik Broberg
134ece1293 Add size reference for LodEarth 2016-08-31 16:43:15 -04:00
Erik Broberg
c201957001 SizeReferenceTileProvider renders referred distance next to its text 2016-08-31 14:38:05 -04:00
Erik Broberg
b064c5606f Add new TileProvider implementation SizeReferenceTileProvider and add to lodMars 2016-08-31 13:27:36 -04:00
Erik Broberg
8d17ad7e34 Remove TileProviderFactory and instantiate TileProviders using FactoryManager instead 2016-08-30 23:52:53 -04:00
Erik Broberg
af5c0c71e8 More explicit scheduled script helpers and set osiris rex trails enabled values at launch 2016-08-30 15:37:33 -04:00
Erik Broberg
a50cb8d06a Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-30 15:06:35 -04:00
Kalle Bladin
64be557abf Use alpha from projection texture in RenderableModelProjection. 2016-08-30 14:17:00 -04:00
Erik Broberg
73c4cb795b Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-30 14:04:39 -04:00
Erik Broberg
69681ea36e Move helper lua functions for script scheduling to scripts/common.lua 2016-08-30 14:03:19 -04:00
Erik Broberg
8c137a78b2 Add scheduled scripts for enabling different Bennu trails 2016-08-30 13:34:56 -04:00
Kalle Bladin
e7d8308537 Add objects to the osiris rex scene 2016-08-30 13:23:21 -04:00
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
Alexander Bock
b5c99604cd Render Philae separately from Rosetta 2016-08-30 10:56:41 +02:00
Alexander Bock
c06b7bce11 Adding Philae trail 2016-08-30 10:48:12 +02:00
Alexander Bock
2a244f42b7 Updated Rosetta kernels 
Removed old kernel torrent files
Cleaned .gitignore
 2016-08-30 01:30:54 +02: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
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
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
35462c2c53 Add improved rosetta model 2016-08-29 13:22:15 +02:00
Kalle Bladin
e3780f2fc6 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-26 17:54:43 -04:00