Commit Graph

843 Commits

Author SHA1 Message Date
Alexander Bock 19f8e30813 Change RenderableModel "Rotation.ModelTransform" to "ModelTransform"
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
2017-07-27 00:22:17 -04:00
Alexander Bock ce034ccc96 Remove startup warnings 2017-07-26 16:46:20 -04:00
Alexander Bock 51e1541cf1 Fix static initialization fiasco with touch input
Restore backwards compatibility of mod files
Provide better feedback about specification errors
2017-07-26 16:12:13 -04:00
Jonathas Costa 3e2155ae69 Atmosphere Culling System (still not working properly). 2017-07-25 18:15:00 -04:00
Jonathas Costa 9812abb487 Added an option to have the sun following the camera when using an ATM. Removed unused code. Added missing comments. 2017-07-25 15:55:52 -04:00
Jonathas Costa f7cddbad7f Fixed background exposure controls. 2017-07-24 22:34:41 -04:00
Jonathas Costa 7096aeb9dd Atmosphere is now a separated node in OS. Removed ATM code from renderableglobe and renderableplanet. 2017-07-24 17:05:30 -04:00
Alexander Bock 036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Jonathas Costa 20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Alexander Bock 1abb9ccfe6 Update the Sun glare reference 2017-07-21 10:04:53 -04:00
Jonathas Costa 80c8c649ac Updated satellites info. 2017-07-20 10:46:44 -04:00
Kalle Bladin 3aa8f2a056 Recompile shaders at initialization of globes 2017-07-19 10:01:53 +02:00
Kalle Bladin a14eae32e4 Merge branch 'master' into feature/globe-generalization 2017-07-18 15:12:20 +02:00
Emil Axelsson 5ced910f79 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp
2017-07-18 10:54:41 +02:00
Jonathas Costa b0c65d416b Merged master into NewAtmosphere. 2017-07-17 16:22:33 -04:00
Jonathas Costa 5ba7c5d66f Updated atmosphere scene file. 2017-07-17 15:19:17 -04:00
Alexander Bock 00e684f7dc Merge remote-tracking branch 'origin/master' into misc/cleanup
# Conflicts:
#	data/scene/default.scene
#	modules/globebrowsing/globes/pointglobe.cpp
#	modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
2017-07-15 13:22:46 -04:00
Matthew Territo 0dc96c3bc8 default, osirisrex, & satellites 2017-07-14 18:22:02 -06:00
Alexander Bock 35636890da Various fixes for the New Horizons scene
- Fix transparency issue making the New Horizons module invisible
  - Fix the offsets of the instruments on board New Horizons
  - Fix the missing projections occurred by switching the radius specifications from PSC to regular coordinates
  - Update the accurate kernel usage
