Commit Graph

425 Commits

Author SHA1 Message Date
kalbl ef62fdca30 New data folder structure for lodglobes 2016-11-07 22:38:14 +01:00
kalbl 156c6bab41 Merge branch 'develop' into feature/globebrowsing 2016-10-29 14:12:39 +02:00
Alexander Bock d6edfba60c Fixing the orientation of the Saturn moons 2016-10-29 11:40:35 +02:00
Alexander Bock 6689be687e Add approximated offset values to Saturn rings 2016-10-28 15:52:09 +02:00
Alexander Bock cb5f29612f Add Saturn moons to the data/scene
Add jup260 torrent download to the Jupiter system
2016-10-28 00:23:21 +02:00
Alexander Bock 18b8aab898 Changes in ProjectionComponent initialization
- Remove parsing function
  - Make ProjectionComponent accept sub-dictionary
Remove "Rotation" key-value from RenderableModelProjection
  - Information moved into RenderableFOV to do conversion between object and frame
Changes in mod files to reflect ProjectionComponent and RenderableModelProjection changes
Added Documentation to
  - RenderablePlanetProjection
  - RenderableModelProjection
  - ProjectionComponent
  - PlanetGeometry
  - ModelGeometry
2016-10-27 21:45:49 +02:00
Emil Axelsson 22847655be Add Saturn's rings to mod file 2016-10-27 15:24:06 +02:00
Erik Broberg 6104b1fb58 Change ColorTextures to ColorLayers etc 2016-10-26 18:49:51 +02:00
Erik Broberg 21b41e3ec0 Clean up and remove unused code 2016-10-26 14:40:35 +02:00
Erik Broberg a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg 220a713a57 Change scripted identifier names 2016-10-25 18:21:23 +02:00
Erik Broberg 7a0a4628a5 Add faster time out for the sometimes very slow terrain dataset 2016-10-24 20:18:07 +02:00
kalbl 2635a9db09 Remove textureinitdata since it is not used any more. 2016-10-20 15:09:38 +02:00
Emil Axelsson b87539f678 Fix const-correctness in shaders and add texture init data 2016-10-20 09:39:49 +02:00
kalbl c555a96a09 Remove use of init data for textures. 2016-10-18 18:02:14 +02:00
Erik Broberg 3f7ba91dc6 Do pre-processing for OnMoon 2016-10-17 15:02:56 +02:00
Erik Broberg 3cbe0133ee Dont set OnMoon block size explicitly 2016-10-17 15:02:17 +02:00
kalbl c516dc5b25 Solve conflict in scripts/common.lua 2016-10-11 17:51:57 +02:00
kalbl b40f884781 Change minimumpixelsize for heightmap data of Earth 2016-10-11 17:49:41 +02:00
kalbl 1a8b07f829 Add key bindings useful for temporal VIIRS browsing 2016-10-11 17:42:50 +02:00
kalbl 3bcdfdf687 Update VIIRS dataset 2016-10-10 10:48:00 +02:00
Erik Broberg dc410c213e Remove old files chunkindex.* and rename ChunkIndexTileProvider 2016-10-05 22:16:05 +02:00
kalbl da947cab7e Add the settings properties gamma and multiplier to RenderableGlobe textures. 2016-10-04 00:52:18 +02:00
kalbl dbbec58997 Update lodmars maps. 2016-10-02 21:36:22 +02:00
kalbl 423c55ba38 Update structure of properties for renderable globes. 2016-10-02 21:30:26 +02:00
kalbl c2603e5712 Update initial values 2016-09-30 01:54:28 +02:00
kalbl 619048e3b9 Add texture category GrayScaleTexture for textures with one channel. 2016-09-30 01:39:43 +02:00
kalbl fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
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