Commit Graph

1842 Commits

Author SHA1 Message Date
Jonathas Costa 2b99d1a2c2 Fixed bug introduced with new rendering method for G-Buffer. 2017-06-16 14:04:21 -04:00
Jonathas Costa 589e85cf58 Fixed CMakelists in ATM module. 2017-06-15 14:08:02 -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 14155f6322 Fixed Fisheye rendering for RenderablePlanet atm. 2017-06-14 15:13:53 -04:00
Jonathas Costa 59b7cf9648 Fixed position in G-Buffer from renderableplanet_vs. 2017-06-09 18:46:45 -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
Jonathas Costa f487107eaa Added missing semicolon to vertex shader. 2017-06-08 13:21:04 -04:00
Jonathas Costa 3df6dbb036 Merge branch 'master' into feature/NewAtmosphere 2017-06-08 12:13:32 -04:00
Alexander Bock 9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Jonathas Costa a24d75e691 Merge branch 'feature/NewAtmosphere' of github.com:OpenSpace/OpenSpace into feature/NewAtmosphere 2017-06-07 15:16:51 -04:00
Jonathas Costa 784ae962d4 Ozone Layer (still needs work). 2017-06-07 15:14:49 -04:00
Kalle Bladin 5575f17b46 Feature/gdalcrashfix (#331)
Saving GDAL dataset values upon initialization of dataset to avoid calling GDAL functions afterwards since it can be done concurrently. Not done for the data reading since some (not all) GDAL dataset drivers support concurrent reading. The WMS driver does not support concurrent reading, which is why we only use one worker thread per AsyncTileDataReader. Perhaps something for the future if GDAL will ensure thread saefty.

Protecting GdalRawTileDataReader with mutex lock when initializing.

Make sure read only functions in RawTileDataReader are const.

Protecting ConcurrentJobManager with mutex lock when pushing and popping to finished jobs.
2017-06-07 16:30:41 +02: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
Jonathas Costa d4dcedc663 Fixed bug in fisheye rendering. 2017-06-04 11:44:24 -04:00
Alexander Bock 013e448c36 Adding a Gui window to show the registered file paths (closes #329) 2017-06-03 14:29:33 -04:00
Alexander Bock ea8442d996 Enable networked specifications for ScreenSpaceImages 2017-06-03 13:38:02 -04:00
Jonathas Costa 8b1dc6ede0 Loading image settings from file. 2017-06-03 09:32:06 -04:00
Jonathas Costa 0965ec95ba Merged Master into ATM. 2017-06-02 19:02:29 -04:00
Jonathas Costa 1dbb65059c Added missing data for Mars and stars rendering inside atm is based on observer height. 2017-06-02 17:37:25 -04:00
Alexander Bock 994ba32f44 Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328)
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -04:00
Jonathas Costa 87c74629b2 Fixed bug in local patch normal transformation. 2017-06-02 15:58:40 -04:00
Jonathas Costa 5685b2183d Changed G-Buffer. 2017-06-02 12:29:09 -04:00
Jonathas Costa 3638fbbe6e Added new tone mapping operator. 2017-06-02 10:55:38 -04:00
Jonathas Costa 7a4d2f8cb9 Fixed water reflectance and added gamma control to ATM (Still need the add the option to turn off the atm in globebrowsing). 2017-06-01 15:17:37 -04:00
Jonathas Costa cfdff58ea6 Added Gamma Correction Control. 2017-06-01 13:39:35 -04:00
Kalle Bladin a2342dde74 Add offset property to layer render settings. 2017-06-01 18:30:40 +02:00
Jonathas Costa 47cb1cb17f Changed Tone Mapping Operator. 2017-06-01 11:49:14 -04:00
Emil Axelsson 5c67189c8d Add possibility to check if OsEng is instantiated 2017-06-01 14:09:06 +02:00
Jonathas Costa e3e1155a0e Enabled G-Buffer for space items. 2017-05-31 17:12:44 -04:00
Alexander Bock 9ea188cb2e Fixing star shaders for Mac 2017-05-31 16:55:19 -04:00
Jonathas Costa c87527e792 Fixed bug in shader. 2017-05-31 16:41:02 -04:00
Jonathas Costa 0cb741e024 Improved code and changed some hdr parameters. 2017-05-30 15:42:25 -04:00
Jonathas Costa c37cf66a52 Reflectance not working correctly yet. 2017-05-30 15:11:14 -04:00
Jonathas Costa 96e9067eed Changes to allow the correct reflectance inside ATM (code commented right now). 2017-05-30 14:23:06 -04:00
Jonathas Costa 2854435458 Fixed normal in renderable planet. Added different tone mappings (not enabled by default). 2017-05-30 11:55:44 -04:00
Kalle Bladin f51f293989 Feature/globebrowsing optimization (#310)
* Simplest possible PBO implementation.

* Add PBO class

* TileLoadJob owns raw tile data

* Working on a soluton to cache textures and reuse them

* PBO and cached textures working for one texture type. Color textures.

* Threadpool for tile requests uses LRU cache as queue

* Remove framesUntilRequestFlush

* Clean up

* Clean up

* Use prioritizing concurrent job manager

* Use TileTextureInitData to initialize RawTileDataReader.

* Class TextureContainer owns the textures to use for tiles.

* Using TileTextureInitData to determine if new caches need to be created.

* Remove WriteDataDescription

* Remove TileDataLayout

* Rendering many different layer types again

* TileProviderByLevel gives layergroup id to tile providers

* Comment away use of PBO

* Erase unfinished requests to make room for new ones

* Enable choice of PBO or not.

* Enable resetting of asynctiledataprovider

* Add the ability to use PBO and also load to CPU

* Update ghoul

* Solve culling issue.

* Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider.

* Add gpudata

* Move fetching of shader preprocessing data to LayerManager

* No comparisons to determine shader recompilation.

* Show the tile cache size in the GUI

* Clean up and comment.

* Solve bug where float is interpreted as NaN

* Enable ability to blend between layers again

* Fix single image provider

* Fix windows build error

* Fix OSX compile issue.

* Some clean up

* Showing correct texture data size

* Enable use of text tile providers again. No backgroupd image path however.

* Change cache size from GUI

* Clean up

* Solve osx compilation error.

* Update ghoul

* Make it possible to switch between PBO and not during runtime.

* Enable resetting of tile datasets

* change function module in moduleengine to identify module by name

* MemoryAwareTileCache is no longer a singleton

* Update ownership of properties for globe browsing

* Logging info about resetting tile reader.

* Logging info

* Fix requested changes

* Fix some compile warnings.

* Fix compilation warnings

* Add ability to blend values with blend parameter. Also define settings through lua dict.

* Fix some comments on pull request.

* Change formatting

* Change formatting

* Change formatting

* Fix pull request comments.

* Those are details

* Make Mercury great again.

* Make Earth great again.

* Solve conflict

* Test to sometimes use valueblending and sometimes not

* Not always use value blending

* Update ghoul

* Change from auto to explicit type.

* Update test for LRU Cache

* Include algorithm.
2017-05-30 15:37:05 +02:00
Jonathas Costa f33a31b214 Improve blending. Enabled stars with ATM. 2017-05-29 00:58:19 -04:00
Jonathas Costa 4ad0843cc4 Enabled G-Buffer for Stars. 2017-05-29 00:57:47 -04:00
Jonathas Costa 71aab2a187 Fixed weird black line rendered in ATM. Improved blend function. 2017-05-29 00:38:16 -04:00
Jonathas Costa 6f987cbba2 Enabled G-Buffer for Trails. 2017-05-29 00:36:52 -04:00
Jonathas Costa c1799560ba Enabled G-Buffer for Milkway. 2017-05-29 00:36:00 -04:00
Jonathas Costa 49f03ba958 Fixed bug in Sun position inside ATM. 2017-05-26 16:20:13 -04:00
Jonathas Costa 33fbe90dc5 Removed unsued code from main shader file. 2017-05-26 14:40:12 -04:00
Jonathas Costa f134eb3531 Changed normals from Eye to Model space in GlobeRendering G-Buffer. Fixed and improved ground irradiance reflection. 2017-05-26 14:32:02 -04:00
Jonathas Costa 741eb0c895 Added Aerial Perspective effect. Needs tweaking. 2017-05-25 16:50:59 -04:00
Alexander Bock 95d933328f Merge branch 'master' into feature/NewAtmosphere 2017-05-25 11:10:09 -04:00
Alexander Bock 8db2db6c1d Fix applications of Time::ref and replace with TimeManager calls 2017-05-25 11:09:19 -04:00
Jonathas Costa f3151f2070 Homogenized shaders versions. 2017-05-24 21:01:32 -04:00