Commit Graph

99 Commits

Author SHA1 Message Date
Jonathas Costa a925d0646a Added lunar eclipses back. 2017-10-19 11:41:36 -04:00
Jonathas Costa 2d0da72a50 Merged master into atm. 2017-08-16 12:00:28 -04:00
Jonathas Costa 758ee8bd6d Pull request changes. 2017-08-15 18:15:56 -04:00
Alexander Bock 31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Jonathas Costa a55110e286 Merged master info NewAtmosphere. 2017-07-27 17:13:42 -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 1a475ef570 Started documenting properties
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -04:00
Jonathas Costa 20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Alexander Bock 008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Jonathas Costa b0c65d416b Merged master into NewAtmosphere. 2017-07-17 16:22:33 -04:00
Alexander Bock 0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock 4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04: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
Kalle Bladin 4ecb98f06f Feature/globe shading (#363)
* Perform Oren Nayar diffuse shading on globes.

* Remove unused propertyowner

* Enable accurate normals for globes

* Use property for accurate normals.

* Correctly calculate height when scale is changed.

* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Clean up and comment

* Convert shader indentation to spaces (Wooooops..).

* Line endings

* Line endings and small fixes

* Line endings

* Clean up
2017-07-14 16:33:03 +02:00
Jonathas Costa 39b90863d6 Fixed HDR controls for multiple atm's. 2017-07-11 14:52:59 -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
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 c28b782ab5 Improved HDR and initial implementation of the Ozone Layer (still needs some work). 2017-06-05 17:02:01 -04:00
Jonathas Costa 8b1dc6ede0 Loading image settings from file. 2017-06-03 09:32:06 -04:00
Jonathas Costa cfdff58ea6 Added Gamma Correction Control. 2017-06-01 13:39:35 -04:00
Jonathas Costa 11679cc231 Added new debug system for ATM precalculated textures. Cleaned up some of the ATM shaders. 2017-05-24 18:38:47 -04:00
Jonathas Costa 587d5c8d75 Initial merging of ATM with Globebrowsing. Still missing code. 2017-05-12 16:46:12 -04:00
Kalle Bladin 8a617ee254 Feature/globebrowsing (#281)
* Solve bug related to corrupted texture tiles for certain sizes.

* Regard layer settings when sampling height map.

* Make Tile in to a class instead of a struct.

* Memory aware lru cache. Needs cleanup.

* Clean up and comment.

* Clean up and comment.

* Clean up

* Clean up and comment.

* Fix compilation error on Windows.

* Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242

* Update the key type for the memory aware lru cache and use a unordered map instead of a map.

* Solve pixel row size bug.

* Solve initialization bug.

* Add cache size as property of the globe browsing module.

* Use memory aware tile cache for text tile provider.

* Log GDAL errors as GHOUL messages

* Add the ability to toggle tile level limiting by available data

* Add ability to toggle GDAL logging

* Add lock guard to memory aware tile cache

* create base class rawtiledatareader that can be extended with different implementations than GDAL.

* Let GdalWrapper take care of global GDAL settings.

* Move iodescription to separate file

* Move some functionality from gdalrawtiledatareader to rawtiledatareader

* Move functionality from gdalrawtiledatareader to rawtiledatareader.

* GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed.

* Add ifdef check for GLOBEBROWSING_USE_GDAL

* Implement SimpleRawTileDataReader. Currently can only read pow 2 textures.

* Change ints to unsigned long longs

* Limit number of texture creations per tile provider per frame

* Solve linker error on windows

* Fix Windows build errors

* Fix crash in reading local patches

* Update lodglobe descriptions

* Abstract away overviews in gdal raw tile data reader

* Update Mars and Moon configs.

* Update screenshot script

* Update ghoul version

* Remove use of interaction depth below ellipsoid

* Normalize direction vector

* Use scale for distance swotch

* Go back to use of interaction depth below ellipsoid

* Fix comments on pull request.

* TileProviderByLevel error does not propagate up.

* Comment on mars and moon mod file

* Add model space cut off level as a property

* Update ChunkTile struct

* Minor clean up

* Go back tu constructor for ChunkTile
2017-04-13 10:14:47 +02:00
Alexander Bock 6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock ab6a952193 Some more code cleanup 2016-12-04 11:23:41 +01:00
Alexander Bock dc3ded891b Started with code cleanup of Globebrowsing 2016-12-04 10:34:25 +01:00
Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00
kalbl 0df09d23ad Add possibility to switch geographic position 2016-11-29 13:29:02 +01:00
Alexander Bock af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +01:00
Erik Broberg 88fd08ef96 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-11-23 12:26:15 +01:00
Erik Broberg 36e3f62508 Add enabling of stats collection for ChunkedLODGlobe in GUI 2016-11-23 12:23:38 +01:00
Alexander Bock 92676c107f Remove wrong type of whitespace
Remove circular header dependency
Increase the time setting of the GUI
2016-11-12 11:16:15 +01:00
kalbl 4548394f1c Clean up and document functions in globes. 2016-10-27 15:29:41 +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 92ae076c51 Refactor CPU and GPU layer rendering settings 2016-10-25 16:35:49 +02:00
kalbl 7e0e913131 Remove pointglobe from renderableglobe 2016-10-20 16:01:34 +02:00
Erik Broberg ee9bb36a06 TileProviderManager -> LayerManager. Fix shader recompilation bug 2016-10-19 16:10:56 +02:00
kalbl 7f62bd7206 Create namespace globebrowsing. 2016-10-18 15:40:27 +02:00
kalbl 0f452b8f8b Comment and document code. 2016-10-17 16:16:50 +02:00
kalbl d7ce3cabaf Add new distance switch value PointGlobe. 2016-10-15 15:34:46 +02:00
kalbl 670497c16d Update file structure in globebrowsing 2016-10-15 13:22:22 +02:00
kalbl 2f13b9e9f4 Simplify the ability to add more per layer settings and move layered rendering src files to separate folder. 2016-10-15 03:04:09 +02:00
kalbl da947cab7e Add the settings properties gamma and multiplier to RenderableGlobe textures. 2016-10-04 00:52:18 +02:00
kalbl 423c55ba38 Update structure of properties for renderable globes. 2016-10-02 21:30:26 +02:00
kalbl fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
Erik Broberg 5cf1a4fbe1 Enable per frame toggling of RenderableGlobes for multi node sync debugging 2016-09-01 15:31:38 -04:00