Commit Graph

876 Commits

Author SHA1 Message Date
Jonathas Costa
7b99519ec4 Merge branch 'master' into feature/PerformanceATM_and_Stereo 2018-03-15 10:58:51 -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
Jonathas Costa
cc81c125b4 Merged with problems. 2018-03-14 14:43:16 -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
Alexander Bock
bc5712bc5b Remove setPropertyValue to explicitly disable shading and use the asset specification instead 2018-03-14 13:20:03 -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
Alexander Bock
2bfab657f3 Various small fixes 2018-03-14 13:13:23 -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
31cdee1fa1 Make URLSynchronization and HTTPSynchronization download into temporary files and if the download succeeds, transactionally move the temporary file into the correct destination 2018-03-10 05:08:14 -05: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
f662e031e6 Undo change in globebrowsing.asset file 2018-03-07 18:17:23 -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
Alexander Bock
ebd69d1333 Cleanup FieldlineSequence classes 2018-03-01 19:55:50 -05: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
f0a55b21ff Add implementation of pure URL synchronization from foreign sources (#533)
* Add implementation of pure URL synchronization from foreign sources
 * Added hash of concatenated URLs to the identifier
 * Make the identifier optional
 * Remove unused code
2018-02-26 21:11:07 -05: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
ee7e1b9b96 Fix with asset_helper
Initial cleanup of Sync module
2018-02-24 00:46:28 -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
Emil Axelsson
f129da5648 Additive blending for stars + add star parameters 2018-02-16 14:18:16 +01:00
Alexander Bock
d9f874472e Add comment informing the user of not using single backslashes in paths 2018-02-08 10:19:53 -05:00
Alexander Bock
3c284fc908 Set the follow focus node rotation distance for the NewHorizons scene to 20 times the planet's radius (closes #480) 2018-02-07 17:47:24 -05:00
Alexander Bock
ebe1159f00 WMS file cleanup 2018-02-05 17:37:13 -05:00
Emil Axelsson
d21654f8d5 Add comment about requiring globes when adding datasets 2018-01-11 09:41:39 +01: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
51551bc291 Move VRT specification into separate customization asset
Reenable customization scripts
Remove warning from HTTPRequest class
2017-12-31 22:13:55 -05:00
Alexander Bock
8ea5837f00 Various updates and fixes to scene and assets 2017-12-31 17:26:46 -05:00
Alexander Bock
e4875dd8d6 Remove scene folder 2017-12-30 00:15:51 +01: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
59916bc0c1 Renaming path tokens
- ${BASE_PATH} -> ${BASE}
  - ${OPENSPACE_DATA} -> ${DATA}
  - Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
2017-12-26 20:49:17 +01:00
Alexander Bock
339c45a7f6 Add specialized TaskRunner application "Sync" that only synchronizes all scenes in the asset folder
Replace TaskRoot in openspace.cfg with ${TASK} in Taskrunner
Remove Launcher
2017-12-26 20:13:23 +01:00