Commit Graph

48 Commits

Author SHA1 Message Date
Alexander Bock df68ab557d * Rudimentary fix to make side_by_side stereo work in master
* Fix Triton asset file
 * Display an error if no Property matches a regex in setPropertyValue
 * Correct user-facing name for some Moon assets
 * Add fade in and fade out helping functions
 * Reenable label fading in New Horizons
 * Added GUI hint to hide uninteresting nodes
 * Set Hidden Hint on barycenter nodes
2018-03-17 16:54:42 -04:00
Alexander Bock db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Alexander Bock d1cdc3d26f Merge branch 'master' into feature/PerformanceATM
# Conflicts:
#	data/assets/default.scene
#	data/assets/scene/solarsystem/planets/earth/earth.asset
2018-03-14 23:26:56 -04:00
Alexander Bock a1451182dd Split satellites into separate assets 2018-03-14 21:43:53 -04:00
Alexander Bock b625a0538d Simplification of the satellite asset
Add more satellites
2018-03-14 17:44:08 -04:00
Alexander Bock 3912936b18 Fixing satellite asset 2018-03-14 14:19:09 -04:00
Alexander Bock 7503af1f3a Merge branch 'master' into satellite_asset 2018-03-14 13:30:09 -04:00
Jonathas Costa d2fa7140d7 Fixed compiling issues with log, reset night layer configuration and disabled earth's shading by default. (#552) 2018-03-14 13:18:42 -04:00
Jonathas Costa 1feb3ea771 Merge branch 'master' into feature/PerformanceATM 2018-03-13 16:51:51 -04:00
Jonathas Costa 880b39b821 Fixed night layer. 2018-03-13 15:15:19 -04:00
Alexander Bock 737e82584a Issue/24 (#549)
* Implemented property animation mechanism
 * Added easing functions to Ghoul and make them usable in animation
 * Make sure that we don't leave properties around if SceneGraphNodes are deleted
 * Adding opacity settings to base renderables
2018-03-13 10:35:10 -04:00
Alexander Bock 5b6ae62bab Add Override parameter for URLSynchronization
Add PerformShading asset parameter for RenderablePlanet
Disable shading on default for Earth
2018-03-09 11:42:32 -05:00
Alexander Bock 33d9ed19f7 Undo change in World_Imagery file 2018-03-07 18:16:45 -05:00
Alexander Bock a3c849843f Feature/new formatting (#547)
* Change to new logging format (closes #542)
 * Adds a screenshots folder that uses the application startup time
 * Creating focus nodes for VRT files if the info files contain location information
 * Fix issue with removing virtual properties
 * Add a method for returning the cartesian coordinates for a geolocation on a planet
2018-03-07 18:10:32 -05:00
Emil Axelsson 4675554471 One Property Tree (#500)
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
2018-03-06 16:59:06 +01:00
GPayne a098a8edf3 Satellites are now working with new asset architecture 2018-03-02 18:47:27 -07:00
GPayne 2b4d449329 Put all satellite assets into a single asset file 2018-03-02 18:05:56 -07:00
GPayne 268a84d776 Merge branch 'master' into satellite_asset 2018-03-01 11:41:04 -07:00
GPayne e9ec44fa72 Modifying satellite files for asset architecture 2018-03-01 11:35:28 -07:00
Alexander Bock 1193e14c14 Feature/sync cleanup (#535)
* Cleanup in Sync module
 * Correctly name mar097 asset name
2018-02-24 14:18:14 -05:00
Alexander Bock c1c6e1397c Add checks to asset_helper that check the length of passed table to registerSceneGraphNodes and registerSceneGraphNodesAndExport
Add check to procedural_globe that checks the parameters to createGlobes
Fix issues with Ganymede, Triton, and Dione
2018-02-23 22:52:22 -05:00
Alexander Bock 58f79a8851 Issue/518 (#529)
* Adding ScreenSpaceSpout object to display spout textures in screen space
 * Enable the clearing of option properties
 * Fix crash in ScreenSpaceImageLocal specification
 * Split RenderablePlane into RenderablePlaneImageLocal and RenderablePlaneImageOnline
 * Add RenderablePlane Spout
 * Rename Texture parameter in ScreenSpaceImageOnline into URL

Closes #518
2018-02-23 13:24:35 -05:00
GPayne ebb4a12ef9 Modified satellite content to work with new asset architecture. Still has a problem with require vs. request asset. 2018-02-22 14:38:10 -07:00
Alexander Bock a112ebcec7 Specify simplification of field of view renderables 2018-02-19 16:28:18 -05:00
Alexander Bock 315b125172 Various New Horizons fixes
- Make it possible to toggle labels again
 - Remove Spice calls that lead to exceptions every frame
 - Rearrange loading of Spice kernels to reduce error messages
 - Set image sequence to hybrid
 - Fix height exaggeration slider value range
 - Display "No image" for image radio buttons
 - Use correct texture clamping method to prevent polar pinch color issue with LinearMipMap
 - Add documentation to ImageSequence
2018-02-19 08:06:51 -05:00
Alexander Bock ebe1159f00 WMS file cleanup 2018-02-05 17:37:13 -05:00
Emil Axelsson 2758b35dec Feature/mipmapping (#454)
* Enable mipmapping for textures where it was previously disabled

* Fix mipmapping for renderable projections
2018-01-09 17:52:34 +01:00
Emil Axelsson a0218dcbbd Add request timeouts for all wms datasets (#456) 2018-01-09 16:42:41 +01:00
Alexander Bock 7789f7d612 Add spherical grids to digital universe 2018-01-09 09:45:44 -05:00
Emil Axelsson 1e89038517 Add request timeout for liu WMS servers 2018-01-09 10:54:33 +01:00
Alexander Bock 1867d07fc1 Update H2 regions to new dataset 2018-01-08 21:59:22 -05:00
Alexander Bock edc250deb8 Cleanup core script extensions
Cleanup default scripts
2017-12-31 23:26:38 -05:00
Alexander Bock 8ea5837f00 Various updates and fixes to scene and assets 2017-12-31 17:26:46 -05:00
Alexander Bock 2d2bd4518f Update default values for some DU assets 2017-12-29 20:25:12 +01:00
Alexander Bock 1ddde4b6e1 Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management
# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/abell/abell.mod
#	data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
#	data/scene/digitaluniverse/constellations/constellations.mod
#	data/scene/digitaluniverse/grids/grids.mod
#	data/scene/digitaluniverse/quasars/quasars.mod
#	data/scene/digitaluniverse/sloandss/sloandss.mod
#	data/scene/digitaluniverse/tully/tully.data
#	data/scene/digitaluniverse/tully/tully.mod
#	data/scene/earth/earth.mod
#	data/scene/grids/grids.mod
#	data/scene/mars/mars.mod
#	data/scene/milkyway/digitaluniverse/digitaluniverse.mod
#	data/scene/moon/moon.mod
#	data/scene/satellites/tle/geo.txt
#	data/scene/satellites/tle/gps-ops.txt
#	data/scene/satellites/tle/stations.txt
#	modules/imgui/src/renderproperties.cpp
#	modules/sync/ext/libtorrent
#	openspace.cfg
#	src/rendering/renderengine.cpp
2017-12-27 19:39:40 +01:00
Alexander Bock fb8114f5fc Cleanup of Earth, Moon, and Mars WMS configuration files 2017-12-26 19:45:33 +01:00
Alexander Bock 5fc297cdcf Add Phobos and Deimos 2017-12-26 18:19:15 +01:00
Alexander Bock dd689b6ac1 Fix size of the logo on the loading screen
Reduce the font size on the loading screen
Add moons to Neptune and Uranus
Fix specification of Mercury
2017-12-26 17:20:06 +01:00
Alexander Bock 28750b3926 Add Saturn minor moons 2017-12-26 12:16:09 +01:00
Alexander Bock fef18e549d Exchange old jup260 kernel for updated jup310 and 341
Add asset files for Jupiter's minor moons
2017-12-26 10:53:15 +01:00
Alexander Bock 08ba7fada5 Fix Gui paths for Voyager 1 and Voyager 2 2017-12-25 10:29:18 +01:00
Alexander Bock fad87fc4e9 Add old Pluto image to the selection of textures
Have newhorizons.asset require all child assets to ensure initialization
2017-12-25 09:31:25 +01:00
Alexander Bock d749c43a54 Enable multiple directories for image sequence
Set correct maximum text size values for Exoplanets and Starlabels
Fix Rosetta scene and rendering on MacOS
Add Voyager scene
2017-12-25 09:09:19 +01:00
Alexander Bock 7920c97767 Fix the map configurations for Mars
Include hotfix for limiting the number of concurrent downloads
2017-12-24 18:23:18 +01:00
Alexander Bock e74801b490 Enable RenderablePlanetProjection to have a selection of possible targets and change and hotload them at runtime
Makke RenderablePlanetProjection work if no base texture is loaded
2017-12-23 20:24:19 +01:00
Alexander Bock 32534e43c7 Specify New Horizons location relative to Pluto rather than SSB 2017-12-23 17:38:54 +01:00
Alexander Bock 0149162fbe Move deinitialization of Assets from OpenSpaceEngine::destroy into OpenSpaceEngine::deinitialize as some of its components might be needed in the asset's deinitialization (like MissionManager)
Add function to unload Mission file
2017-12-23 17:32:28 +01:00
Alexander Bock 310bdf6be9 Completed conversion of of scene/mod files 2017-12-23 16:39:27 +01:00