2017-07-14 18:53:40 -04:00
Alexander Bock 0a93fa64c4 Remove non-existing resetCameraDirection 2017-07-14 16:02:19 -04:00
Kalle Bladin 1457301e1d Merge branch 'master' into feature/globe-generalization 2017-07-14 17:19:37 +02:00
Kalle Bladin 2e4f31ded8 Interaction Updates (#353)
* Interaction speed is not dependent on framerate

* Split up interaction code in files and perform smooth interpolation when changing focus

* Abstract interaction code in to functions.

* Interpolation time is dependent on angle to focus node.

* Use correct delta time when interpolating

* Fix bug regarding decomposition of camera rotation.

* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.

* Do not always rotate with object. Depending on distance

* Remove interaction depth below ellipsoid. Now able to interact without renderable

* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight

* Remove GlobeBrowsingInteractionMode

* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.

* Move properties from interaction handler to orbital navigator

* Use smooth step for follow rotation interpolator

* Rename KeyframeInteractionMode to KeyframeNavigator

* Rename files

* Clean up.

* Separate mousestate from orbitalnavigator

* Clean up

* Split keybindingmanager from interactionhandler interactionhandler

* Rename interactionhandler to navigationhandler

* Rename files

* Clean up

* Take back usage of gotochunk and gotogeo

* Rename lua library navigation

* Move functionality from navigationhandler to keyframenavigator

* Update scripts for navigation

* Comment code

* Clean up

* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.

* Update jenkins file to remove build folder before building.

* Fix error in jenkins script

* Update jenkins file

* Update jenkins file

* Revert jenkins file

* I hope this makes Jenkins happy.

* Line endings God damnit

* Line endings

* Clean up

* Fix compilation issue

* Take back default scene.

* Fix indentation

* Move functions goToGeo and goToChunk to GlobeBrowsingModule.

* Include algorithm for std::find

* Remove auto and other clean up
2017-07-14 17:17:17 +02:00
Jonathan Bosson d9fa55581f changes from PR comments 2017-07-13 20:10:35 -06:00
Kalle Bladin 42ff93c4da Add fallback texture for Mars 2017-07-14 00:26:01 +02:00
Kalle Bladin 28a6365aa2 Add the ability to have fallback textures 2017-07-13 23:49:39 +02:00
Jonathan Bosson 78c301ec8d Merge branch 'master' into feature/multitouch 2017-07-13 11:07:39 -06:00
Klas Eskilson 98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Jonathas Costa ff48f24c96 Adding satellites with ATM. 2017-07-11 17:46:15 -04:00
Jonathan Bosson 76e0e6c59c last merge with master 2017-07-10 18:41:06 -06:00
Jonathas Costa 18d8612a8a Initial implementation of multiple ATM's (still missing frustum culling and other small details). 2017-07-10 17:21:33 -04:00
Kalle Bladin 4f903ac030 Feature/globebrowsing (#334)
Layer support for globe browsing:

Add layers using the function openspace.globebrowsing.addLayer
Delete layers using openspace.globebrowsing.deleteLayer
Layer type does not necessarily have to be of tile type. For example solidcolor does not use tiles
Blend modes for layers are Normal, Add, Subtract, Multiply, Color
Layer adjustments to affect layers. The current only active one is chroma key to cut out a color from the layer. Transfer functions or clipping masks are examples of layer adjustments for the future.
Support for adding layer specifications for quickly accessing GIBS layers:
openspace.globebrowsing.createGibsGdalXml
openspace.globebrowsing.createTemporalGibsGdalXml
The arguments for these functions are currently strings. Would it be better to use a lua dictionary?
No data values for height layers are correctly regarded (can be seen on Earth. No longer bumps on the poles)
Other minor things:

Worked a bit on point globe to render globes at large distances. Currently not in use and doesn't have anything to do with the other things.
Concurrent job manager takes a thread pool as argument and not a pointer to one. This is because the concurrent job manager needs to have ownership of the thread pool for correct deinitialization. Will cause breaking change for users of concurrent job manager if merged in to master.


* Add ability to add layers programatically.

* Clean up

* Fix order of deletion in concurrent job manager and clean up

* Can create by level tile provider with empty dictionary.

* Add script to add GIBS datasets.

* Start working with layer adjustment

* Update mod files

* More work on point globe

* Add script to create temporal GIBS datasets.

* Update temporal tile provider to be able to take gdal descriptions without file path.

* Add adjustment property to layers.

* Rename adjustment layer

* Add adjustment code to all layer groups

* Remove caching of gdal datasets due to cluttering of folders

* Document layer support

* Update Mars mod

* Make Mercury great again.

* Cleanup and add blend mode Color

* Enable setting of layeradjustment and blend mode from mod files.

* No more use for grayscale color overlays. Use grayscale layer with color blend mode instead.

* Clean up mod files

* Clean up

* Clean up

* No need for grayscale layers. Reading grayscale in to rgb instead for color layers.

* Remove unused layer groups

* Correctly read to grayscale layers

* Update globe mod files

* Rename ColorOverlays to Overlays.

* Clean up

* Clean up

* Solve compilation error
2017-07-10 20:34:39 +02:00
Jonathas Costa e237b6f8e6 Adding eclipse shadows to GlobeBrowsing and ATM. 2017-07-05 14:54:45 -04:00
Emil Axelsson 2e4b908318 Work on asset loading 2017-07-05 20:17:23 +02:00
Jonathas Costa 6f8f922335 Initial Ozone Layer absorption. 2017-06-27 15:46:04 -04:00
Jonathas Costa 4ddf98472a Fixed bug in color when rendering other object in front of atm. 2017-06-23 13:37:52 -04:00
Jonathas Costa a37b0388bb Merged master into atmosphere's branch. 2017-06-21 14:46:10 -04:00
Jonathas Costa 6af9162ec2 Added a background exposure control for atm scenes. 2017-06-20 14:29:29 -04:00
Jonathas Costa 5ad00f6b45 Added fine controls for Mie Scattering as requested by Carter and John. 2017-06-16 16:15:36 -04:00
Jonathas Costa 5742e09335 Removed unused files and started cleanup of atm module for future merging with master. 2017-06-14 15:45:42 -04:00
Jonathas Costa 8c0494bd96 Disabled Ozone by default. 2017-06-09 18:28:57 -04:00
Jonathas Costa 70f798c2ef Fixed ATM in RenderablePlanet. No jittering anymore. Still needs reflectivity and clouds. 2017-06-09 18:26:19 -04:00
Alexander Bock 90c7eef724 Remove explicit coordinate transformation from RenderableConstellationBounds (closes #300) 2017-06-09 13:59:09 -04:00
Jonathas Costa f967e8dd90 Changed atm scene back to Earth. 2017-06-08 13:11:09 -04:00
Alexander Bock f1b4d6ddc7 Update Moon WMS files to allow unsafe SSL 2017-06-08 12:46:31 -04:00
Alexander Bock 1169625783 Update GDAL version to 2.2.0 2017-06-08 12:30:16 -04:00
Jonathas Costa 3df6dbb036 Merge branch 'master' into feature/NewAtmosphere 2017-06-08 12:13:32 -04:00
Alexander Bock ea44e7a26b Fix billboard rendering for satellite trails
Add necessary scene graph node for satellites into lodglobes/earth
Update base files of satellite TLEs
2017-06-07 12:42:21 -04:00
Gene Payne be1b211dfb Feature/satellites (#325)
* Initial commit of satellites test branch

* Modified code to work with batch TLE files from online links specified in .mod file. Does not yet auto-download the files.

* Added debug function to mod file for testing static points in orbit

* Fixed time offset bug that was corrupting satellite positions

* Minor changes for debug output and camera position.

* Changed to circle billboard for rendering satellite position

* Added satellite group name to each renderable title, and keyboard shortcuts for toggling visibility

* Added support for using ghoul luasocket lib to download latest satellite TLE files from celestrak.com

* Adding reference to updated Ghoul submodule containing luasocket changes

* Updating reference to latest Ghoul submodule in feature/satellites

* Updated reference to new ghoul version

* Updated reference to new ghoul submodule version for satellites

* Updated reference to new ghoul submodule version for satellits

* Updated versions of TLE files

* Added new Lua-accessible downloader available for scene loading

* Improved error handling for TLE files

* Updated submodule reference for ext/ghoul prior to luasocket addition

* Update SGCT reference
2017-06-06 13:42:38 -04:00
Alexander Bock 6a380e9e53 Update the default atmosphere values for Mars
Fix spelling error
2017-06-06 09:20:19 -04:00
Jonathas Costa c28b782ab5 Improved HDR and initial implementation of the Ozone Layer (still needs some work). 2017-06-05 17:02:01 -04:00