Commit Graph

435 Commits

Author SHA1 Message Date
kalbl d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
kalbl 82d08ec45e Enable VIIRS by default 2016-11-07 22:57:19 +01:00
kalbl ef62fdca30 New data folder structure for lodglobes 2016-11-07 22:38:14 +01:00
Alexander Bock f99513a976 Remove the km to m conversion in RenderableFoV (closing #156) 2016-11-07 16:15:28 +01:00
Alexander Bock 921f5060c4 Move mission scene files into their own subdirectory missions 2016-11-07 13:12:41 +01:00
Alexander Bock af7e43c66a Rename bind_keys.lua script file to bind_common_keys.lua
Move SPICE kernel declaration from osirisrex.scene into the osirisrex mod file
2016-11-07 11:06:52 +01:00
Alexander Bock 4caa3d25ba Add documentation to the rosetta scene keyboard bindings 2016-11-07 10:34:19 +01:00
Alexander Bock 286eb89048 Add more documentation to the bindKey functions of NewHorizons and OsirisRex 2016-11-07 00:21:55 +01:00
Alexander Bock fd98f311d3 Some cleanup of scene files
Exceptions in preInitialization scripts no long crash the application
2016-10-31 11:43:36 +01:00
Alexander Bock ded3cb20ee Update Venus to make it not be located in the Sun 2016-10-29 15:48:05 +02:00
Alexander Bock 96e27913ca Add documentation to RenderableRings
Change Size to be specified in meters instead of powerscaled scalars
2016-10-29 15:24:39 +02: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